diff --git a/.github/workflows/roundtrip/keycloak_data.yaml b/.github/workflows/roundtrip/keycloak_data.yaml
index 006a326b..201a2b65 100644
--- a/.github/workflows/roundtrip/keycloak_data.yaml
+++ b/.github/workflows/roundtrip/keycloak_data.yaml
@@ -13,7 +13,6 @@ realms:
       realm: opentdf
       enabled: true
     custom_realm_roles:
-      - name: opentdf-org-admin
       - name: opentdf-admin
       - name: opentdf-standard
     custom_client_roles:
@@ -35,7 +34,7 @@ realms:
           protocolMappers:
             - *customAudMapper
         sa_realm_roles: 
-          - opentdf-org-admin
+          - opentdf-admin
       - client:
           clientID: opentdf-sdk
           enabled: true
@@ -98,7 +97,7 @@ realms:
         groups:
           - mygroup
         realmRoles:
-          - opentdf-org-admin
+          - opentdf-admin
         clientRoles:
           realm-management:
             - view-clients
diff --git a/.github/workflows/roundtrip/opentdf.yaml b/.github/workflows/roundtrip/opentdf.yaml
index c5424a62..6ccc9ae7 100644
--- a/.github/workflows/roundtrip/opentdf.yaml
+++ b/.github/workflows/roundtrip/opentdf.yaml
@@ -47,15 +47,10 @@ server:
       map:
         # standard: opentdf-standard
         # admin: opentdf-admin
-        # org-admin: opentdf-org-admin
 
       ## Custom policy (see examples https://github.com/casbin/casbin/tree/master/examples)
       csv: #|
-      #  p, role:org-admin, policy:attributes, *, *, allow
-      #  p, role:org-admin, policy:subject-mappings, *, *, allow
-      #  p, role:org-admin, policy:resource-mappings, *, *, allow
-      #  p, role:org-admin, policy:kas-registry, *, *, allow
-      #  p, role:org-admin, policy:unsafe, *, *, allow
+      #  p, role:admin, *, *, allow
 
       ## Custom model (see https://casbin.org/docs/syntax-for-models/)
       model: #|