diff --git a/acceptance/bundle/debug/out.stderr.txt b/acceptance/bundle/debug/out.stderr.txt
index 57e2df461..1c0916b01 100644
--- a/acceptance/bundle/debug/out.stderr.txt
+++ b/acceptance/bundle/debug/out.stderr.txt
@@ -1,5 +1,5 @@
-10:07:59 Info: start pid=12345 version=$DEV_VERSION args="$CLI, bundle, validate, --debug"
-10:07:59 Debug: Found bundle root at $TMPDIR (file $TMPDIR/databricks.yml) pid=12345
+10:07:59 Info: start pid=12345 version=[DEV_VERSION] args="[CLI], bundle, validate, --debug"
+10:07:59 Debug: Found bundle root at [TMPDIR] (file [TMPDIR]/databricks.yml) pid=12345
 10:07:59 Debug: Apply pid=12345 mutator=load
 10:07:59 Info: Phase: load pid=12345 mutator=load
 10:07:59 Debug: Apply pid=12345 mutator=load mutator=seq
@@ -29,8 +29,8 @@
 10:07:59 Debug: GET /api/2.0/preview/scim/v2/Me
 < HTTP/1.1 200 OK
 < {
-<   "id": "$USER.Id",
-<   "userName": "$USERNAME"
+<   "id": "[USERID]",
+<   "userName": "[USERNAME]"
 < } pid=12345 mutator=initialize mutator=seq mutator=PopulateCurrentUser sdk=true
 10:07:59 Debug: Apply pid=12345 mutator=initialize mutator=seq mutator=LoadGitDetails
 10:07:59 Debug: Apply pid=12345 mutator=initialize mutator=seq mutator=ApplySourceLinkedDeploymentPreset
@@ -71,13 +71,13 @@
 10:07:59 Debug: Apply pid=12345 mutator=initialize mutator=seq mutator=metadata.AnnotateJobs
 10:07:59 Debug: Apply pid=12345 mutator=initialize mutator=seq mutator=metadata.AnnotatePipelines
 10:07:59 Debug: Apply pid=12345 mutator=initialize mutator=seq mutator=terraform.Initialize
-10:07:59 Debug: Using Terraform from DATABRICKS_TF_EXEC_PATH at $TERRAFORM pid=12345 mutator=initialize mutator=seq mutator=terraform.Initialize
-10:07:59 Debug: Using Terraform CLI config from DATABRICKS_TF_CLI_CONFIG_FILE at $DATABRICKS_TF_CLI_CONFIG_FILE pid=12345 mutator=initialize mutator=seq mutator=terraform.Initialize
+10:07:59 Debug: Using Terraform from DATABRICKS_TF_EXEC_PATH at [TERRAFORM] pid=12345 mutator=initialize mutator=seq mutator=terraform.Initialize
+10:07:59 Debug: Using Terraform CLI config from DATABRICKS_TF_CLI_CONFIG_FILE at [DATABRICKS_TF_CLI_CONFIG_FILE] pid=12345 mutator=initialize mutator=seq mutator=terraform.Initialize
 10:07:59 Debug: Environment variables for Terraform: ...redacted... pid=12345 mutator=initialize mutator=seq mutator=terraform.Initialize
 10:07:59 Debug: Apply pid=12345 mutator=initialize mutator=seq mutator=scripts.postinit
 10:07:59 Debug: No script defined for postinit, skipping pid=12345 mutator=initialize mutator=seq mutator=scripts.postinit
 10:07:59 Debug: Apply pid=12345 mutator=validate
