diff --git a/.github/workflows/build-cloud-pro.yaml b/.github/workflows/build-cloud-pro.yaml
index dc20b137e..028c084b8 100644
--- a/.github/workflows/build-cloud-pro.yaml
+++ b/.github/workflows/build-cloud-pro.yaml
@@ -56,10 +56,71 @@ jobs:
           cd ..
           cd dbgate-merged
           node adjustPackageJson --premium
+      - name: yarn install
+        run: |
+          cd ..
+          cd dbgate-merged
+          yarn install
+      - name: setCurrentVersion
+        run: |
+          cd ..
+          cd dbgate-merged
+          yarn setCurrentVersion
+      - name: printSecrets
+        run: |
+          cd ..
+          cd dbgate-merged
+            yarn printSecrets
+        env:
+          GIST_UPLOAD_SECRET: '${{secrets.GIST_UPLOAD_SECRET}}'
+      - name: Prepare packer build
+        run: |
+          cd ..
+          cd dbgate-merged
+          yarn run prepare:packer
+          cd packer
+          zip -r cloud-build.zip build
+      - name: Copy artifacts
+        run: |
+          mkdir artifacts          
+          cp ../dbgate-merged/packer/cloud-build.zip artifacts/cloud-build.zip || true
+      - name: Upload artifacts
+        uses: actions/upload-artifact@v4
+        with:
+          name: '${{ matrix.os }}'
+          path: artifacts
+      - name: Release
+        uses: softprops/action-gh-release@v1
+        if: 'startsWith(github.ref, ''refs/tags/'')'
+        with:
+          files: artifacts/**
+          prerelease: true
+        env:
+          GITHUB_TOKEN: '${{ secrets.GITHUB_TOKEN }}'
       - name: Run `packer init` for Azure
         run: |
           cd ../dbgate-merged/packer
           packer init ./azure-ubuntu.pkr.hcl
+      - name: Run `packer build` for Azure
+        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
@@ -70,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 6be2d19f0..6fbecb4e9 100644
--- a/workflow-templates/build-cloud-pro.yaml
+++ b/workflow-templates/build-cloud-pro.yaml
@@ -47,81 +47,81 @@ jobs:
           cd dbgate-merged
           node adjustPackageJson --premium
 
-      # - name: yarn install
-      #   run: |
-      #     cd ..
-      #     cd dbgate-merged
-      #     yarn install
+      - name: yarn install
+        run: |
+          cd ..
+          cd dbgate-merged
+          yarn install
 
-      # - name: setCurrentVersion
-      #   run: |
-      #     cd ..
-      #     cd dbgate-merged
-      #     yarn setCurrentVersion
+      - name: setCurrentVersion
+        run: |
+          cd ..
+          cd dbgate-merged
+          yarn setCurrentVersion
           
-      # - name: printSecrets
-      #   run: |
-      #     cd ..
-      #     cd dbgate-merged
-      #       yarn printSecrets
-      #   env:
-      #     GIST_UPLOAD_SECRET : ${{secrets.GIST_UPLOAD_SECRET}}
+      - name: printSecrets
+        run: |
+          cd ..
+          cd dbgate-merged
+            yarn printSecrets
+        env:
+          GIST_UPLOAD_SECRET : ${{secrets.GIST_UPLOAD_SECRET}}
 
-      # - name: Prepare packer build
-      #   run: |
-      #     cd ..
-      #     cd dbgate-merged
-      #     yarn run prepare:packer
-      #     cd packer
-      #     zip -r cloud-build.zip build
+      - name: Prepare packer build
+        run: |
+          cd ..
+          cd dbgate-merged
+          yarn run prepare:packer
+          cd packer
+          zip -r cloud-build.zip build
 
-      # - name: Copy artifacts
-      #   run: |
-      #     mkdir artifacts          
-      #     cp ../dbgate-merged/packer/cloud-build.zip artifacts/cloud-build.zip || true
+      - name: Copy artifacts
+        run: |
+          mkdir artifacts          
+          cp ../dbgate-merged/packer/cloud-build.zip artifacts/cloud-build.zip || true
 
-      # - name: Upload artifacts
-      #   uses: actions/upload-artifact@v4
-      #   with:
-      #     name: ${{ matrix.os }}
-      #     path: artifacts
+      - name: Upload artifacts
+        uses: actions/upload-artifact@v4
+        with:
+          name: ${{ matrix.os }}
+          path: artifacts
 
-      # - name: Release
-      #   uses: softprops/action-gh-release@v1
-      #   if: startsWith(github.ref, 'refs/tags/')
-      #   with:
-      #     files: 'artifacts/**'
-      #     prerelease: true
-      #   env:
-      #     GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      - name: Release
+        uses: softprops/action-gh-release@v1
+        if: startsWith(github.ref, 'refs/tags/')
+        with:
+          files: 'artifacts/**'
+          prerelease: true
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Run `packer init` for Azure
         run: |
           cd ../dbgate-merged/packer
           packer init ./azure-ubuntu.pkr.hcl
 
-      # - name: Run `packer build` for Azure
-      #   run: |
-      #     cd ../dbgate-merged/packer
-      #     packer build ./azure-ubuntu.pkr.hcl
+      - name: Run `packer build` for Azure
+        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 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}}