diff --git a/.github/workflows/dev-release.yaml b/.github/workflows/dev-release.yaml
index 426dbbe4..86a760a0 100644
--- a/.github/workflows/dev-release.yaml
+++ b/.github/workflows/dev-release.yaml
@@ -11,12 +11,12 @@ jobs:
     name: Build and push develop images
     runs-on: ubuntu-24.04
     steps:
-      - run: sudo apt-get install -y make python3-build python3-venv
+      - run: sudo apt-get install -y make python3-build python3-venv podman
       - uses: actions/checkout@v4
         with:
           repository: Nitrate/containers
-      - run: make all-images engine=docker
-      - run: |
+      - name: Build all images and push them to registry
+        run: |
           echo "${{ secrets.quay_token }}" | \
             docker login -u "${{ secrets.quay_username }}" --password-stdin quay.io
-          make push-all engine=docker
+          make all-images push-all
diff --git a/.github/workflows/distribution.yaml b/.github/workflows/distribution.yaml
index 7f457e07..8787b918 100644
--- a/.github/workflows/distribution.yaml
+++ b/.github/workflows/distribution.yaml
@@ -25,14 +25,15 @@ jobs:
   build-and-push-images:
     name: Build and push images
     needs: pypi
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
     steps:
-      - run: sudo apt-get install -y make python3 python3-pip
+      - run: sudo apt-get install -y make python3 python3-pip podman
       - uses: actions/checkout@v4
         with:
           repository: Nitrate/containers
-      - run: |
+      - name: Build all images and push them to registry
+        run: |
           echo "${{ secrets.quay_token }}" | \
             docker login -u "${{ secrets.quay_username }}" --password-stdin quay.io
           git_ref="${{ github.ref }}"
-          make all-images push-all engine=docker version=${git_ref##refs/tags/v}
+          make all-images push-all version=${git_ref##refs/tags/v}