diff --git a/.github/workflows/build-app-pro-beta.yaml b/.github/workflows/build-app-pro-beta.yaml
index 84774b2a2..1cf39a309 100644
--- a/.github/workflows/build-app-pro-beta.yaml
+++ b/.github/workflows/build-app-pro-beta.yaml
@@ -39,7 +39,7 @@ jobs:
           repository: dbgate/dbgate-pro
           token: '${{ secrets.GH_TOKEN }}'
           path: dbgate-pro
-          ref: ca1a1664e4c45945d7afe9534c43ca6cbb0b06e3
+          ref: 6114265cb2d8072f0a0c356f9e9c73db8abc1805
       - name: Merge dbgate/dbgate-pro
         run: |
           mkdir ../dbgate-pro
diff --git a/.github/workflows/build-app-pro.yaml b/.github/workflows/build-app-pro.yaml
index 1c867176d..8dce668cd 100644
--- a/.github/workflows/build-app-pro.yaml
+++ b/.github/workflows/build-app-pro.yaml
@@ -39,7 +39,7 @@ jobs:
           repository: dbgate/dbgate-pro
           token: '${{ secrets.GH_TOKEN }}'
           path: dbgate-pro
-          ref: ca1a1664e4c45945d7afe9534c43ca6cbb0b06e3
+          ref: 6114265cb2d8072f0a0c356f9e9c73db8abc1805
       - name: Merge dbgate/dbgate-pro
         run: |
           mkdir ../dbgate-pro
diff --git a/.github/workflows/build-aws-pro.yaml b/.github/workflows/build-cloud-pro.yaml
similarity index 73%
rename from .github/workflows/build-aws-pro.yaml
rename to .github/workflows/build-cloud-pro.yaml
index 2d98e2363..b39dc183f 100644
--- a/.github/workflows/build-aws-pro.yaml
+++ b/.github/workflows/build-cloud-pro.yaml
@@ -1,7 +1,7 @@
 # --------------------------------------------------------------------------------------------
 # This file is generated. Do not edit manually
 # --------------------------------------------------------------------------------------------
-name: AWS image PREMIUM
+name: Cloud images PREMIUM
 'on':
   push:
     tags:
@@ -26,6 +26,9 @@ jobs:
         uses: actions/setup-node@v1
         with:
           node-version: 18.x
+      - name: Install jq
+        run: |
+          sudo apt-get install jq -y
       - name: Setup `packer`
         uses: hashicorp/setup-packer@main
         with:
@@ -36,7 +39,7 @@ jobs:
           repository: dbgate/dbgate-pro
           token: '${{ secrets.GH_TOKEN }}'
           path: dbgate-pro
-          ref: ca1a1664e4c45945d7afe9534c43ca6cbb0b06e3
+          ref: 6114265cb2d8072f0a0c356f9e9c73db8abc1805
       - name: Merge dbgate/dbgate-pro
         run: |
           mkdir ../dbgate-pro
@@ -94,31 +97,11 @@ jobs:
           prerelease: true
         env:
           GITHUB_TOKEN: '${{ secrets.GITHUB_TOKEN }}'
-      - name: Run `packer init`
+      - name: Run `packer init` for Azure
         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`
+          packer init ./azure-ubuntu.pkr.hcl
+      - name: Run `packer build` for Azure
         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: Install jq
-        run: |
-          sudo apt-get install jq -y
-      - name: Delete old AMIs
-        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}}'
+          packer build ./azure-ubuntu.pkr.hcl
diff --git a/.github/workflows/build-docker-pro.yaml b/.github/workflows/build-docker-pro.yaml
index ce4f5b724..aa446b055 100644
--- a/.github/workflows/build-docker-pro.yaml
+++ b/.github/workflows/build-docker-pro.yaml
@@ -44,7 +44,7 @@ jobs:
           repository: dbgate/dbgate-pro
           token: '${{ secrets.GH_TOKEN }}'
           path: dbgate-pro
-          ref: ca1a1664e4c45945d7afe9534c43ca6cbb0b06e3
+          ref: 6114265cb2d8072f0a0c356f9e9c73db8abc1805
       - name: Merge dbgate/dbgate-pro
         run: |
           mkdir ../dbgate-pro
diff --git a/.github/workflows/build-npm-pro.yaml b/.github/workflows/build-npm-pro.yaml
index fb417cfb2..583ac3ed6 100644
--- a/.github/workflows/build-npm-pro.yaml
+++ b/.github/workflows/build-npm-pro.yaml
@@ -32,7 +32,7 @@ jobs:
           repository: dbgate/dbgate-pro
           token: '${{ secrets.GH_TOKEN }}'
           path: dbgate-pro
-          ref: ca1a1664e4c45945d7afe9534c43ca6cbb0b06e3
+          ref: 6114265cb2d8072f0a0c356f9e9c73db8abc1805
       - name: Merge dbgate/dbgate-pro
         run: |
           mkdir ../dbgate-pro
diff --git a/.github/workflows/e2e-pro.yaml b/.github/workflows/e2e-pro.yaml
index 83113cce2..8c21c5b45 100644
--- a/.github/workflows/e2e-pro.yaml
+++ b/.github/workflows/e2e-pro.yaml
@@ -26,7 +26,7 @@ jobs:
           repository: dbgate/dbgate-pro
           token: '${{ secrets.GH_TOKEN }}'
           path: dbgate-pro
-          ref: ca1a1664e4c45945d7afe9534c43ca6cbb0b06e3
+          ref: 6114265cb2d8072f0a0c356f9e9c73db8abc1805
       - name: Merge dbgate/dbgate-pro
         run: |
           mkdir ../dbgate-pro
diff --git a/workflow-templates/includes.tpl.yaml b/workflow-templates/includes.tpl.yaml
index 61336d79a..e1236abb5 100644
--- a/workflow-templates/includes.tpl.yaml
+++ b/workflow-templates/includes.tpl.yaml
@@ -7,7 +7,7 @@ checkout-and-merge-pro:
       repository: dbgate/dbgate-pro
       token: ${{ secrets.GH_TOKEN }}
       path: dbgate-pro
-      ref: ca1a1664e4c45945d7afe9534c43ca6cbb0b06e3
+      ref: 6114265cb2d8072f0a0c356f9e9c73db8abc1805
   - name: Merge dbgate/dbgate-pro
     run: |
       mkdir ../dbgate-pro