diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index eba6d22130e5412639783874361575261ee3b546..d267f7e7ddcd17a024d531b95e4784bf4bb9a853 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -24,14 +24,10 @@ test:all:
     - vagrant --fixture=monitoring -- ssh test-runner -- -tt "pytest -s --pyargs clmctest.monitoring"  
     - vagrant --fixture=inputs -- up
     - vagrant --fixture=inputs -- ssh test-runner -- -tt "pytest -s --pyargs clmctest.inputs"        
-  when: on_success      
+  when: manual      
   
 clean:
   stage: clean
   script: 
-    - echo "Clean VMs"
-  after_script:
-    - vagrant --fixture=inputs -- destroy --force     
-    - vagrant --fixture=monitoring -- destroy --force     
-    - vagrant --fixture=scripts -- destroy --force         
+    - scripts/build/deleteallvms.sh"      
   when: always       
\ No newline at end of file
diff --git a/scripts/build/deleteallvms.sh b/scripts/build/deleteallvms.sh
new file mode 100644
index 0000000000000000000000000000000000000000..e5607311d7addc4c7725d1c38a6b2338a36e56c4
--- /dev/null
+++ b/scripts/build/deleteallvms.sh
@@ -0,0 +1,11 @@
+#!/bin/bash
+
+vboxmanage list vms | awk ' {print $1} ' | awk -F',' '{gsub(/"/, "", $1); print $1}' > runningvms
+
+while read vm_id; do
+  echo $vm_id
+  vboxmanage controlvm $vm_id poweroff
+  vboxmanage unregistervm $vm_id --delete
+done <runningvms
+
+rm runningvms
\ No newline at end of file