diff --git a/.github/workflows/docker-build-and-push.yaml b/.github/workflows/docker-build-and-push.yaml
index d37ebee..7bc9c0a 100644
--- a/.github/workflows/docker-build-and-push.yaml
+++ b/.github/workflows/docker-build-and-push.yaml
@@ -29,28 +29,14 @@ jobs:
             https://chef.heaplab.deib.polimi.it/git/${GITHUB_REPOSITORY}.git \
             ${GITHUB_WORKSPACE}
 
-      - name: Install buildah
-        run: |
-          sudo apt-get update
-          sudo apt-get install -y buildah
-
-
-      - name: Build Image
-        id: build-image
-        uses: redhat-actions/buildah-build@v2
-        with:
-          image: ${{ env.IMAGE_NAME }}
-          tags: latest
-          containerfiles: |
-            ./mlir0c2701f/Dockerfile
-          context: ./mlir0c2701f
-
-      - name: Push Image
-        if: github.ref == 'refs/heads/main'
-        uses: redhat-actions/push-to-registry@v2
-        with:
-          image: ${{ steps.build-image.outputs.image }}
-          tags: ${{ steps.build-image.outputs.tags }}
-          registry: ${{ env.REGISTRY }}
-          username: niccolon
-          password: ${{ secrets.DOCKERHUB_TOKEN }}
+- name: Build and Push with Kaniko
+      uses: aevea/action-kaniko@v0.10.0 # High-level wrapper for Kaniko
+      with:
+        image: niccolon/raptor-deps-mlir0c2701f
+        cache: true
+        path: mlir0c2701f
+        build_file: mlir0c2701f/Dockerfile
+        username: niccolon
+        password: ${{ secrets.DOCKERHUB_TOKEN }}
+        # Extra args to handle the specific environment
+        extra_args: "--snapshot-mode=redo --use-new-run"