diff --git a/docker-compose.yaml b/docker-compose.yaml
index 3d7269c..9151611 100644
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -165,19 +165,31 @@ services:
     volumes:
       - temporal-elasticsearch-data:/usr/share/elasticsearch/data
 
+  temporal-postgresql:
+    container_name: temporal-postgresql
+    image: postgres:16
+    environment:
+      POSTGRES_PASSWORD: temporal
+      POSTGRES_USER: temporal
+    networks:
+      - temporal-network
+    expose:
+      - 5432
+    volumes:
+      - /var/lib/postgresql/data
+  
   temporal:
     container_name: temporal
-    restart: always
     image: temporalio/auto-setup:1.28.1
     depends_on:
-      temporal-elasticsearch:
-        condition: service_healthy
+      - temporal-postgresql
+      - temporal-elasticsearch
     environment:
-      - DB=${TEMPORAL_DB}
-      - DB_PORT=${TEMPORAL_DB_PORT}
-      - POSTGRES_USER=${TEMPORAL_DB_USER}
-      - POSTGRES_PWD=${TEMPORAL_DB_PWD}
-      - POSTGRES_SEEDS=${TEMPORAL_DB_SEEDS}
+      - DB=postgres12
+      - DB_PORT=5432
+      - POSTGRES_USER=temporal
+      - POSTGRES_PWD=temporal
+      - POSTGRES_SEEDS=temporal-postgresql
       - DYNAMIC_CONFIG_FILE_PATH=config/dynamicconfig/development-sql.yaml
       - ENABLE_ES=true
       - ES_SEEDS=temporal-elasticsearch
@@ -185,12 +197,6 @@ services:
       - TEMPORAL_NAMESPACE=default
     networks:
       - temporal-network
-    healthcheck:
-      test: ["CMD", "temporal", "operator", "cluster", "health", "--address", "temporal:7233"]
-      interval: 10s
-      timeout: 5s
-      retries: 10
-      start_period: 30s
     volumes:
       - ./dynamicconfig:/etc/temporal/config/dynamicconfig
     labels: