diff --git a/.github/workflows/container.yml b/.github/workflows/container.yml
index c6ff8a6..e6404d2 100644
--- a/.github/workflows/container.yml
+++ b/.github/workflows/container.yml
@@ -33,12 +33,14 @@ jobs:
           password: ${{ env.REGISTRY_PASSWORD }}
           registry: ${{ env.IMAGE_REGISTRY }}
 
+      # We use "buildah build" instead of "podman build", because we are seeing errors on the older
+      # version of podman installed on the runners.
       - name: Build container images with podman
         id: build-image
         run: |
           podman manifest create dash-mpd-cli
-          podman build . -f etc/Containerfile_linux_amd64 --arch amd64 --tag dash-mpd-cli-linux-amd64 --manifest dash-mpd-cli
-          podman build . -f etc/Containerfile_linux_aarch64 --arch arm64/v8 --tag dash-mpd-cli-linux-aarch64 --manifest dash-mpd-cli
+          buildah build . -f etc/Containerfile_linux_amd64 --arch amd64 --tag dash-mpd-cli-linux-amd64 --manifest dash-mpd-cli
+          buildah build . -f etc/Containerfile_linux_aarch64 --arch arm64/v8 --tag dash-mpd-cli-linux-aarch64 --manifest dash-mpd-cli
 
       - name: Push container image
         id: push-to-registry