diff --git a/acceptance/bundle/generate/alert/alert.json.tmpl b/acceptance/bundle/generate/alert/alert.json.tmpl
index a085d681174..463c9236c12 100644
--- a/acceptance/bundle/generate/alert/alert.json.tmpl
+++ b/acceptance/bundle/generate/alert/alert.json.tmpl
@@ -1,6 +1,6 @@
 {
   "display_name": "test alert",
-  "parent_path": "/Workspace/test-$UNIQUE_NAME",
+  "parent_path": "/Workspace/Users/$CURRENT_USER_NAME/test-$UNIQUE_NAME",
   "query_text": "SELECT 1\n as value",
   "warehouse_id": "$TEST_DEFAULT_WAREHOUSE_ID",
   "evaluation": {
diff --git a/acceptance/bundle/generate/alert/output.txt b/acceptance/bundle/generate/alert/output.txt
index 8503daa3568..774cd68f1ca 100644
--- a/acceptance/bundle/generate/alert/output.txt
+++ b/acceptance/bundle/generate/alert/output.txt
@@ -1,5 +1,5 @@
 
->>> [CLI] workspace mkdirs /Workspace/test-[UNIQUE_NAME]
+>>> [CLI] workspace mkdirs /Workspace/Users/[USERNAME]/test-[UNIQUE_NAME]
 
 >>> [CLI] bundle generate alert --existing-id [ALERT_ID] --source-dir out/alert --config-dir out/resource
 Alert configuration successfully saved to [TEST_TMP_DIR]/out/resource/test_alert.alert.yml
@@ -12,3 +12,5 @@ so it will not be deployed. Add a matching entry to the 'include' section, for e
 include:
   - out/resource/*.yml
 
+
+>>> [CLI] workspace delete /Workspace/Users/[USERNAME]/test-[UNIQUE_NAME] --recursive
diff --git a/acceptance/bundle/generate/alert/script b/acceptance/bundle/generate/alert/script
index 85620755c3f..ed533cdf933 100644
--- a/acceptance/bundle/generate/alert/script
+++ b/acceptance/bundle/generate/alert/script
@@ -1,4 +1,4 @@
-trace $CLI workspace mkdirs /Workspace/test-$UNIQUE_NAME
+trace $CLI workspace mkdirs /Workspace/Users/$CURRENT_USER_NAME/test-$UNIQUE_NAME
 
 # create an alert to import
 envsubst < alert.json.tmpl > alert.json
diff --git a/acceptance/bundle/generate/alert/script.cleanup b/acceptance/bundle/generate/alert/script.cleanup
new file mode 100644
index 00000000000..df9daf87f47
--- /dev/null
+++ b/acceptance/bundle/generate/alert/script.cleanup
@@ -0,0 +1 @@
+trace $CLI workspace delete /Workspace/Users/$CURRENT_USER_NAME/test-$UNIQUE_NAME --recursive
diff --git a/acceptance/bundle/generate/auto-bind/databricks.yml.tmpl b/acceptance/bundle/generate/auto-bind/databricks.yml.tmpl
index c58a4bbd14c..49ff482e7f0 100644
--- a/acceptance/bundle/generate/auto-bind/databricks.yml.tmpl
+++ b/acceptance/bundle/generate/auto-bind/databricks.yml.tmpl
@@ -2,7 +2,7 @@ bundle:
   name: auto-bind-test
 
 workspace:
-  root_path: /tmp/${UNIQUE_NAME}
+  root_path: ~/.bundle/auto-bind-test-${UNIQUE_NAME}
 
 include:
   - resources/*.yml
diff --git a/acceptance/bundle/generate/auto-bind/output.txt b/acceptance/bundle/generate/auto-bind/output.txt
index fd574b5f7b2..32063209b9b 100644
--- a/acceptance/bundle/generate/auto-bind/output.txt
+++ b/acceptance/bundle/generate/auto-bind/output.txt
@@ -21,7 +21,7 @@ test.py
 
 === Deploy the bound job:
 >>> [CLI] bundle deploy
-Uploading bundle files to /Workspace/tmp/[UNIQUE_NAME]/files...
+Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/auto-bind-test-[UNIQUE_NAME]/files...
 Deploying resources...
 Updating deployment state...
 Deployment complete!
@@ -31,7 +31,7 @@ Deployment complete!
 The following resources will be deleted:
   delete resources.jobs.test_job
 
-All files and directories at the following location will be deleted: /Workspace/tmp/[UNIQUE_NAME]
+All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/auto-bind-test-[UNIQUE_NAME]
 
 Deleting files...
 Destroy complete!
diff --git a/acceptance/bundle/generate/dashboard/dashboard.json.tmpl b/acceptance/bundle/generate/dashboard/dashboard.json.tmpl
index c6c73dd259f..517a16b6c54 100644
--- a/acceptance/bundle/generate/dashboard/dashboard.json.tmpl
+++ b/acceptance/bundle/generate/dashboard/dashboard.json.tmpl
@@ -1,5 +1,5 @@
 {
     "display_name": "test dashboard",
-    "parent_path": "/Workspace/test-$UNIQUE_NAME",
+    "parent_path": "/Workspace/Users/$CURRENT_USER_NAME/test-$UNIQUE_NAME",
     "serialized_dashboard": "{\"pages\":[{\"displayName\":\"New Page\",\"layout\":[],\"name\":\"12345678\"}]}"
 }
diff --git a/acceptance/bundle/generate/dashboard/output.txt b/acceptance/bundle/generate/dashboard/output.txt
index 4ff194d800f..095e084f0a8 100644
--- a/acceptance/bundle/generate/dashboard/output.txt
+++ b/acceptance/bundle/generate/dashboard/output.txt
@@ -1,5 +1,5 @@
 
->>> [CLI] workspace mkdirs /Workspace/test-[UNIQUE_NAME]
+>>> [CLI] workspace mkdirs /Workspace/Users/[USERNAME]/test-[UNIQUE_NAME]
 
 >>> [CLI] bundle generate dashboard --existing-id [DASHBOARD_ID] --dashboard-dir out/dashboard --resource-dir out/resource
 Writing dashboard to out/dashboard/test_dashboard.lvdash.json
@@ -12,3 +12,5 @@ so it will not be deployed. Add a matching entry to the 'include' section, for e
 include:
   - out/resource/*.yml
 
+
+>>> [CLI] workspace delete /Workspace/Users/[USERNAME]/test-[UNIQUE_NAME] --recursive
diff --git a/acceptance/bundle/generate/dashboard/script b/acceptance/bundle/generate/dashboard/script
index a982ef547d4..aea3a6a694d 100644
--- a/acceptance/bundle/generate/dashboard/script
+++ b/acceptance/bundle/generate/dashboard/script
@@ -1,4 +1,4 @@
-trace $CLI workspace mkdirs /Workspace/test-$UNIQUE_NAME
+trace $CLI workspace mkdirs /Workspace/Users/$CURRENT_USER_NAME/test-$UNIQUE_NAME
 
 # create a dashboard to import
 envsubst < dashboard.json.tmpl > dashboard.json
diff --git a/acceptance/bundle/generate/dashboard/script.cleanup b/acceptance/bundle/generate/dashboard/script.cleanup
new file mode 100644
index 00000000000..df9daf87f47
--- /dev/null
+++ b/acceptance/bundle/generate/dashboard/script.cleanup
@@ -0,0 +1 @@
+trace $CLI workspace delete /Workspace/Users/$CURRENT_USER_NAME/test-$UNIQUE_NAME --recursive
diff --git a/acceptance/bundle/generate/genie_space/genie_space.json.tmpl b/acceptance/bundle/generate/genie_space/genie_space.json.tmpl
index 2056f3061ef..2692e17dfca 100644
--- a/acceptance/bundle/generate/genie_space/genie_space.json.tmpl
+++ b/acceptance/bundle/generate/genie_space/genie_space.json.tmpl
@@ -1,7 +1,7 @@
 {
     "title": "test genie space",
     "description": "test description",
-    "parent_path": "/Workspace/test-$UNIQUE_NAME",
+    "parent_path": "/Workspace/Users/$CURRENT_USER_NAME/test-$UNIQUE_NAME",
     "warehouse_id": "test-warehouse-id",
     "serialized_space": "{\"tables\":[],\"questions\":[]}"
 }
diff --git a/acceptance/bundle/generate/genie_space/out/resource/test_genie_space.genie_space.yml b/acceptance/bundle/generate/genie_space/out/resource/test_genie_space.genie_space.yml
index 1471a901344..c383564eadf 100644
--- a/acceptance/bundle/generate/genie_space/out/resource/test_genie_space.genie_space.yml
+++ b/acceptance/bundle/generate/genie_space/out/resource/test_genie_space.genie_space.yml
@@ -5,4 +5,4 @@ resources:
       warehouse_id: test-warehouse-id
       file_path: ../genie_space/test_genie_space.geniespace.json
       description: test description
-      parent_path: /Workspace/test-[UNIQUE_NAME]
+      parent_path: /Workspace/Users/[USERNAME]/test-[UNIQUE_NAME]
diff --git a/acceptance/bundle/generate/genie_space/output.txt b/acceptance/bundle/generate/genie_space/output.txt
index 68334c9c1d1..4a36ad952d6 100644
--- a/acceptance/bundle/generate/genie_space/output.txt
+++ b/acceptance/bundle/generate/genie_space/output.txt
@@ -1,5 +1,5 @@
 
->>> [CLI] workspace mkdirs /Workspace/test-[UNIQUE_NAME]
+>>> [CLI] workspace mkdirs /Workspace/Users/[USERNAME]/test-[UNIQUE_NAME]
 
 >>> [CLI] bundle generate genie-space --existing-id [GENIE_SPACE_ID] --genie-space-dir out/genie_space --resource-dir out/resource
 Writing genie space to out/genie_space/test_genie_space.geniespace.json
@@ -12,3 +12,5 @@ so it will not be deployed. Add a matching entry to the 'include' section, for e
 include:
   - out/resource/*.yml
 
+
+>>> [CLI] workspace delete /Workspace/Users/[USERNAME]/test-[UNIQUE_NAME] --recursive
diff --git a/acceptance/bundle/generate/genie_space/script b/acceptance/bundle/generate/genie_space/script
index 8e2fa32170a..246d008be45 100644
--- a/acceptance/bundle/generate/genie_space/script
+++ b/acceptance/bundle/generate/genie_space/script
@@ -1,4 +1,4 @@
-trace $CLI workspace mkdirs /Workspace/test-$UNIQUE_NAME
+trace $CLI workspace mkdirs /Workspace/Users/$CURRENT_USER_NAME/test-$UNIQUE_NAME
 
 # create a genie space to import
 envsubst < genie_space.json.tmpl > genie_space.json
diff --git a/acceptance/bundle/generate/genie_space/script.cleanup b/acceptance/bundle/generate/genie_space/script.cleanup
new file mode 100644
index 00000000000..df9daf87f47
--- /dev/null
+++ b/acceptance/bundle/generate/genie_space/script.cleanup
@@ -0,0 +1 @@
+trace $CLI workspace delete /Workspace/Users/$CURRENT_USER_NAME/test-$UNIQUE_NAME --recursive