diff --git a/keycloak/.env b/keycloak/.env
index 3bea215..7a19ebe 100644
--- a/keycloak/.env
+++ b/keycloak/.env
@@ -1,28 +1,37 @@
 DB_HOST=postgres
 DB_PORT=5432
 DB_SCHEMA=public
-POSTGRES_DB=keycloak
-POSTGRES_USER=yb_keycloak
-POSTGRES_PASSWORD=randomlongalphanumericpassword
+DB_DATABASE="keycloak"
+DB_USER="keycloak"
+DB_PASSWORD="password"
+DB_VENDOR="postgres"
 
-KEYCLOAK_CREATE_ADMIN_USER=true
-KEYCLOAK_ADMIN_USER=keycloak-admin
-KEYCLOAK_ADMIN_PASSWORD=randomlongalphanumericpassword
-KEYCLOAK_MANAGEMENT_USER=keycloak-manager
-KEYCLOAK_MANAGEMENT_PASSWORD=randomlongalphanumericpassword
+KEYCLOAK_ADMIN="admin"
+KEYCLOAK_ADMIN_PASSWORD="5600Wuppertal11"
+# KC_DB="postgres"
+# KC_DB_URL="jdbc:postgresql://database/keycloak"
+# POSTGRES_DB=keycloak
+# POSTGRES_USER=keycloak
+#POSTGRES_PASSWORD=randomlongalphanumericpassword
 
-KEYCLOAK_DATABASE_HOST=${DB_HOST}
-KEYCLOAK_DATABASE_PORT=${DB_PORT}
-KEYCLOAK_DATABASE_NAME=${POSTGRES_DB}
-KEYCLOAK_DATABASE_USER=${POSTGRES_USER}
-KEYCLOAK_DATABASE_PASSWORD=${POSTGRES_PASSWORD}
-KEYCLOAK_DATABASE_SCHEMA=${DB_SCHEMA}
+# KEYCLOAK_CREATE_ADMIN_USER=true
+# KEYCLOAK_ADMIN_USER=keycloak-admin
+# KEYCLOAK_ADMIN_PASSWORD=randomlongalphanumericpassword
+# KEYCLOAK_MANAGEMENT_USER=keycloak-manager
+# KEYCLOAK_MANAGEMENT_PASSWORD=randomlongalphanumericpassword
 
-KEYCLOAK_PRODUCTION=true
-KEYCLOAK_JDBC_PARAMS=sslmode=disable&connectTimeout=40000
-KEYCLOAK_EXTRA_ARGS="-Dkeycloak.profile.feature.scripts=enabled"
+# KEYCLOAK_DATABASE_HOST=${DB_HOST}
+# KEYCLOAK_DATABASE_PORT=${DB_PORT}
+# KEYCLOAK_DATABASE_NAME=${POSTGRES_DB}
+# KEYCLOAK_DATABASE_USER=${POSTGRES_USER}
+# KEYCLOAK_DATABASE_PASSWORD=${POSTGRES_PASSWORD}
+# KEYCLOAK_DATABASE_SCHEMA=${DB_SCHEMA}
 
-KEYCLOAK_ENABLE_HTTPS=true
-KEYCLOAK_HTTPS_USE_PEM=true
-KEYCLOAK_HTTPS_CERTIFICATE_FILE=/opt/bitnami/keycloak/certs/fullchain.pem
-KEYCLOAK_HTTPS_CERTIFICATE_KEY_FILE=/opt/bitnami/keycloak/certs/privkey.pem
\ No newline at end of file
+# KEYCLOAK_PRODUCTION=true
+# KEYCLOAK_JDBC_PARAMS=sslmode=disable&connectTimeout=40000
+# KEYCLOAK_EXTRA_ARGS="-Dkeycloak.profile.feature.scripts=enabled"
+
+# KEYCLOAK_ENABLE_HTTPS=true
+# KEYCLOAK_HTTPS_USE_PEM=true
+# KEYCLOAK_HTTPS_CERTIFICATE_FILE=/opt/bitnami/keycloak/certs/fullchain.pem
+# KEYCLOAK_HTTPS_CERTIFICATE_KEY_FILE=/opt/bitnami/keycloak/certs/privkey.pem
\ No newline at end of file
diff --git a/keycloak/docker-compose.yml b/keycloak/docker-compose.yml
index be893f4..4df581b 100644
--- a/keycloak/docker-compose.yml
+++ b/keycloak/docker-compose.yml
@@ -8,32 +8,45 @@ services:
       volumes:
         - postgres_volume:/var/lib/postgresql/data
       environment:
-        POSTGRES_DB: keycloak
-        POSTGRES_USER: keycloak
-        POSTGRES_PASSWORD: password
+        POSTGRES_DB: ${DB_DATABASE}
+        POSTGRES_USER: ${DB_USER}
+        POSTGRES_PASSWORD: ${DB_PASSWORD}
       networks:
         - bizmatch
 
   auth:
     container_name: keycloak
     image: quay.io/keycloak/keycloak:latest
+    command: ["start-dev"]
     ports:
       - "8080:8080"
     environment:
-      - KEYCLOAK_ADMIN=admin
-      - KEYCLOAK_ADMIN_PASSWORD=aiaiaia
-      - KC_HOSTNAME_ADMIN=auth.bizmatch.net
-      - KC_PROXY=edge
-      - KC_HOSTNAME=auth.bizmatch.net
-      - KC_METRICS_ENABLED=true
-      - KC_HEALTH_ENABLED=true
-      - KC_DB=postgres
-      - KC_DB_PASSWORD=password
-      - KC_DB_SCHEMA=public
-      - KC_DB_USERNAME=keycloak
-      - KC_DB_URL_HOST=postgres
-      - KC_DB_URL_DATABASE=keycloak
-      - PROXY_ADDRESS_FORWARDING=true
+      DB_VENDOR: ${DB_VENDOR}
+      # DB_ADDR: database
+      # DB_PORT: 5432
+      # DB_SCHEMA: public    
+      DB_DATABASE: ${DB_DATABASE}
+      DB_USER: ${DB_USER}
+      DB_PASSWORD: ${DB_PASSWORD}    
+      KEYCLOAK_ADMIN: ${KEYCLOAK_ADMIN}
+      KEYCLOAK_ADMIN_PASSWORD: ${KEYCLOAK_ADMIN_PASSWORD}
+      KC_PROXY_MODE: edge
+      KC_METRICS_ENABLED: true
+      KC_HTTP_ENABLED: true      
+      # - KEYCLOAK_ADMIN=admin
+      # - KEYCLOAK_ADMIN_PASSWORD=aiaiaia
+      # - KC_HOSTNAME_ADMIN=auth.bizmatch.net
+      # - KC_PROXY=edge
+      # - KC_HOSTNAME=auth.bizmatch.net
+      # - KC_METRICS_ENABLED=true
+      # - KC_HEALTH_ENABLED=true
+      # - KC_DB=postgres
+      # - KC_DB_PASSWORD=password
+      # - KC_DB_SCHEMA=public
+      # - KC_DB_USERNAME=keycloak
+      # - KC_DB_URL_HOST=postgres
+      # - KC_DB_URL_DATABASE=keycloak
+      # - PROXY_ADDRESS_FORWARDING=true
         #- KC_LOG_LEVEL=ALL
     depends_on:
       - postgres