diff --git a/playbooks/keycloak_realm.yml b/playbooks/keycloak_realm.yml
index 1efc4f7..cf59cbc 100644
--- a/playbooks/keycloak_realm.yml
+++ b/playbooks/keycloak_realm.yml
@@ -3,26 +3,40 @@
   hosts: all
   vars:
     keycloak_admin_password: "remembertochangeme"
-    keycloak_realm: TestRealm
-    keycloak_clients:
-      - name: TestClient1
-        client_id: TestClient1
-        roles:
-          - TestClient1Admin
-          - TestClient1User
-        realm: "{{ keycloak_realm }}"
-        public_client: True
-        web_origins:
-          - http://testclient1origin/application
-          - http://testclient1origin/other
-        users:
-        - username: TestUser
-          password: password
-          client_roles:
-            - client: TestClient1
-              role: TestClient1User
-              realm: "{{ keycloak_realm }}"
-  collections:
-    - middleware_automation.keycloak  
   roles:
-    - keycloak_realm
+    - role: keycloak
+  collections:
+    - middleware_automation.keycloak
+  tasks:
+    - name: Keycloak Realm Role
+      ansible.builtin.include_role:
+        name: keycloak_realm
+      vars:
+        keycloak_client_default_roles:
+          - TestRoleAdmin
+          - TestRoleUser
+        keycloak_client_users:
+          - username: TestUser
+            password: password
+            client_roles:
+              - client: TestClient
+                role: TestRoleUser
+                realm: "{{ keycloak_realm }}"
+          - username: TestAdmin
+            password: password
+            client_roles:
+              - client: TestClient
+                role: TestRoleUser
+                realm: "{{ keycloak_realm }}"
+              - client: TestClient
+                role: TestRoleAdmin
+                realm: "{{ keycloak_realm }}"
+        keycloak_realm: TestRealm
+        keycloak_clients:
+          - name: TestClient
+            roles: "{{ keycloak_client_default_roles }}"
+            realm: "{{ keycloak_realm }}"
+            public_client: "{{ keycloak_client_public }}"
+            web_origins: "{{ keycloak_client_web_origins }}"
+            users: "{{ keycloak_client_users }}"
+            client_id: TestClient