diff --git a/.env.example b/.env.example
index 026fd84..ab1c41a 100644
--- a/.env.example
+++ b/.env.example
@@ -1,10 +1,7 @@
 # This file is used to store environment variables for the application
 # Database Connection Information
-POSTGRES_HOST=localhost
-POSTGRES_PORT=5432
 POSTGRES_PASSWORD=password
-POSTGRES_USER=atridadlahiji
-POSTGRES_DB=pollo
+POSTGRES_USER=username
 
 # Security
 ENCRYPTION_KEY="super-secret"
@@ -12,4 +9,4 @@ SIGNING_KEY="super-secret"
 AUTH_SECRET="super-secret"
 
 # Feature Flags
-DEVMODE=true
\ No newline at end of file
+DEVMODE=true
diff --git a/docker-compose.yml b/docker-compose.yml
index e24f925..1a8d2b6 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,49 +1,42 @@
-version: "3"
-
 services:
   app:
     build:
       context: .
       dockerfile: Dockerfile
-    image: atridad:latest
+    image: pollo:latest
     command: ["/app"]
     pull_policy: build
     depends_on:
       db:
-        condition: service_started
+        condition: service_healthy
     ports:
-      - "3131:3000"
-    networks:
-      - proxy_default
+      - "3000:3000"
     environment:
-      - POSTGRES_HOST=$POSTGRES_HOST
-      - POSTGRES_PORT=$POSTGRES_PORT
-      - POSTGRES_DB=$POSTGRES_DB
-      - POSTGRES_USER=$POSTGRES_USER
-      - POSTGRES_PASSWORD=$POSTGRES_PASSWORD
-      - AUTH_SECRET=$AUTH_SECRET
-      - ENCRYPTION_KEY=$ENCRYPTION_KEY
-      - DEVMODE=$DEVMODE
+      - POSTGRES_HOST=db
+      - POSTGRES_PORT=5432
+      - POSTGRES_DB=helpapp
+      - POSTGRES_USER=${POSTGRES_USER}
+      - POSTGRES_PASSWORD=${POSTGRES_PASSWORD}
+      - AUTH_SECRET=${AUTH_SECRET}
+      - ENCRYPTION_KEY=${ENCRYPTION_KEY}
+      - DEVMODE=${DEVMODE}
 
   db:
-    image: 'postgres:latest'
-    pull_policy: build
+    image: "postgres:16-alpine"
     environment:
-      - POSTGRES_DB=$POSTGRES_DB
-      - POSTGRES_PASSWORD=$POSTGRES_PASSWORD
-      - POSTGRES_USER=$POSTGRES_USER
+      - POSTGRES_DB=pollo
+      - POSTGRES_PASSWORD=${POSTGRES_PASSWORD}
+      - POSTGRES_USER=${POSTGRES_USER}
     ports:
-      - 5433:5432
+      - 5432:5432
     volumes:
       - pgdata:/var/lib/postgresql/data
-    networks:
-      - proxy_default
     restart: on-failure:3
+    healthcheck:
+      test: ["CMD", "sh", "-c", "pg_isready -h db -p 5432 -U ${POSTGRES_USER}"]
+      interval: 10s
+      timeout: 5s
+      retries: 10
 
 volumes:
   pgdata:
-
-networks:
-  proxy_default:
-    name: proxy_default
-    external: true
\ No newline at end of file