diff --git a/.github/workflows/docker-build-and-push.yaml b/.github/workflows/docker-build-and-push.yaml
index b66167f..81abd06 100644
--- a/.github/workflows/docker-build-and-push.yaml
+++ b/.github/workflows/docker-build-and-push.yaml
@@ -29,21 +29,18 @@ jobs:
             https://chef.heaplab.deib.polimi.it/git/${GITHUB_REPOSITORY}.git \
             ${GITHUB_WORKSPACE}
 
-      - name: Build Docker image
+      - name: Install buildah
+        run: |
+          sudo apt-get update
+          sudo apt-get install -y buildah
+
+      - name: Build image
         run: |
           cd ${GITHUB_WORKSPACE}/mlir0c2701f
-          docker build -t ${REGISTRY}/${IMAGE_NAME} -f Dockerfile .
+          buildah bud -t ${REGISTRY}/${IMAGE_NAME} -f Dockerfile .
 
-      - name: Log in to the Container registry
+      - name: Push image
         if: ${{ github.ref == 'refs/heads/main' }}
-        uses: docker/login-action@9780b0c442fbb1117ed29e0efdff1e18412f7567
-        with:
-          registry: ${{ env.REGISTRY }}
-          username: niccolon
-          password: ${{ secrets.DOCKERHUB_TOKEN }}
-
-      - name: Push Docker image
-        if: ${{ github.ref == 'refs/heads/main' }}
-        id: push
         run: |
-          docker push ${REGISTRY}/${IMAGE_NAME}
+          buildah login -u niccolon -p ${{ secrets.DOCKERHUB_TOKEN }} ${REGISTRY}
+          buildah push ${REGISTRY}/${IMAGE_NAME}