diff --git a/scripts/devenv-builder/cleanup-composer.sh b/scripts/devenv-builder/cleanup-composer.sh
index fde05e336d..b3cccb4b45 100755
--- a/scripts/devenv-builder/cleanup-composer.sh
+++ b/scripts/devenv-builder/cleanup-composer.sh
@@ -25,8 +25,8 @@ clean_podman_images() {
     if [ "${FULL_CLEAN}" = 1 ] ; then
         title "Cleaning up container images"
 
-        sudo podman rmi -af
-        podman rmi -af
+        sudo podman rmi -af || true
+        podman rmi -af || true
         # Ensure the user-specific container storage is deleted
         sudo rm -rf ~/.local/share/containers/
     fi