diff --git a/Jenkinsfile b/Jenkinsfile
index dfeeb023bc..26cc9e3524 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -662,6 +662,8 @@ pipeline {
                             sh '''
                             echo "Ensuring container killed."
                             docker rm -vf docker-pr$BUILD_NUMBER || true
+                            cids=$(docker ps -aq -f name=docker-pr${BUILD_NUMBER}-*)
+                            [ -n "$cids" ] && docker rm -vf $cids || true
                             '''
 
                             sh '''