diff --git a/roles/keycloak/defaults/main.yml b/roles/keycloak/defaults/main.yml
index 1735795..99efe31 100644
--- a/roles/keycloak/defaults/main.yml
+++ b/roles/keycloak/defaults/main.yml
@@ -52,7 +52,7 @@ keycloak_database_user: "keycloak"
 keycloak_database_password: "{{ lookup('passwordstore',  keycloak_domain +  '/database' + ' create=true') }}"
 
 # The default welcome theme keycloak will use
-keycloak_theme_welcome: "keycloak"
+keycloak_theme_welcome: "{{ omit }}"
 
 # The SELinux level that should be used for the postgres data folder/container
 keycloak_postgres_selinux_level: "{{ omit }}"
diff --git a/roles/keycloak/templates/docker-compose.yml b/roles/keycloak/templates/docker-compose.yml
index 84a4f4a..89bed66 100644
--- a/roles/keycloak/templates/docker-compose.yml
+++ b/roles/keycloak/templates/docker-compose.yml
@@ -40,24 +40,20 @@ services:
 {% endif %}
 
     environment:
-      - "PROXY_ADDRESS_FORWARDING=true"
-      - "KEYCLOAK_HOSTNAME={{ keycloak_domain }}"
-      - "KEYCLOAK_LOGLEVEL={{ keycloak_log_level }}"
-      - "ROOT_LOGLEVEL={{ keycloak_root_log_level }}"
-{% if keycloak_theme_welcome is defined %}
-      - "KEYCLOAK_WELCOME_THEME={{ keycloak_theme_welcome }}"
-{% endif %}
-      - "DB_VENDOR=postgres"
-      - "DB_ADDR=database"
-      - "DB_USER={{ keycloak_database_user }}"
-      - "DB_PASSWORD={{ keycloak_database_password }}"
+      - "KC_PROXY=edge"
+      - "KC_FEATURES=scripts,upload-scripts"
+      - "KC_HOSTNAME={{ keycloak_domain }}"
+      - "KC_LOGLEVEL={{ keycloak_log_level }}"
+      - "KC_DB_URL_HOST=database"
+      - "KC_DB_USERNAME={{ keycloak_database_user }}"
+      - "KC_DB_PASSWORD={{ keycloak_database_password }}"
     networks:
       backend:
 {% if proxy_network is defined %}
       {{ proxy_network }}:
 {% endif %}
 
-    command: ["--features=scripts,upload_scripts"]
+    command: ["start --auto-build --db=postgres"{% if keycloak_theme_welcome != omit %}, "--spi-theme-welcome-theme={{ keycloak_theme_welcome }}"{% endif %}]
     restart: always
 
   database: