diff --git a/dawn-cli/staging b/dawn-cli/staging
index 6ff93c6792599c0b0d683579dbf42c4709f67add..e0a9a3969ef7cac7323a53d4e6b07f42a91749bf 100644
--- a/dawn-cli/staging
+++ b/dawn-cli/staging
@@ -22,10 +22,12 @@ pipeline {
     stage('cleanup old images') {
         steps {
             sh '''
-                docker image prune || true
+                docker rmi $(docker images | grep "dawn/.*-test" | awk '{print $3}') --force || true
+                docker rmi $(docker images | grep "<none>" | awk '{print $3}') --force || true
             '''
         }
     }
+    
     // stage('cleanup old images') {
     //     steps {
     //         sh '''