diff --git a/sources/amd-gpu-operator-config/ConfigMap_amd-gpu-metrics-exporter-config.yaml b/sources/amd-gpu-operator-config/ConfigMap_amd-gpu-metrics-exporter-config.yaml
index a54affbf..655665ac 100644
--- a/sources/amd-gpu-operator-config/ConfigMap_amd-gpu-metrics-exporter-config.yaml
+++ b/sources/amd-gpu-operator-config/ConfigMap_amd-gpu-metrics-exporter-config.yaml
@@ -111,11 +111,9 @@ data:
         ],
         "ExtraPodLabels" : {
           "WORKLOAD_ID"   : "airm.silogen.ai/workload-id",
-          "USERGROUP_ID"  : "airm.silogen.ai/usergroup-id",
           "PROJECT_ID"  : "airm.silogen.ai/project-id"
         },
         "CustomLabels" : {
-          "ORG_NAME"    : "demo",
           "KUBE_CLUSTER_NAME" : "demo-cluster"
         }
       }
diff --git a/sources/keycloak-config/templates/keycloak-realm-templates-cm.yaml b/sources/keycloak-config/templates/keycloak-realm-templates-cm.yaml
index 1f8f9cfa..f7953909 100644
--- a/sources/keycloak-config/templates/keycloak-realm-templates-cm.yaml
+++ b/sources/keycloak-config/templates/keycloak-realm-templates-cm.yaml
@@ -83,15 +83,6 @@ data:
             "containerId": "ab3ca5f2-5d40-4b8d-b3fb-2aa54990c981",
             "attributes": {}
           },
-          {
-            "id": "5642a7a3-f521-4b15-9e61-26289a1f1dbc",
-            "name": "Super Administrator",
-            "description": "Role which allows users to create new organizations",
-            "composite": false,
-            "clientRole": false,
-            "containerId": "ab3ca5f2-5d40-4b8d-b3fb-2aa54990c981",
-            "attributes": {}
-          },
           {
             "id": "f527862a-af68-4191-986a-cbcb25f15c24",
             "name": "default-roles-airm",
@@ -557,8 +548,7 @@ data:
           "requiredActions": [],
           "realmRoles": [
             "default-roles-airm",
-            "Platform Administrator",
-            "Super Administrator"
+            "Platform Administrator"
           ],
           "notBefore": 0,
           "groups": [
@@ -679,7 +669,6 @@ data:
           "optionalClientScopes": [
             "address",
             "phone",
-            "organization",
             "offline_access",
             "microprofile-jwt"
           ]
@@ -790,7 +779,6 @@ data:
           "optionalClientScopes": [
             "address",
             "phone",
-            "organization",
             "offline_access",
             "microprofile-jwt"
           ]
@@ -843,7 +831,6 @@ data:
             "web-origins",
             "acr",
             "roles",
-            "organization",
             "profile",
             "basic",
             "email",
@@ -898,7 +885,6 @@ data:
           "optionalClientScopes": [
             "address",
             "phone",
-            "organization",
             "offline_access",
             "microprofile-jwt"
           ]
@@ -956,7 +942,6 @@ data:
           "optionalClientScopes": [
             "address",
             "phone",
-            "organization",
             "offline_access",
             "microprofile-jwt"
           ]
@@ -1000,7 +985,6 @@ data:
           "optionalClientScopes": [
             "address",
             "phone",
-            "organization",
             "offline_access",
             "microprofile-jwt"
           ]
@@ -1043,7 +1027,6 @@ data:
           "optionalClientScopes": [
             "address",
             "phone",
-            "organization",
             "offline_access",
             "microprofile-jwt"
           ]
@@ -1151,7 +1134,6 @@ data:
           "optionalClientScopes": [
             "address",
             "phone",
-            "organization",
             "offline_access",
             "microprofile-jwt"
           ]
@@ -1195,7 +1177,6 @@ data:
           "optionalClientScopes": [
             "address",
             "phone",
-            "organization",
             "offline_access",
             "microprofile-jwt"
           ],
@@ -1300,7 +1281,6 @@ data:
           "optionalClientScopes": [
             "address",
             "phone",
-            "organization",
             "offline_access",
             "microprofile-jwt"
           ]
@@ -1346,36 +1326,6 @@ data:
             }
           ]
         },
