diff --git a/.ci/vars/buildPodman.groovy b/.ci/vars/buildPodman.groovy
index e5ecff9..6e2aab2 100644
--- a/.ci/vars/buildPodman.groovy
+++ b/.ci/vars/buildPodman.groovy
@@ -68,6 +68,13 @@ def call(Map config=[:]) {
           }
         }
 
+        // Basic registry retention removing untagged images
+        stage('cleanup') {
+          when { not { changeRequest() } }
+          steps {
+            sh 'make rm-remote-untagged'
+          }
+        }
       }
     }
   }