diff --git a/app/data/compose/docker-compose-mainnet-eth-ipld-eth-db.yml b/app/data/compose/docker-compose-mainnet-eth-ipld-eth-db.yml
index 79e8acb8..fd5ff92b 100644
--- a/app/data/compose/docker-compose-mainnet-eth-ipld-eth-db.yml
+++ b/app/data/compose/docker-compose-mainnet-eth-ipld-eth-db.yml
@@ -25,6 +25,5 @@ services:
       start_period: 3s
     ports:
       - "5432"
-      -
 volumes:
   mainnet_eth_ipld_eth_db:
\ No newline at end of file
diff --git a/app/data/compose/docker-compose-mainnet-eth-keycloak.yml b/app/data/compose/docker-compose-mainnet-eth-keycloak.yml
index dfa9a804..1674c62e 100644
--- a/app/data/compose/docker-compose-mainnet-eth-keycloak.yml
+++ b/app/data/compose/docker-compose-mainnet-eth-keycloak.yml
@@ -6,7 +6,7 @@ services:
     env_file:
       - ../config/mainnet-eth-keycloak/keycloak.env
     healthcheck:
-      test: ["CMD", "nc", "-v", "localhost", "5432"]
+      test: ["CMD", "nc", "-v", "localhost", "35432"]
       interval: 30s
       timeout: 10s
       retries: 10
@@ -14,7 +14,7 @@ services:
     volumes:
       - mainnet_eth_keycloak_db:/var/lib/postgresql/data
     ports:
-      - 5432
+      - 35432
 
   keycloak:
     image: cerc/keycloak:local
diff --git a/app/data/config/mainnet-eth-keycloak/keycloak.env b/app/data/config/mainnet-eth-keycloak/keycloak.env
index f37fdd30..31a19079 100644
--- a/app/data/config/mainnet-eth-keycloak/keycloak.env
+++ b/app/data/config/mainnet-eth-keycloak/keycloak.env
@@ -1,8 +1,11 @@
 POSTGRES_DB=keycloak
 POSTGRES_USER=keycloak
 POSTGRES_PASSWORD=keycloak
+# Don't change this unless you also change the healthcheck in docker-compose-mainnet-eth-keycloak.yml
+PGPORT=35432
 KC_DB=postgres
 KC_DB_URL_HOST=keycloak-db
+KC_DB_URL_PORT=${PGPORT}
 KC_DB_URL_DATABASE=${POSTGRES_DB}
 KC_DB_USERNAME=${POSTGRES_USER}
 KC_DB_PASSWORD=${POSTGRES_PASSWORD}