diff --git a/.github/workflows/build-cloud-pro.yaml b/.github/workflows/build-cloud-pro.yaml
index c196dc875..0cae130b3 100644
--- a/.github/workflows/build-cloud-pro.yaml
+++ b/.github/workflows/build-cloud-pro.yaml
@@ -105,6 +105,22 @@ jobs:
         run: |
           cd ../dbgate-merged/packer
           packer build ./azure-ubuntu.pkr.hcl
+      - name: Run `packer init` for AWS
+        run: |
+          cd ../dbgate-merged/packer
+          packer init ./aws-ubuntu.pkr.hcl
+        env:
+          AWS_ACCESS_KEY_ID: '${{secrets.AWS_ACCESS_KEY_ID}}'
+          AWS_SECRET_ACCESS_KEY: '${{secrets.AWS_SECRET_ACCESS_KEY}}'
+          AWS_DEFAULT_REGION: '${{secrets.AWS_DEFAULT_REGION}}'
+      - name: Run `packer build` for AWS
+        run: |
+          cd ../dbgate-merged/packer
+          packer build ./aws-ubuntu.pkr.hcl
+        env:
+          AWS_ACCESS_KEY_ID: '${{secrets.AWS_ACCESS_KEY_ID}}'
+          AWS_SECRET_ACCESS_KEY: '${{secrets.AWS_SECRET_ACCESS_KEY}}'
+          AWS_DEFAULT_REGION: '${{secrets.AWS_DEFAULT_REGION}}'
       - name: Delete old Azure VMs
         run: |
           cd ../dbgate-merged/packer
@@ -115,3 +131,12 @@ jobs:
           AZURE_CLIENT_SECRET: '${{secrets.AZURE_CLIENT_SECRET}}'
           AZURE_TENANT_ID: '${{secrets.AZURE_TENANT_ID}}'
           AZURE_SUBSCRIPTION_ID: '${{secrets.AZURE_SUBSCRIPTION_ID}}'
+      - name: Delete old AMIs (AWS)
+        run: |
+          cd ../dbgate-merged/packer
+          chmod +x delete-old-amis.sh
+          ./delete-old-amis.sh
+        env:
+          AWS_ACCESS_KEY_ID: '${{secrets.AWS_ACCESS_KEY_ID}}'
+          AWS_SECRET_ACCESS_KEY: '${{secrets.AWS_SECRET_ACCESS_KEY}}'
+          AWS_DEFAULT_REGION: '${{secrets.AWS_DEFAULT_REGION}}'
diff --git a/workflow-templates/build-cloud-pro.yaml b/workflow-templates/build-cloud-pro.yaml
index 5c0a0121c..6fbecb4e9 100644
--- a/workflow-templates/build-cloud-pro.yaml
+++ b/workflow-templates/build-cloud-pro.yaml
@@ -105,23 +105,23 @@ jobs:
           cd ../dbgate-merged/packer
           packer build ./azure-ubuntu.pkr.hcl
 
-      # - name: Run `packer init` for AWS
-      #   run: |
-      #     cd ../dbgate-merged/packer
-      #     packer init ./aws-ubuntu.pkr.hcl
-      #   env:
-      #     AWS_ACCESS_KEY_ID: ${{secrets.AWS_ACCESS_KEY_ID}}
-      #     AWS_SECRET_ACCESS_KEY: ${{secrets.AWS_SECRET_ACCESS_KEY}}
-      #     AWS_DEFAULT_REGION: ${{secrets.AWS_DEFAULT_REGION}}
+      - name: Run `packer init` for AWS
+        run: |
+          cd ../dbgate-merged/packer
+          packer init ./aws-ubuntu.pkr.hcl
+        env:
+          AWS_ACCESS_KEY_ID: ${{secrets.AWS_ACCESS_KEY_ID}}
+          AWS_SECRET_ACCESS_KEY: ${{secrets.AWS_SECRET_ACCESS_KEY}}
+          AWS_DEFAULT_REGION: ${{secrets.AWS_DEFAULT_REGION}}
 
-      # - name: Run `packer build` for AWS
-      #   run: |
-      #     cd ../dbgate-merged/packer
-      #     packer build ./aws-ubuntu.pkr.hcl
-      #   env:
-      #     AWS_ACCESS_KEY_ID: ${{secrets.AWS_ACCESS_KEY_ID}}
-      #     AWS_SECRET_ACCESS_KEY: ${{secrets.AWS_SECRET_ACCESS_KEY}}
-      #     AWS_DEFAULT_REGION: ${{secrets.AWS_DEFAULT_REGION}}
+      - name: Run `packer build` for AWS
+        run: |
+          cd ../dbgate-merged/packer
+          packer build ./aws-ubuntu.pkr.hcl
+        env:
+          AWS_ACCESS_KEY_ID: ${{secrets.AWS_ACCESS_KEY_ID}}
+          AWS_SECRET_ACCESS_KEY: ${{secrets.AWS_SECRET_ACCESS_KEY}}
+          AWS_DEFAULT_REGION: ${{secrets.AWS_DEFAULT_REGION}}
 
       - name: Delete old Azure VMs
         run: |
@@ -134,12 +134,12 @@ jobs:
           AZURE_TENANT_ID: ${{secrets.AZURE_TENANT_ID}}
           AZURE_SUBSCRIPTION_ID: ${{secrets.AZURE_SUBSCRIPTION_ID}}
 
-      # - name: Delete old AMIs (AWS)
-      #   run: |
-      #     cd ../dbgate-merged/packer
-      #     chmod +x delete-old-amis.sh
-      #     ./delete-old-amis.sh
-      #   env:
-      #     AWS_ACCESS_KEY_ID: ${{secrets.AWS_ACCESS_KEY_ID}}
-      #     AWS_SECRET_ACCESS_KEY: ${{secrets.AWS_SECRET_ACCESS_KEY}}
-      #     AWS_DEFAULT_REGION: ${{secrets.AWS_DEFAULT_REGION}}
+      - name: Delete old AMIs (AWS)
+        run: |
+          cd ../dbgate-merged/packer
+          chmod +x delete-old-amis.sh
+          ./delete-old-amis.sh
+        env:
+          AWS_ACCESS_KEY_ID: ${{secrets.AWS_ACCESS_KEY_ID}}
+          AWS_SECRET_ACCESS_KEY: ${{secrets.AWS_SECRET_ACCESS_KEY}}
+          AWS_DEFAULT_REGION: ${{secrets.AWS_DEFAULT_REGION}}