diff --git a/.github/workflows/build-docker-beta.yaml b/.github/workflows/build-docker-beta.yaml
index 1d5feeab..a3867f05 100644
--- a/.github/workflows/build-docker-beta.yaml
+++ b/.github/workflows/build-docker-beta.yaml
@@ -25,6 +25,31 @@ jobs:
       - uses: actions/checkout@v2
         with:
           fetch-depth: 1
+          
+      - name: Docker meta
+        id: meta
+        uses: docker/metadata-action@v4
+        with:
+          images: |
+            dbgate/dbgate
+          flavor: |
+            latest=false
+          tags: |
+            type=match,pattern=\d+.\d+.\d+,suffix=-beta
+            type=raw,value=beta
+
+      - name: Docker alpine meta
+        id: alpmeta
+        uses: docker/metadata-action@v4
+        with:
+          images: |
+            dbgate/dbgate
+          flavor: |
+            latest=false
+          tags: |
+            type=match,pattern=\d+.\d+.\d+,suffix=-beta-alpine
+            type=raw,value=beta-alpine
+
       - name: Use Node.js 14.x
         uses: actions/setup-node@v1
         with:
@@ -41,47 +66,50 @@ jobs:
         run: |
           yarn run prepare:docker
 
-      - name: Docker meta
-        id: meta
-        uses: docker/metadata-action@v4
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v2
+      - name: Login to DockerHub
+        uses: docker/login-action@v2
         with:
-          images: |
-            dbgate/dbgate
-          tags: |
-            type=match,pattern=\d+.\d+.\d+,suffix=-beta
-            type=raw,value=latest,enable=false
+          username: ${{ secrets.DOCKER_USERNAME }}
+          password: ${{ secrets.DOCKER_PASSWORD }}
 
-      - name: Docker alpine meta
-        id: alpmeta
-        uses: docker/metadata-action@v4
+      - name: Build and push
+        uses: docker/build-push-action@v3
         with:
-          images: |
-            dbgate/dbgate
-          tags: |
-            type=match,pattern=\d+.\d+.\d+,suffix=-beta-alpine
-            type=raw,value=latest,enable=false
+          push: true
+          context: ./docker
+          tags: ${{ steps.meta.outputs.tags }}
 
-      - name: Build docker image
-        run: |
-          docker build ./docker -t dbgate
-      - name: Push docker image
-        run: |
-          docker tag dbgate dbgate/dbgate:beta
-          docker tag dbgate ${{ steps.meta.outputs.tags }}
-          docker login -u ${{ secrets.DOCKER_USERNAME }} -p ${{ secrets.DOCKER_PASSWORD }}
-          docker push dbgate/dbgate:beta
-          docker push ${{ steps.meta.outputs.tags }}
+      - name: Build and push alpine
+        uses: docker/build-push-action@v3
+        with:
+          push: true
+          context: ./docker
+          file: ./docker/Dockerfile-alpine
+          tags: ${{ steps.meta.outputs.tags }}
 
-      - name: Build alpine docker image
-        run: |
-          docker build ./docker -t dbgate -f docker/Dockerfile-alpine
-      - name: Push alpine docker image
-        run: |
-          docker tag dbgate dbgate/dbgate:beta-alpine
-          docker tag dbgate ${{ steps.alpmeta.outputs.tags }}
-          docker login -u ${{ secrets.DOCKER_USERNAME }} -p ${{ secrets.DOCKER_PASSWORD }}
-          docker push dbgate/dbgate:beta-alpine
-          docker push ${{ steps.alpmeta.outputs.tags }}
+      # - name: Build docker image
+      #   run: |
+      #     docker build ./docker -t dbgate
+      # - name: Push docker image
+      #   run: |
+      #     docker tag dbgate dbgate/dbgate:beta
+      #     docker tag dbgate ${{ steps.meta.outputs.tags }}
+      #     docker login -u ${{ secrets.DOCKER_USERNAME }} -p ${{ secrets.DOCKER_PASSWORD }}
+      #     docker push dbgate/dbgate:beta
+      #     docker push ${{ steps.meta.outputs.tags }}
+
+      # - name: Build alpine docker image
+      #   run: |
+      #     docker build ./docker -t dbgate -f docker/Dockerfile-alpine
+      # - name: Push alpine docker image
+      #   run: |
+      #     docker tag dbgate dbgate/dbgate:beta-alpine
+      #     docker tag dbgate ${{ steps.alpmeta.outputs.tags }}
+      #     docker login -u ${{ secrets.DOCKER_USERNAME }} -p ${{ secrets.DOCKER_PASSWORD }}
+      #     docker push dbgate/dbgate:beta-alpine
+      #     docker push ${{ steps.alpmeta.outputs.tags }}
 
       # - name: Build docker
       #   uses: mr-smithers-excellent/docker-build-push@v3