diff --git a/keycloak/.env b/keycloak/.env
index 3bea215..65be81b 100644
--- a/keycloak/.env
+++ b/keycloak/.env
@@ -2,27 +2,7 @@ DB_HOST=postgres
 DB_PORT=5432
 DB_SCHEMA=public
 POSTGRES_DB=keycloak
-POSTGRES_USER=yb_keycloak
-POSTGRES_PASSWORD=randomlongalphanumericpassword
+POSTGRES_USER=keycloak
+POSTGRES_PASSWORD=password
 
-KEYCLOAK_CREATE_ADMIN_USER=true
-KEYCLOAK_ADMIN_USER=keycloak-admin
-KEYCLOAK_ADMIN_PASSWORD=randomlongalphanumericpassword
-KEYCLOAK_MANAGEMENT_USER=keycloak-manager
-KEYCLOAK_MANAGEMENT_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_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
+HOSTNAME=auth.bizmatch.net
\ No newline at end of file
diff --git a/keycloak/docker-compose.yml b/keycloak/docker-compose.yml
index 4c25a21..be4cd1c 100644
--- a/keycloak/docker-compose.yml
+++ b/keycloak/docker-compose.yml
@@ -8,9 +8,9 @@ services:
       volumes:
         - postgres_volume:/var/lib/postgresql/data
       environment:
-        POSTGRES_DB: keycloak
-        POSTGRES_USER: keycloak
-        POSTGRES_PASSWORD: password
+        POSTGRES_DB: ${POSTGRES_DB}
+        POSTGRES_USER: ${POSTGRES_USER}
+        POSTGRES_PASSWORD: ${POSTGRES_PASSWORD}
       networks:
         - bizmatch
 
@@ -20,20 +20,18 @@ services:
     ports:
       - "8080:8080"
     environment:
-      - KEYCLOAK_ADMIN=admin
-      - KEYCLOAK_ADMIN_PASSWORD=aiaiaia
-      - KC_HOSTNAME_ADMIN=auth.bizmatch.net
+      - KC_DB=postgres
+      - KC_DB_URL_HOST=${DB_HOST}
+      - KC_DB_URL_DATABASE=${POSTGRES_DB}
+      - KC_DB_USERNAME=${POSTGRES_USER}
+      - KC_DB_PASSWORD=${POSTGRES_PASSWORD}
       - KC_PROXY=edge
-      - KC_HOSTNAME=auth.bizmatch.net
+      - KC_HOSTNAME=${HOSTNAME}
+      - KC_HOSTNAME_ADMIN=${HOSTNAME}
       - 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
       - KC_HOSTNAME_STRICT=false
+        # - PROXY_ADDRESS_FORWARDING=true
         #- KC_LOG_LEVEL=ALL
     depends_on:
       - postgres