diff --git a/Jenkinsfile b/Jenkinsfile
index 45ffa01..eb6a9ca 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -11,8 +11,8 @@ if (BRANCH_TEST=="shibboleth-production"){
 
     try {
       stage 'Cleanup & Setup'
-        sh 'rm -rf output-*'
-        sh 'rm -rf "/Users/levvel/VirtualBox VMs/"'
+        sh 'rm -rf output-shibboleth-*'
+        sh 'rm -rf "/Users/levvel/VirtualBox VMs/shibboleth-appliance-*"'
         sh 'rm -rf builds'
         sh 'mkdir -p builds'
 
@@ -58,8 +58,8 @@ if (BRANCH_TEST=="shibboleth-production"){
 
     try {
       stage 'Cleanup & Setup '
-        sh 'rm -rf output-*'
-        sh 'rm -rf "/Users/levvel/VirtualBox VMs"'
+        sh 'rm -rf output-comanage-*'
+        sh 'rm -rf "/Users/levvel/VirtualBox VMs/comange-appliance-*"'
         sh 'rm  -rf builds'
         sh 'mkdir -p builds'
 
diff --git a/comanage-appliance.json b/comanage-appliance.json
index 78278c2..a61d24d 100644
--- a/comanage-appliance.json
+++ b/comanage-appliance.json
@@ -53,7 +53,7 @@
         "ssh_wait_timeout": "10000s",
         "guest_additions_mode": "disable",
         "shutdown_command": "sudo -S shutdown -P now",
-        "output_directory": "output-{{user `profile`}}",
+        "output_directory": "output-comanage-{{user `profile`}}",
         "format": "ova"
     }
   ],
diff --git a/shibboleth-appliance.json b/shibboleth-appliance.json
index 5c33948..dbec02e 100644
--- a/shibboleth-appliance.json
+++ b/shibboleth-appliance.json
@@ -53,7 +53,7 @@
         "ssh_wait_timeout": "10000s",
         "guest_additions_mode": "disable",
         "shutdown_command": "sudo -S shutdown -P now",
-        "output_directory": "output-{{user `profile`}}",
+        "output_directory": "output-shibboleth-{{user `profile`}}",
         "format": "ova"
     }
   ],