diff --git a/acceptance/bundle/templates/dbt-sql/output/my_dbt_sql/.gitignore b/acceptance/bundle/templates/dbt-sql/output/my_dbt_sql/.gitignore
index de811f118..cced6581b 100644
--- a/acceptance/bundle/templates/dbt-sql/output/my_dbt_sql/.gitignore
+++ b/acceptance/bundle/templates/dbt-sql/output/my_dbt_sql/.gitignore
@@ -1,2 +1,14 @@
+# DABs
+.databricks/
+build/
+dist/
+__pycache__/
+*.egg-info
+.venv/
+scratch/**
+!scratch/README.md
 
-.databricks
+# dbt
+target/
+dbt_packages/
+logs/
diff --git a/acceptance/bundle/templates/dbt-sql/output/my_dbt_sql/databricks.yml b/acceptance/bundle/templates/dbt-sql/output/my_dbt_sql/databricks.yml
index 1962bc543..1542cdf8d 100644
--- a/acceptance/bundle/templates/dbt-sql/output/my_dbt_sql/databricks.yml
+++ b/acceptance/bundle/templates/dbt-sql/output/my_dbt_sql/databricks.yml
@@ -12,12 +12,12 @@ include:
 # The default schema, catalog, etc. for dbt are defined in dbt_profiles/profiles.yml
 targets:
   dev:
-    default: true
     # The default target uses 'mode: development' to create a development copy.
     # - Deployed resources get prefixed with '[dev my_user_name]'
     # - Any job schedules and triggers are paused by default.
     # See also https://docs.databricks.com/dev-tools/bundles/deployment-modes.html.
     mode: development
+    default: true
     workspace:
       host: $DATABRICKS_URL
 
@@ -25,10 +25,8 @@ targets:
     mode: production
     workspace:
       host: $DATABRICKS_URL
-      # We explicitly specify /Workspace/Users/$USERNAME to make sure we only have a single copy.
+      # We explicitly deploy to /Workspace/Users/$USERNAME to make sure we only have a single copy.
       root_path: /Workspace/Users/$USERNAME/.bundle/${bundle.name}/${bundle.target}
     permissions:
       - user_name: $USERNAME
         level: CAN_MANAGE
-    run_as:
-      user_name: $USERNAME
diff --git a/acceptance/bundle/templates/default-python/output/my_default_python/databricks.yml b/acceptance/bundle/templates/default-python/output/my_default_python/databricks.yml
index 9deca9cf5..96b73c71c 100644
--- a/acceptance/bundle/templates/default-python/output/my_default_python/databricks.yml
+++ b/acceptance/bundle/templates/default-python/output/my_default_python/databricks.yml
@@ -22,10 +22,8 @@ targets:
     mode: production
     workspace:
       host: $DATABRICKS_URL
-      # We explicitly specify /Workspace/Users/$USERNAME to make sure we only have a single copy.
+      # We explicitly deploy to /Workspace/Users/$USERNAME to make sure we only have a single copy.
       root_path: /Workspace/Users/$USERNAME/.bundle/${bundle.name}/${bundle.target}
     permissions:
       - user_name: $USERNAME
         level: CAN_MANAGE
-    run_as:
-      user_name: $USERNAME
diff --git a/acceptance/bundle/templates/default-sql/output/my_default_sql/.gitignore b/acceptance/bundle/templates/default-sql/output/my_default_sql/.gitignore
index de811f118..0dab7f499 100644
--- a/acceptance/bundle/templates/default-sql/output/my_default_sql/.gitignore
+++ b/acceptance/bundle/templates/default-sql/output/my_default_sql/.gitignore
@@ -1,2 +1,8 @@
-
-.databricks
+.databricks/
+build/
+dist/
+__pycache__/
+*.egg-info
+.venv/
+scratch/**
+!scratch/README.md
diff --git a/acceptance/bundle/templates/default-sql/output/my_default_sql/databricks.yml b/acceptance/bundle/templates/default-sql/output/my_default_sql/databricks.yml
index ab857287e..9eba27a71 100644
--- a/acceptance/bundle/templates/default-sql/output/my_default_sql/databricks.yml
+++ b/acceptance/bundle/templates/default-sql/output/my_default_sql/databricks.yml
@@ -35,7 +35,7 @@ targets:
     mode: production
     workspace:
       host: $DATABRICKS_URL
-      # We explicitly specify /Workspace/Users/$USERNAME to make sure we only have a single copy.
+      # We explicitly deploy to /Workspace/Users/$USERNAME to make sure we only have a single copy.
       root_path: /Workspace/Users/$USERNAME/.bundle/${bundle.name}/${bundle.target}
     variables:
       warehouse_id: f00dcafe
@@ -44,5 +44,3 @@ targets:
     permissions:
       - user_name: $USERNAME
         level: CAN_MANAGE
-    run_as:
-      user_name: $USERNAME