diff --git a/roles/usermanagement/tasks/keycloak.yaml b/roles/usermanagement/tasks/keycloak.yaml
index 2afa316..1ecf4b5 100644
--- a/roles/usermanagement/tasks/keycloak.yaml
+++ b/roles/usermanagement/tasks/keycloak.yaml
@@ -8,6 +8,12 @@
     name: /data/keycloak-postgres/
     state: directory
 
+- name: Clone keycloak Themes
+  git:
+    repo: https://github.com/FAUSheppy/atlantis-keycloak-themes
+    dest: "/data/atlantis-keycloak-themes/"
+    version: master
+
 - name: Create compose directory keycloak
   file:
     name: "/opt/keycloak/"
@@ -40,7 +46,7 @@
     status_code: 200
     body_format: json
   register: result
-  until: result.status and result.json.status == "UP"
+  until: result.status == 200 and result.json.status == "UP"
   retries: 10
   delay: 20
   check_mode: false
@@ -102,6 +108,7 @@
     auth_password: "{{ keycloak_admin_password }}"
     state: present
     realm: master
+    loginTheme: "atlantis"
     smtpServer :
         password : "{{ smtp_service_pass }}"
         replyToDisplayName: ""
diff --git a/roles/usermanagement/templates/keycloak.yaml b/roles/usermanagement/templates/keycloak.yaml
index 46f5433..641213c 100644
--- a/roles/usermanagement/templates/keycloak.yaml
+++ b/roles/usermanagement/templates/keycloak.yaml
@@ -26,6 +26,8 @@ services:
     - postgres
     secrets:
     - postgres_password
+    volumes:
+    - /data/atlantis-keycloak-themes/themes/:/opt/keycloak/themes/
   postgres:
     container_name: postgres-container
     image: postgres:15.1