diff --git a/.github/runners/self-hosted/actions-runner-hooks/job-completed.sh b/.github/runners/self-hosted/actions-runner-hooks/job-completed.sh
index e56830a..fb3101f 100755
--- a/.github/runners/self-hosted/actions-runner-hooks/job-completed.sh
+++ b/.github/runners/self-hosted/actions-runner-hooks/job-completed.sh
@@ -1,6 +1,7 @@
 #!/bin/bash
 
 sudo buildah rm --all
+sudo podman rmi --all --force
 sudo podman system reset --force
 
 echo "Cleaning up registry authorization tokens..."
diff --git a/.github/runners/self-hosted/actions-runner-hooks/job-started.sh b/.github/runners/self-hosted/actions-runner-hooks/job-started.sh
index 7a364e2..956f4c0 100755
--- a/.github/runners/self-hosted/actions-runner-hooks/job-started.sh
+++ b/.github/runners/self-hosted/actions-runner-hooks/job-started.sh
@@ -1,6 +1,7 @@
 #!/bin/bash
 
 sudo buildah rm --all
+sudo podman rmi --all --force
 sudo podman system reset --force
 
 echo "Cleaning up registry authorization tokens..."