diff --git a/Jenkinsfile b/Jenkinsfile
index 4bf8940..3edf690 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -29,7 +29,6 @@ pipeline {
                         sh "docker cp e-monitor:/usr/src/kii/target/riscv64gc-unknown-linux-gnu/release/noxis-cli ${targetDirRisc}"
                         sh "docker cp e-monitor:/usr/src/kii/target/riscv64gc-unknown-linux-gnu/release/noxis-rs ${targetDirRisc}"
 
-                        sh "docker stop e-monitor && docker rm e-monitor"
                         echo "Tests passed successfully and binaries were extracted!"
                     } catch (Exception e) {
                         echo "Tests failed during Docker run."
@@ -209,6 +208,7 @@ EOF
                     if (fileExists("${env.WORKSPACE}/rc/")) {
                         sh "rm -rf ${env.WORKSPACE}/rc/"
                     }
+                    sh "docker stop e-monitor && docker rm e-monitor"
                 } catch (Exception e) {
                     echo "Failed to clean up workspace: ${e}"
                 }