diff --git a/docker/docker-compose-postgres.yaml b/docker/docker-compose-postgres.yaml
index b13c72cf35..12a6b70465 100644
--- a/docker/docker-compose-postgres.yaml
+++ b/docker/docker-compose-postgres.yaml
@@ -13,6 +13,7 @@ services:
       - internal
     ports:
       - 8080:8080
+      - 5000:5000
     healthcheck:
       test: [ "CMD", "curl","-I" ,"-XGET", "http://localhost:8080/health" ]
       interval: 60s
@@ -20,13 +21,10 @@ services:
       retries: 12
     links:
       - conductor-elasticsearch:es
-      - conductor-redis:rs
-      - postgres:postgresdb
+      - conductor-postgres:postgresdb
     depends_on:
       conductor-elasticsearch:
         condition: service_healthy
-      conductor-redis:
-        condition: service_healthy
       conductor-postgres:
         condition: service_healthy
     logging:
@@ -45,7 +43,7 @@ services:
     networks:
       - internal
     ports:
-      - 5432:5432
+      - 6432:5432
     healthcheck:
       test: timeout 5 bash -c 'cat < /dev/null > /dev/tcp/localhost/5432'
       interval: 5s
@@ -57,17 +55,6 @@ services:
         max-size: "1k"
         max-file: "3"
 
-  conductor-redis:
-    image: redis:6.2.3-alpine
-    volumes:
-      - ./redis.conf:/usr/local/etc/redis/redis.conf
-    networks:
-      - internal
-    ports:
-      - 6379:6379
-    healthcheck:
-      test: [ "CMD", "redis-cli","ping" ]
-
   conductor-elasticsearch:
     image: docker.elastic.co/elasticsearch/elasticsearch:7.17.11
     environment:
diff --git a/docker/server/config/config-postgres.properties b/docker/server/config/config-postgres.properties
index c41c344c10..43aa64a0fb 100755
--- a/docker/server/config/config-postgres.properties
+++ b/docker/server/config/config-postgres.properties
@@ -2,13 +2,16 @@
 conductor.db.type=postgres
 
 # postgres
-spring.datasource.url=jdbc:postgresql://localhost:5432/postgres
-spring.datasource.username=postgres
-spring.datasource.password=postgres
+spring.datasource.url=jdbc:postgresql://postgresdb:5432/postgres
+spring.datasource.username=conductor
+spring.datasource.password=conductor
 
 # Elastic search instance indexing is enabled.
 conductor.indexing.enabled=true
-conductor.indexing.type=postgres
+conductor.elasticsearch.url=http://es:9200
+conductor.elasticsearch.indexName=conductor
+conductor.elasticsearch.version=7
+conductor.elasticsearch.clusterHealthColor=yellow
 
 # Additional modules for metrics collection exposed to Prometheus (optional)
 conductor.metrics-prometheus.enabled=true