diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index 27f7a24..e2496e9 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -89,6 +89,26 @@ jobs:
         id: login_ecr
         uses: aws-actions/amazon-ecr-login@v1
 
+      - name: Build, Tag, and Push Image to AWS ECR
+        if: steps.semantic.outputs.new_release_published == 'true'
+        env:
+          ENV: ${{ steps.extract_environment.outputs.result }}
+          IMAGE_TAG: ${{ steps.semantic.outputs.new_release_version }}
+          NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
+        run: |
+          docker-compose -f build.docker-compose.yml build --build-arg NPM_TOKEN=${NPM_TOKEN}
+          docker-compose -f build.docker-compose.yml push
+
+      - name: Create ZIP file to Deploy AWS Beanstalk
+        if: steps.semantic.outputs.new_release_published == 'true'
+        env:
+          ENV: ${{ steps.extract_environment.outputs.result }}
+          IMAGE_TAG: ${{ steps.semantic.outputs.new_release_version }}
+        run: |
+          sed -i -e "s/\${ENV}/$ENV/g" docker-compose.yml
+          sed -i -e "s/\${IMAGE_TAG}/$IMAGE_TAG/g" docker-compose.yml
+          zip deploy.zip docker-compose.yml  -r .ebextensions
+
       - name: Deploy AWS Beanstalk
         if: steps.semantic.outputs.new_release_published == 'true'
         env:
@@ -97,7 +117,6 @@ jobs:
           APP_NAME: maestro
         run: |
           eb use $APP_NAME-$ENV
-          echo -e "deploy:\n  artifact: deploy.zip" >> .elasticbeanstalk/config.yml
           eb deploy
 
       - name: Remove Docker's Trash