diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 6dfa3ef82..041d09da4 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -4,13 +4,17 @@ on:
   push:
     branches:
       - "main"
+      - "chore/fix-ci"
   pull_request:
     branches:
       - "main"
+      - "chore/fix-ci"
 
 jobs:
   docker:
     runs-on: self-hosted
+    env:
+      DOCKER_BUILDKIT: 1
 
     steps:
       - name: Checkout
@@ -40,19 +44,37 @@ jobs:
 
       - name: Get version from git tags
         id: get_version
-        run: echo "VERSION=$(git describe --tags --abbrev=0 | sed 's/^v//')" >> $GITHUB_ENV
+        run: echo "VERSION=v$(git describe --tags --abbrev=0 | sed 's/^v//')" >> $GITHUB_ENV
 
       - name: Log in to Docker Hub
         run: echo "${{ secrets.DOCKERHUB_TOKEN }}" | docker login --username ${{ secrets.DOCKERHUB_USERNAME }} --password-stdin
 
       - name: Set up Docker Buildx
-        run: docker buildx create --use --driver cloud "neutronorg/neutron"
+        id: buildx
+        uses: docker/setup-buildx-action@v3
+        with:
+          version: "lab:latest"
+          driver: cloud
+          endpoint: "neutronorg/neutron"
+          install: true
+
+#      - name: Build and push
+#        uses: docker/build-push-action@v5
+#        with:
+#          context: .
+#          file: Dockerfile.builder
+#          tags: "${{ env.VERSION }}"
+#          # For pull requests, export results to the build cache.
+#          # Otherwise, push to a registry.
+#          outputs: ${{ github.event_name == 'pull_request' && 'type=cacheonly' || 'type=registry,push=true' }}
 
       - name: Build and push Docker image
         env:
           VERSION: ${{ env.VERSION }}
+          BUILDER: ${{ steps.buildx.outputs.name }}
         run: |
-          DOCKER_BUILDKIT=1 make build-static-linux-amd64
+          docker buildx use $BUILDER
+          make build-static-linux-amd64
           docker tag neutron-amd64:latest neutronorg/neutron:${{ env.VERSION }}
           docker push neutronorg/neutron:${{ env.VERSION }}