diff --git a/roles/keycloak/meta/argument_specs.yml b/roles/keycloak/meta/argument_specs.yml
index 2d4fa9c..e361fc3 100644
--- a/roles/keycloak/meta/argument_specs.yml
+++ b/roles/keycloak/meta/argument_specs.yml
@@ -164,17 +164,17 @@ argument_specs:
             keycloak_ha_enabled:
                 # line 46 of keycloak/defaults/main.yml
                 default: false
-                description: "TODO document argument"
+                description: "Enable auto configuration for database backend, clustering and remote caches on infinispan"
                 type: "bool"
             keycloak_db_enabled:
                 # line 48 of keycloak/defaults/main.yml
                 default: "{{ True if keycloak_ha_enabled else False }}"
-                description: "TODO document argument"
+                description: "Enable auto configuration for database backend"
                 type: "str"
             keycloak_admin_user:
                 # line 51 of keycloak/defaults/main.yml
                 default: "admin"
-                description: "TODO document argument"
+                description: "Administration console user account"
                 type: "str"
             keycloak_auth_realm:
                 # line 52 of keycloak/defaults/main.yml
diff --git a/roles/keycloak_realm/defaults/main.yml b/roles/keycloak_realm/defaults/main.yml
index 7303629..bc9bea7 100644
--- a/roles/keycloak_realm/defaults/main.yml
+++ b/roles/keycloak_realm/defaults/main.yml
@@ -3,16 +3,16 @@
 keycloak_host: localhost
 keycloak_http_port: 8080
 keycloak_https_port: 8443
+keycloak_management_http_port: 9990
+keycloak_rhsso_enable: False
 
 ### Keycloak administration console user
 keycloak_admin_user: admin
 keycloak_auth_realm: master
 keycloak_auth_client: admin-cli
 
-### List of Keycloak User Federation
-keycloak_user_federation: []
 
-### Keycloak realms, clients, roles
+### Keycloak realms, clients, roles, federation
 # list of clients to create in the realm
 #
 # Refer to the playbook for a comprehensive example.
@@ -47,3 +47,6 @@ keycloak_client_web_origins: '+'
 # where each client_role has the form:
 #    { client: '', role: '', realm: '' }
 keycloak_client_users: []
+
+### List of Keycloak User Federation
+keycloak_user_federation: []
diff --git a/roles/keycloak_realm/meta/argument_specs.yml b/roles/keycloak_realm/meta/argument_specs.yml
index bd9552e..ffbf18a 100644
--- a/roles/keycloak_realm/meta/argument_specs.yml
+++ b/roles/keycloak_realm/meta/argument_specs.yml
@@ -16,26 +16,31 @@ argument_specs:
                 default: 8443
                 description: "TODO document argument"
                 type: "int"
+            keycloak_management_http_port:
+                # line 6 of keycloak_realm/defaults/main.yml
+                default: 9990
+                description: "TODO document argument"
+                type: "int"
+            keycloak_rhsso_enable:
+                # line 7 of keycloak_realm/defaults/main.yml
+                default: false
+                description: "TODO document argument"
+                type: "bool"
             keycloak_admin_user:
-                # line 8 of keycloak_realm/defaults/main.yml
+                # line 10 of keycloak_realm/defaults/main.yml
                 default: "admin"
                 description: "TODO document argument"
                 type: "str"
             keycloak_auth_realm:
-                # line 9 of keycloak_realm/defaults/main.yml
+                # line 11 of keycloak_realm/defaults/main.yml
                 default: "master"
                 description: "TODO document argument"
                 type: "str"
             keycloak_auth_client:
-                # line 10 of keycloak_realm/defaults/main.yml
+                # line 12 of keycloak_realm/defaults/main.yml
                 default: "admin-cli"
                 description: "TODO document argument"
                 type: "str"
-            keycloak_user_federation:
-                # line 13 of keycloak_realm/defaults/main.yml
-                default: "[]"
-                description: "TODO document argument"
-                type: "list"
             keycloak_client_default_roles:
                 # line 36 of keycloak_realm/defaults/main.yml
                 default: "[]"
@@ -56,6 +61,11 @@ argument_specs:
                 default: "[]"
                 description: "TODO document argument"
                 type: "list"
+            keycloak_user_federation:
+                # line 52 of keycloak_realm/defaults/main.yml
+                default: "[]"
+                description: "TODO document argument"
+                type: "list"
             keycloak_admin_password:
                 # line 5 of keycloak_realm/vars/main.yml
                 required: true
@@ -81,8 +91,3 @@ argument_specs:
                 default: "http://{{ keycloak_host }}:{{ keycloak_management_http_port }}"
                 description: "TODO document argument"
                 type: "str"
-            keycloak_rhsso_enable:
-                # line 16 of keycloak_realm/vars/main.yml
-                default: false
-                description: "TODO document argument"
-                type: "bool"
diff --git a/roles/keycloak_realm/vars/main.yml b/roles/keycloak_realm/vars/main.yml
index 1fe044e..70133aa 100644
--- a/roles/keycloak_realm/vars/main.yml
+++ b/roles/keycloak_realm/vars/main.yml
@@ -13,4 +13,3 @@ keycloak_clients:
 # other settings
 keycloak_url: "http://{{ keycloak_host }}:{{ keycloak_http_port }}"
 keycloak_management_url: "http://{{ keycloak_host }}:{{ keycloak_management_http_port }}"
-keycloak_rhsso_enable: False
\ No newline at end of file