diff --git a/Jenkinsfile b/Jenkinsfile
index 33db8ca..ba7b33e 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -150,8 +150,7 @@ pipeline {
                 script {
                    try{
 		     echo "Cleaning up artifacts from the build..."
-                     sh "result=${5}(docker ps -a | grep ${imagename}_${tag});if [ ! -z \"${5}result\" ]; then docker rm -f ${5}(docker ps -a | grep ${imagename}_${tag} | awk '{print ${5}1}');fi;docker rmi -f ${imagename}_${tag}"
-                     sh "result=${5}(docker ps -a | grep ${imagename}_${tag}:arm64);if [ ! -z \"${5}result\" ]; then docker rm -f ${5}(docker ps -a | grep ${imagename}_${tag}:arm64 | awk '{print ${5}1}');fi;docker rmi -f ${imagename}_${tag}:arm64"
+                     sh 'tests/cleanup.sh'
                    } catch(error) {
                      def error_details = readFile('./debug');
                      def message = "BUILD ERROR: There was a problem with cleanup of the image. \n\n ${error_details}"
diff --git a/tests/cleanup.sh b/tests/cleanup.sh
new file mode 100755
index 0000000..98f3b37
--- /dev/null
+++ b/tests/cleanup.sh
@@ -0,0 +1,19 @@
+#!/bin/bash
+
+. ./common.bash
+
+result=$(docker ps -a | grep ${imagename}_${tag})
+if [ ! -z "$result" ]; then 
+	echo "removing existing containers"
+	docker rm -f $(docker ps -a | grep ${imagename}_${tag} | awk '{print $1}')
+fi
+docker rmi -f ${imagename}_${tag}
+
+result2=$(docker ps -a | grep ${imagename}_${tag}:arm64)
+if [ ! -z "$result2" ]; then 
+	echo "removing existing containers"
+	docker rm -f $(docker ps -a | grep ${imagename}_${tag}:arm64 | awk '{print $1}')
+fi
+docker rmi -f ${imagename}_${tag}:arm64
+
+