diff --git a/docker-compose.yml b/docker-compose.yml
index 8812e96..89ab526 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -2,15 +2,13 @@ services:
   nginx:
     image: nginx:latest
     ports:
-      - "80:80"
+      - "8080:80"
     healthcheck:
-      test: ["CMD", "nc", "-z", "localhost", "80"]
+      test: ["CMD-SHELL", "curl -f http://localhost || exit 1"]
       interval: 5s
       timeout: 10s
       retries: 15
       start_period: 5s
-    command: >
-      sh -c "apt-get update && apt-get install -y netcat && nginx -g 'daemon off;'"
     networks:
       - app-network
 
@@ -21,26 +19,22 @@ services:
       POSTGRES_USER: user
       POSTGRES_PASSWORD: password
     healthcheck:
-      test: ["CMD", "nc", "-z", "localhost", "5432"]
+      test: ["CMD-SHELL", "pg_isready -U $${POSTGRES_USER} -d $${POSTGRES_DB} || exit 1"]
       interval: 5s
       timeout: 10s
       retries: 15
       start_period: 5s
-    command: >
-      sh -c "apt-get update && apt-get install -y netcat && docker-entrypoint.sh postgres"
     networks:
       - app-network
 
   redis:
     image: redis:latest
     healthcheck:
-      test: ["CMD", "sh", "-c", "nc -z localhost 6379 || exit 1"]
+      test: ["CMD-SHELL", "redis-cli ping | grep PONG || exit 1"]
       interval: 5s
       timeout: 10s
       retries: 15
       start_period: 5s
-    command: >
-      sh -c "apk add --no-cache netcat-openbsd && redis-server"
     networks:
       - app-network