diff --git a/.github/workflows/multiarch.yaml b/.github/workflows/multiarch.yaml
index a098a85..2927346 100644
--- a/.github/workflows/multiarch.yaml
+++ b/.github/workflows/multiarch.yaml
@@ -25,7 +25,7 @@ jobs:
         env:
           QUAY_TOKEN: ${{ secrets.QUAY_TOKEN }}
         run: |
-          buildah login -u "poseidon+github" -p "$QUAY_TOKEN" quay.io
+          podman login -u "poseidon+github" -p "$QUAY_TOKEN" quay.io
 
       - name: Push Image
         if: github.ref == 'refs/heads/main'
@@ -51,7 +51,7 @@ jobs:
         env:
           QUAY_TOKEN: ${{ secrets.QUAY_TOKEN }}
         run: |
-          buildah login -u "poseidon+github" -p "$QUAY_TOKEN" quay.io
+          podman login -u "poseidon+github" -p "$QUAY_TOKEN" quay.io
 
       - name: Push Image
         if: github.ref == 'refs/heads/main'
@@ -77,7 +77,7 @@ jobs:
         env:
           QUAY_TOKEN: ${{ secrets.QUAY_TOKEN }}
         run: |
-          buildah login -u "poseidon+github" -p "$QUAY_TOKEN" quay.io
+          podman login -u "poseidon+github" -p "$QUAY_TOKEN" quay.io
 
       - name: Push Multi-Arch
         run: make manifest
diff --git a/Makefile b/Makefile
index 5b2d5e3..8fd46e2 100644
--- a/Makefile
+++ b/Makefile
@@ -7,6 +7,9 @@ REPO=github.com/poseidon/fleetlock
 LOCAL_REPO=poseidon/fleetlock
 IMAGE_REPO=quay.io/poseidon/fleetlock
 
+PLATFORM_amd64=linux/amd64
+PLATFORM_arm64=linux/arm64/v8
+
 LD_FLAGS="-w -X main.version=$(VERSION)"
 
 .PHONY: all
@@ -38,21 +41,20 @@ image: \
 	image-arm64
 
 image-%:
-	buildah bud -f Dockerfile \
+	podman build -f Dockerfile \
 	-t $(LOCAL_REPO):$(VERSION)-$* \
-	--arch $* --override-arch $* \
-	--format=docker .
+	--platform $(PLATFORM_$*) .
 
 push-%:
-	buildah tag $(LOCAL_REPO):$(VERSION)-$* $(IMAGE_REPO):$(VERSION)-$*
-	buildah push --format v2s2 $(IMAGE_REPO):$(VERSION)-$*
+	podman tag $(LOCAL_REPO):$(VERSION)-$* $(IMAGE_REPO):$(VERSION)-$*
+	podman push $(IMAGE_REPO):$(VERSION)-$*
 
 manifest:
-	buildah manifest create $(IMAGE_REPO):$(VERSION)
-	buildah manifest add $(IMAGE_REPO):$(VERSION) docker://$(IMAGE_REPO):$(VERSION)-amd64
-	buildah manifest add --variant v8 $(IMAGE_REPO):$(VERSION) docker://$(IMAGE_REPO):$(VERSION)-arm64
-	buildah manifest inspect $(IMAGE_REPO):$(VERSION)
-	buildah manifest push -f v2s2 $(IMAGE_REPO):$(VERSION) docker://$(IMAGE_REPO):$(VERSION)
+	podman manifest create $(IMAGE_REPO):$(VERSION)
+	podman manifest add $(IMAGE_REPO):$(VERSION) docker://$(IMAGE_REPO):$(VERSION)-amd64
+	podman manifest add $(IMAGE_REPO):$(VERSION) docker://$(IMAGE_REPO):$(VERSION)-arm64
+	podman manifest inspect $(IMAGE_REPO):$(VERSION)
+	podman manifest push $(IMAGE_REPO):$(VERSION) docker://$(IMAGE_REPO):$(VERSION)
 
 lock:
 	curl -H "fleet-lock-protocol: true" -d @examples/body.json http://127.0.0.1:8080/v1/pre-reboot
@@ -60,4 +62,3 @@ lock:
 unlock:
 	curl -H "fleet-lock-protocol: true" -d @examples/body.json http://127.0.0.1:8080/v1/steady-state
 
-