diff --git a/jenkins/Makefile b/jenkins/Makefile
index 71f40807af..a9cd54c6be 100644
--- a/jenkins/Makefile
+++ b/jenkins/Makefile
@@ -82,7 +82,7 @@ ${_DISTROS:%=image-rpmbuild-%}: image-rpmbuild-%:
 		buildah run $$container ${PKGMGR} install -y ${RPMBUILD_PACKAGES} && \
 		buildah run $$container ${PKGMGR} clean all && \
 		buildah run $$container python3 -m pip install jinja2-cli && \
-		buildah commit $$container ${PB_CONTAINER_REG}/pbench-rpmbuild:${*}
+		buildah commit --rm $$container ${PB_CONTAINER_REG}/pbench-rpmbuild:${*}
 
 ci.fedora.Dockerfile: ci.Dockerfile.j2
 	jinja2 ci.Dockerfile.j2 \
diff --git a/jenkins/Pipeline.gy b/jenkins/Pipeline.gy
index 6ae8d68b8e..630fcca548 100644
--- a/jenkins/Pipeline.gy
+++ b/jenkins/Pipeline.gy
@@ -130,6 +130,7 @@ pipeline {
                     | sort -u \
                     | xargs podman image rm -f \
                     || true'
+            sh 'buildah rm --all'
         }
     }
 }
diff --git a/server/pbenchinacan/container-build.sh b/server/pbenchinacan/container-build.sh
index 24cb988c1e..1a3e3df9ff 100755
--- a/server/pbenchinacan/container-build.sh
+++ b/server/pbenchinacan/container-build.sh
@@ -84,4 +84,4 @@ buildah run $container systemctl enable pbench-server
 buildah run $container systemctl enable pbench-index.timer
 
 # Create the container image.
-buildah commit $container ${PB_CONTAINER_REG}/${PB_SERVER_IMAGE_NAME}:${PB_SERVER_IMAGE_TAG}
+buildah commit --rm $container ${PB_CONTAINER_REG}/${PB_SERVER_IMAGE_NAME}:${PB_SERVER_IMAGE_TAG}