diff --git a/.github/workflows/deploy-dev.yml b/.github/workflows/deploy-dev.yml
index 9d8ac85..2837e84 100644
--- a/.github/workflows/deploy-dev.yml
+++ b/.github/workflows/deploy-dev.yml
@@ -71,10 +71,10 @@ jobs:
               "cd /var/www/app",
               "aws s3 cp s3://'"$CODE_BUCKET"'/'"$FILE_NAME"' app.zip --region '"$REGION"'",
               "sudo -u ec2-user unzip -o app.zip",
-              "sleep 10",
-              "sudo -u ec2-user /usr/local/bin/docker-compose up api-run postgres redis -d --build",
-              "sleep 10",
-              "sudo -u ec2-user /usr/local/bin/docker-compose exec -T api-run npm run migration:run"
+              "sleep 15",
+              "sudo -u ec2-user /usr/local/bin/docker-compose -f docker-compose-dev.yml restart api-run postgres redis -d",
+              "sleep 15",
+              "sudo -u ec2-user /usr/local/bin/docker-compose -f docker-compose-dev.yml exec -T api-run npm run migration:run"
             ]' \
             --region "$REGION" \
             --query "Command.CommandId" \
diff --git a/docker-compose.yml b/docker-compose.yml
index 44894c0..18571a6 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -20,24 +20,6 @@ services:
       && rm -rf dist
       && npm run start:debug"
 
-  api-run:
-    container_name: ionicapp_api_run
-    restart: unless-stopped
-    depends_on:
-      - postgres
-      - redis
-    build:  
-      context: docker/api
-      dockerfile: ./Dockerfile
-    user: "node"
-    tty: true
-    volumes:
-      - ./:/app
-    ports:
-      - ${PORT}:3000
-      - ${DEBUG_PORT}:9229
-    command: ["npm", "run", "start:prod"]
-
   postgres:
     container_name: ionicapp_postgres
     restart: unless-stopped
diff --git a/infra/lib/infra-stack.ts b/infra/lib/infra-stack.ts
index 4e52d2a..518e6ea 100644
--- a/infra/lib/infra-stack.ts
+++ b/infra/lib/infra-stack.ts
@@ -281,8 +281,11 @@ export class InfraStack extends cdk.Stack {
       `echo "JWT_REFRESH_SECRET_KEY=$JWT_REFRESH_SECRET_KEY" >> .env`,
       `echo "BCRYPT_SALT_ROUNDS=8" >> .env`,
 
-      // Start Docker Compose
-      'sudo -u ec2-user /usr/local/bin/docker-compose up api-run postgres redis -d',
+      // Build app
+      'sudo -u ec2-user /usr/local/bin/docker-compose -f docker-compose-dev.yml up api-build',
+
+      // Start services
+      'sudo -u ec2-user /usr/local/bin/docker-compose -f docker-compose-dev.yml up api-run postgres redis -d',
 
       // Wait for services to start, then run migrations
       'sleep 30',