diff --git a/.github/workflows/cd-build-push-deploy.yml b/.github/workflows/cd-build-push-deploy.yml
index 3982a5d7..8b367f62 100644
--- a/.github/workflows/cd-build-push-deploy.yml
+++ b/.github/workflows/cd-build-push-deploy.yml
@@ -36,13 +36,13 @@ env:
 
 jobs:
   build-and-push:
-    runs-on: builder-self-hosted
+    runs-on: ubuntu-latest
 
     steps:
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
-        with:
-          driver: docker
+        # with:
+        #   driver: docker
 
       - name: Login into Registry
         if: ${{ env.ENABLE_PUSH_IMAGE == 'true' }}
@@ -58,33 +58,23 @@ jobs:
         with:
           target: api-service
           tags: ${{ env.REGISTRY_URL }}/${{ env.IMAGE_NAME_SERVICE }}:${{ env.IMAGE_TAG }}
-          
           build-args: GIT_COMMIT_HASH=${{ github.sha }}
-          
           push: ${{ env.ENABLE_PUSH_IMAGE == 'true' }}
-          
           platforms: linux/amd64
-          # load: true
-          outputs: type=docker
-          # outputs: type=cacheonly
-          # provenance: true
-    
+          outputs: type=cacheonly
+          provenance: true
+
       - name: Build and push @ladesa-ro/api-client-fetch-docs
         if: ${{ env.ENABLE_BUILD_IMAGE == 'true' }}
         uses: docker/build-push-action@v6
         with:
           target: npm-api-client-fetch-docs
           tags: ${{ env.REGISTRY_URL }}/${{ env.IMAGE_NAME_DOCS_NPM_API_CLIENT_FETCH }}:${{ env.IMAGE_TAG }}
-
           build-args: GIT_COMMIT_HASH=${{ github.sha }}
-
           push: ${{ env.ENABLE_PUSH_IMAGE == 'true' }}
-
           platforms: linux/amd64
-          # load: true
-          outputs: type=docker
-          # outputs: type=cacheonly
-          # provenance: true
+          outputs: type=cacheonly
+          provenance: true
 
   deploy:
     runs-on: ubuntu-latest