diff --git a/playbooks/generate_workspace.yml b/playbooks/generate_workspace.yml
index 3281a38..4eb2bcd 100644
--- a/playbooks/generate_workspace.yml
+++ b/playbooks/generate_workspace.yml
@@ -207,6 +207,7 @@
       #               service type in order to generate the URLs
       vars:
         default_map:
+          keycloak_host: "keycloak.{{ domain_name }}"
           kube_prometheus_stack_grafana_host: "grafana.{{ domain_name }}"
           openstack_helm_endpoints_region_name: "{{ region_name }}"
           openstack_helm_endpoints_barbican_api_host: "key-manager.{{ domain_name }}"
@@ -361,9 +362,10 @@
       #               doing this using `with_fileglob` or `with_filetree`
       with_lines: >
         ls {{ playbook_dir }}/../roles/*/defaults/main.yml |
-          xargs grep undef |
+          xargs egrep '(undef|^# \w+_keycloak_client_secret)' |
             egrep -v '(_host|region_name|_ssh_key|_vip|_interface|_kek)' |
-              cut -d':' -f2
+              cut -d':' -f2 |
+                sed 's/^# //'
 
     - name: Generate base64 encoded secrets
       ansible.builtin.set_fact:
diff --git a/playbooks/openstack.yml b/playbooks/openstack.yml
index 63bb237..45e1d45 100644
--- a/playbooks/openstack.yml
+++ b/playbooks/openstack.yml
@@ -39,6 +39,10 @@
       tags:
         - percona-xtradb-cluster
 
+    - role: keycloak
+      tags:
+        - keycloak
+
     - role: node_feature_discovery
       tags:
         - node-feature-discovery