-        {
-          "id": "e471159a-ec37-45aa-a499-10c0f0cf7ce8",
-          "name": "organization",
-          "description": "Additional claims about the organization a subject belongs to",
-          "protocol": "openid-connect",
-          "attributes": {
-            "include.in.token.scope": "true",
-            "consent.screen.text": "${organizationScopeConsentText}",
-            "display.on.consent.screen": "true"
-          },
-          "protocolMappers": [
-            {
-              "id": "aeff3505-4990-4ac2-8a0d-8c407ba2d50e",
-              "name": "organization",
-              "protocol": "openid-connect",
-              "protocolMapper": "oidc-organization-membership-mapper",
-              "consentRequired": false,
-              "config": {
-                "introspection.token.claim": "true",
-                "multivalued": "true",
-                "userinfo.token.claim": "true",
-                "id.token.claim": "true",
-                "access.token.claim": "true",
-                "claim.name": "organization",
-                "jsonType.label": "JSON",
-                "addOrganizationId": "true"
-              }
-            }
-          ]
-        },
         {
           "id": "ca910203-028f-426e-b8bd-44881302e47b",
           "name": "groups",
@@ -2029,8 +1979,7 @@ data:
         "offline_access",
         "address",
         "phone",
-        "microprofile-jwt",
-        "organization"
+        "microprofile-jwt"
       ],
       "browserSecurityHeaders": {
         "contentSecurityPolicyReportOnly": "",
@@ -2231,32 +2180,6 @@ data:
             }
           ]
         },
-        {
-          "id": "008a99fa-caa4-420d-9f74-0b3818657d45",
-          "alias": "Browser - Conditional Organization",
-          "description": "Flow to determine if the organization identity-first login is to be used",
-          "providerId": "basic-flow",
-          "topLevel": false,
-          "builtIn": true,
-          "authenticationExecutions": [
-            {
-              "authenticator": "conditional-user-configured",
-              "authenticatorFlow": false,
-              "requirement": "REQUIRED",
-              "priority": 10,
-              "autheticatorFlow": false,
-              "userSetupAllowed": false
-            },
-            {
-              "authenticator": "organization",
-              "authenticatorFlow": false,
-              "requirement": "ALTERNATIVE",
-              "priority": 20,
-              "autheticatorFlow": false,
-              "userSetupAllowed": false
-            }
-          ]
-        },
         {
           "id": "dba76db6-1cfa-4d63-9a7b-388172e1ef94",
           "alias": "Direct Grant - Conditional OTP",
@@ -2283,32 +2206,6 @@ data:
             }
           ]
         },
-        {
-          "id": "ffe01939-5668-4bff-a6f0-7df57cc63f5b",
-          "alias": "First Broker Login - Conditional Organization",
-          "description": "Flow to determine if the authenticator that adds organization members is to be used",
-          "providerId": "basic-flow",
-          "topLevel": false,
-          "builtIn": true,
-          "authenticationExecutions": [
-            {
-              "authenticator": "conditional-user-configured",
-              "authenticatorFlow": false,
-              "requirement": "REQUIRED",
-              "priority": 10,
-              "autheticatorFlow": false,
-              "userSetupAllowed": false
-            },
-            {
-              "authenticator": "idp-add-organization-member",
-              "authenticatorFlow": false,
-              "requirement": "REQUIRED",
-              "priority": 20,
-              "autheticatorFlow": false,
-              "userSetupAllowed": false
-            }
-          ]
-        },
         {
           "id": "333c3857-b46d-4049-8074-06779082db4f",
           "alias": "First broker login - Conditional OTP",
@@ -2361,23 +2258,6 @@ data:
             }
           ]
         },
-        {
-          "id": "e0b310eb-1ee9-47f6-bb0c-73ab55b4d0c3",
-          "alias": "Organization",
-          "providerId": "basic-flow",
-          "topLevel": false,
-          "builtIn": true,
-          "authenticationExecutions": [
-            {
-              "authenticatorFlow": true,
-              "requirement": "CONDITIONAL",
-              "priority": 10,
-              "autheticatorFlow": true,
-              "flowAlias": "Browser - Conditional Organization",
-              "userSetupAllowed": false
-            }
-          ]
-        },
         {
           "id": "f9187130-f8d5-4312-a65f-cf42b32ae1b4",
           "alias": "Reset - Conditional OTP",
@@ -2489,14 +2369,6 @@ data:
               "autheticatorFlow": false,
               "userSetupAllowed": false
             },
-            {
-              "authenticatorFlow": true,
-              "requirement": "ALTERNATIVE",
-              "priority": 26,
-              "autheticatorFlow": true,
-              "flowAlias": "Organization",
-              "userSetupAllowed": false
-            },
             {
               "authenticatorFlow": true,
               "requirement": "ALTERNATIVE",
@@ -2625,14 +2497,6 @@ data:
               "autheticatorFlow": true,
               "flowAlias": "User creation or linking",
               "userSetupAllowed": false
-            },
-            {
-              "authenticatorFlow": true,
-              "requirement": "CONDITIONAL",
-              "priority": 50,
-              "autheticatorFlow": true,
-              "flowAlias": "First Broker Login - Conditional Organization",
-              "userSetupAllowed": false
             }
           ]
         },
@@ -2922,12 +2786,10 @@ data:
         "parRequestUriLifespan": "60",
         "clientSessionMaxLifespan": "0",
         "frontendUrl": "",
-        "organizationsEnabled": "true",
         "acr.loa.map": "{}"
       },
       "keycloakVersion": "26.0.0",
       "userManagedAccessAllowed": false,
-      "organizationsEnabled": true,
       "clientProfiles": {
         "profiles": []
       },