diff --git a/tasks/keycloak.yml b/tasks/keycloak.yml
index 526ecd563c0edb3cbeace524caf79eb177fca479..88429d6387195d40f8a7870ad4255f144088bef7 100644
--- a/tasks/keycloak.yml
+++ b/tasks/keycloak.yml
@@ -50,3 +50,12 @@
   with_items: '{{ keycloak_settings }}'
   tags:
     - cron
+
+- name: Add script to create admin user
+  copy:
+    content: docker exec keycloak_keycloak_1 /opt/jboss/keycloak/bin/add-user-keycloak.sh -u {{ item.admin.username }} -p '{{ item.admin.password }}'
+    dest: /mnt/{{ item.id }}/create-admin-user
+    owner: root
+    group: root
+    mode: 0755
+  with_items: '{{ keycloak_settings }}'
diff --git a/templates/docker-compose.yml b/templates/docker-compose.yml
index aa6d98d964ea8f33bcc2a5e6bd079f105d5faffb..e085c34c516517e050d36ca2f56154182bbffdcf 100644
--- a/templates/docker-compose.yml
+++ b/templates/docker-compose.yml
@@ -24,8 +24,6 @@ services:
       DB_USER: keycloak
       DB_SCHEMA: public
       DB_PASSWORD: password
-      KEYCLOAK_USER: '{{ item.admin.username }}'
-      KEYCLOAK_PASSWORD: '{{ item.admin.password }}'
       PROXY_ADDRESS_FORWARDING: 'true'
       KEYCLOAK_ALWAYS_HTTPS: 'true'
     restart: always