diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index 8ef2a7f..d195763 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -54,5 +54,23 @@ jobs:
         IMAGE_TAG: latest
       run: |
         export ENV=$ENV
-        docker-compose build
-        docker-compose push
+        docker-compose -f build.docker-compose.yml build
+        docker-compose -f build.docker-compose.yml push
+
+    - name: Create ZIP file to Deploy AWS Beanstalk
+      env:
+        ENV: ${{ steps.extract_environment.outputs.result }}
+      run: |
+        sed -i -e 's/${ENV}/$ENV/g' docker-compose.yml
+        zip deploy.zip docker-compose.yml
+
+    - name: Deploy AWS Beanstalk
+      env:
+        ENV: ${{ steps.extract_environment.outputs.result }}
+        AWS_REGION: us-east-1
+        APP_NAME: maestro
+      run: |
+        printf "n" | eb init $APP_NAME --region $AWS_REGION
+        eb use $APP_NAME-$ENV
+        echo -e "deploy:\n  artifact: deploy.zip" >> .elasticbeanstalk/config.yml
+        eb deploy
diff --git a/.gitignore b/.gitignore
index b0dd31b..6851d1f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -36,3 +36,8 @@ lerna-debug.log*
 
 # Ignore .env files
 *.env
+
+# Elastic Beanstalk Files
+.elasticbeanstalk/*
+!.elasticbeanstalk/*.cfg.yml
+!.elasticbeanstalk/*.global.yml
diff --git a/build.docker-compose.yml b/build.docker-compose.yml
new file mode 100644
index 0000000..f381cd6
--- /dev/null
+++ b/build.docker-compose.yml
@@ -0,0 +1,5 @@
+version: "3.8"
+services:
+  maestro:
+    build: .
+    image: 468720548566.dkr.ecr.us-east-1.amazonaws.com/microservices/maestro_${ENV}:latest
diff --git a/docker-compose.yml b/docker-compose.yml
index 9218f95..514fd97 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,7 +1,6 @@
 version: "3.8"
 services:
   maestro:
-    build: .
     image: 468720548566.dkr.ecr.us-east-1.amazonaws.com/microservices/maestro_${ENV}:latest
     container_name: maestro
     restart: always