-10:07:59 Debug: GET /api/2.0/workspace/get-status?path=/Workspace/Users/$USERNAME/.bundle/debug/default/files
+10:07:59 Debug: GET /api/2.0/workspace/get-status?path=/Workspace/Users/[USERNAME]/.bundle/debug/default/files
 < HTTP/1.1 200 OK
 < {
 <   "object_id": 1001,
diff --git a/acceptance/bundle/debug/out.stdout.txt b/acceptance/bundle/debug/out.stdout.txt
index df4765946..ed72b360e 100644
--- a/acceptance/bundle/debug/out.stdout.txt
+++ b/acceptance/bundle/debug/out.stdout.txt
@@ -1,7 +1,7 @@
 Name: debug
 Target: default
 Workspace:
-  User: $USERNAME
-  Path: /Workspace/Users/$USERNAME/.bundle/debug/default
+  User: [USERNAME]
+  Path: /Workspace/Users/[USERNAME]/.bundle/debug/default
 
 Validation OK!
diff --git a/acceptance/bundle/git-permerror/output.txt b/acceptance/bundle/git-permerror/output.txt
index 03ab93442..730e8255b 100644
--- a/acceptance/bundle/git-permerror/output.txt
+++ b/acceptance/bundle/git-permerror/output.txt
@@ -3,6 +3,7 @@
 >>> chmod 000 .git
 
 >>> [CLI] bundle validate
+Warn: failed to read .git: unable to load repository specific gitconfig: open config: permission denied
 Error: unable to load repository specific gitconfig: open config: permission denied
 
 Name: git-permerror
@@ -16,6 +17,7 @@ Found 1 error
 Exit code: 1
 
 >>> [CLI] bundle validate -o json
+Warn: failed to read .git: unable to load repository specific gitconfig: open config: permission denied
 Error: unable to load repository specific gitconfig: open config: permission denied
 
 
@@ -25,6 +27,7 @@ Exit code: 1
 }
 
 >>> withdir subdir/a/b [CLI] bundle validate -o json
+Warn: failed to read .git: unable to load repository specific gitconfig: open config: permission denied
 Error: unable to load repository specific gitconfig: open config: permission denied
 
 
@@ -39,11 +42,15 @@ Exit code: 1
 >>> chmod 000 .git/HEAD
 
 >>> [CLI] bundle validate -o json
+Warn: failed to load current branch: open HEAD: permission denied
+Warn: failed to load latest commit: open HEAD: permission denied
 {
   "bundle_root_path": "."
 }
 
 >>> withdir subdir/a/b [CLI] bundle validate -o json
+Warn: failed to load current branch: open HEAD: permission denied
+Warn: failed to load latest commit: open HEAD: permission denied
 {
   "bundle_root_path": "."
 }
@@ -54,6 +61,7 @@ Exit code: 1
 >>> chmod 000 .git/config
 
 >>> [CLI] bundle validate -o json
+Warn: failed to read .git: unable to load repository specific gitconfig: open config: permission denied
 Error: unable to load repository specific gitconfig: open config: permission denied
 
 
@@ -63,6 +71,7 @@ Exit code: 1
 }
 
 >>> withdir subdir/a/b [CLI] bundle validate -o json
+Warn: failed to read .git: unable to load repository specific gitconfig: open config: permission denied
 Error: unable to load repository specific gitconfig: open config: permission denied
 
 
diff --git a/acceptance/bundle/scripts/output.txt b/acceptance/bundle/scripts/output.txt
index 2deedb0e7..354dfe988 100644
--- a/acceptance/bundle/scripts/output.txt
+++ b/acceptance/bundle/scripts/output.txt
@@ -42,6 +42,8 @@ from myscript.py 0 postbuild: hello stderr!
 Executing 'predeploy' script
 from myscript.py 0 predeploy: hello stdout!
 from myscript.py 0 predeploy: hello stderr!
+Error: Failed to acquire deployment lock: no such directory: /Workspace/Users/[USERNAME]/.bundle/scripts/default/state
+Error: Failed to update, encountered possible permission error: /Workspace/Users/[USERNAME]/.bundle/scripts/default/state
 Error: unable to deploy to /Workspace/Users/[USERNAME]/.bundle/scripts/default/state as [USERNAME].
 Please make sure the current user or one of their groups is listed under the permissions of this bundle.
 For assistance, contact the owners of this project.