diff --git a/acceptance/bundle/templates/default-sql/out.summary.diff b/acceptance/bundle/templates/default-sql/out.summary.diff
new file mode 100644
index 000000000..f23aa7554
--- /dev/null
+++ b/acceptance/bundle/templates/default-sql/out.summary.diff
@@ -0,0 +1,88 @@
+--- ../../out.summary.dev.json	[TIMESTAMP]
++++ ../../out.summary.prod.json	[TIMESTAMP]
+@@ -6,9 +6,9 @@
+       "value": "main"
+     },
+     "schema": {
+-      "default": "[USERNAME]",
++      "default": "default",
+       "description": "The schema to use",
+-      "value": "[USERNAME]"
++      "value": "default"
+     },
+     "warehouse_id": {
+       "default": "f00dcafe",
+@@ -26,11 +26,9 @@
+     "git": {
+       "bundle_root_path": "."
+     },
+-    "mode": "[TARGET]elopment",
++    "mode": "[TARGET]uction",
+     "deployment": {
+-      "lock": {
+-        "enabled": false
+-      }
++      "lock": {}
+     },
+     "uuid": "[UUID]"
+   },
+@@ -65,15 +63,14 @@
+         },
+         "format": "MULTI_TASK",
+         "id": "0",
+-        "max_concurrent_runs": 4,
+-        "name": "[[TARGET] [USERNAME]] my_default_sql_sql_job",
++        "name": "my_default_sql_sql_job",
+         "parameters": [
+           {
+             "default": "main",
+             "name": "catalog"
+           },
+           {
+-            "default": "[USERNAME]",
++            "default": "default",
+             "name": "schema"
+           },
+           {
+@@ -84,8 +81,8 @@
+         "queue": {
+           "enabled": true
+         },
+-        "tags": {
+-          "[TARGET]": "[USERNAME]"
++        "run_as": {
++          "user_name": "[USERNAME]"
+         },
+         "tasks": [
+           {
+@@ -113,7 +110,6 @@
+           }
+         ],
+         "trigger": {
+-          "pause_status": "PAUSED",
+           "periodic": {
+             "interval": 1,
+             "unit": "DAYS"
+@@ -128,13 +124,14 @@
+       "."
+     ]
+   },
+-  "presets": {
+-    "name_prefix": "[[TARGET] [USERNAME]] ",
+-    "pipelines_[TARGET]elopment": true,
+-    "trigger_pause_status": "PAUSED",
+-    "jobs_max_concurrent_runs": 4,
+-    "tags": {
+-      "[TARGET]": "[USERNAME]"
++  "run_as": {
++    "user_name": "[USERNAME]"
++  },
++  "presets": {},
++  "permissions": [
++    {
++      "level": "CAN_MANAGE",
++      "user_name": "[USERNAME]"
+     }
+-  }
++  ]
+ }
diff --git a/acceptance/bundle/templates/default-sql/out.validate.diff b/acceptance/bundle/templates/default-sql/out.validate.diff
new file mode 100644
index 000000000..85cfb800a
--- /dev/null
+++ b/acceptance/bundle/templates/default-sql/out.validate.diff
@@ -0,0 +1,102 @@
+--- ../../out.validate.dev.json	[TIMESTAMP]
++++ ../../out.validate.prod.json	[TIMESTAMP]
+@@ -1,15 +1,10 @@
+ {
+   "bundle": {
+-    "deployment": {
+-      "lock": {
+-        "enabled": false
+-      }
+-    },
+     "environment": "[TARGET]",
+     "git": {
+       "bundle_root_path": "."
+     },
+-    "mode": "[TARGET]elopment",
++    "mode": "[TARGET]uction",
+     "name": "my_default_sql",
+     "target": "[TARGET]",
+     "terraform": {
+@@ -20,15 +15,12 @@
+   "include": [
+     "resources/my_default_sql_sql.job.yml"
+   ],
+-  "presets": {
+-    "jobs_max_concurrent_runs": 4,
+-    "name_prefix": "[[TARGET] [USERNAME]] ",
+-    "pipelines_[TARGET]elopment": true,
+-    "tags": {
+-      "[TARGET]": "[USERNAME]"
+-    },
+-    "trigger_pause_status": "PAUSED"
+-  },
++  "permissions": [
++    {
++      "level": "CAN_MANAGE",
++      "user_name": "[USERNAME]"
++    }
++  ],
+   "resources": {
+     "jobs": {
+       "my_default_sql_sql_job": {
+@@ -43,15 +35,14 @@
+           ]
+         },
+         "format": "MULTI_TASK",
+-        "max_concurrent_runs": 4,
+-        "name": "[[TARGET] [USERNAME]] my_default_sql_sql_job",
++        "name": "my_default_sql_sql_job",
+         "parameters": [
+           {
+             "default": "main",
+             "name": "catalog"
+           },
+           {
+-            "default": "[USERNAME]",
++            "default": "default",
+             "name": "schema"
+           },
+           {
+@@ -63,9 +54,10 @@
+         "queue": {
+           "enabled": true
+         },
+-        "tags": {
+-          "[TARGET]": "[USERNAME]"
++        "run_as": {
++          "user_name": "[USERNAME]"
+         },
++        "tags": {},
+         "tasks": [
+           {
+             "sql_task": {
+@@ -92,7 +84,6 @@
+           }
+         ],
+         "trigger": {
+-          "pause_status": "PAUSED",
+           "periodic": {
+             "interval": 1,
+             "unit": "DAYS"
+@@ -101,6 +92,9 @@
+       }
+     }
+   },
++  "run_as": {
++    "user_name": "[USERNAME]"
++  },
+   "sync": {
+     "paths": [
+       "."
+@@ -114,9 +108,9 @@
+       "value": "main"
+     },
+     "schema": {
+-      "default": "[USERNAME]",
++      "default": "default",
+       "description": "The schema to use",
+-      "value": "[USERNAME]"
++      "value": "default"
+     },
+     "warehouse_id": {
+       "default": "f00dcafe",
diff --git a/acceptance/bundle/templates/default-sql/output.txt b/acceptance/bundle/templates/default-sql/output.txt
index 1246a0c84..ad3fc5940 100644
--- a/acceptance/bundle/templates/default-sql/output.txt
+++ b/acceptance/bundle/templates/default-sql/output.txt
@@ -37,108 +37,6 @@ Validation OK!
 >>> [CLI] bundle validate -t prod -o json
 
 >>> diff -u ../../out.validate.dev.json ../../out.validate.prod.json
---- ../../out.validate.dev.json	[TIMESTAMP]
-+++ ../../out.validate.prod.json	[TIMESTAMP]
-@@ -1,15 +1,10 @@
- {
-   "bundle": {
--    "deployment": {
--      "lock": {
--        "enabled": false
--      }
--    },
-     "environment": "[TARGET]",
-     "git": {
-       "bundle_root_path": "."
-     },
--    "mode": "[TARGET]elopment",
-+    "mode": "[TARGET]uction",
-     "name": "my_default_sql",
-     "target": "[TARGET]",
-     "terraform": {
-@@ -20,15 +15,12 @@
-   "include": [
-     "resources/my_default_sql_sql.job.yml"
-   ],
--  "presets": {
--    "jobs_max_concurrent_runs": 4,
--    "name_prefix": "[[TARGET] [USERNAME]] ",
--    "pipelines_[TARGET]elopment": true,
--    "tags": {
--      "[TARGET]": "[USERNAME]"
--    },
--    "trigger_pause_status": "PAUSED"
--  },
-+  "permissions": [
-+    {
-+      "level": "CAN_MANAGE",
-+      "user_name": "[USERNAME]"
-+    }
-+  ],
-   "resources": {
-     "jobs": {
-       "my_default_sql_sql_job": {
-@@ -43,15 +35,14 @@
-           ]
-         },
-         "format": "MULTI_TASK",
--        "max_concurrent_runs": 4,
--        "name": "[[TARGET] [USERNAME]] my_default_sql_sql_job",
-+        "name": "my_default_sql_sql_job",
-         "parameters": [
-           {
-             "default": "main",
-             "name": "catalog"
-           },
-           {
--            "default": "[USERNAME]",
-+            "default": "default",
-             "name": "schema"
-           },
-           {
-@@ -63,9 +54,10 @@
-         "queue": {
-           "enabled": true
-         },
--        "tags": {
--          "[TARGET]": "[USERNAME]"
-+        "run_as": {
-+          "user_name": "[USERNAME]"
-         },
-+        "tags": {},
-         "tasks": [
-           {
-             "sql_task": {
-@@ -92,7 +84,6 @@
-           }
-         ],
-         "trigger": {
--          "pause_status": "PAUSED",
-           "periodic": {
-             "interval": 1,
-             "unit": "DAYS"
-@@ -101,6 +92,9 @@
-       }
-     }
-   },
-+  "run_as": {
-+    "user_name": "[USERNAME]"
-+  },
-   "sync": {
-     "paths": [
-       "."
-@@ -114,9 +108,9 @@
-       "value": "main"
-     },
-     "schema": {
--      "default": "[USERNAME]",
-+      "default": "default",
-       "description": "The schema to use",
--      "value": "[USERNAME]"
-+      "value": "default"
-     },
-     "warehouse_id": {
-       "default": "f00dcafe",
 
 Exit code: 1
 
@@ -211,94 +109,6 @@ Resources:
       URL:  [DATABRICKS_URL]/jobs/0?o=900800700600
 
 >>> diff -u ../../out.summary.dev.json ../../out.summary.prod.json
---- ../../out.summary.dev.json	[TIMESTAMP]
-+++ ../../out.summary.prod.json	[TIMESTAMP]
-@@ -6,9 +6,9 @@
-       "value": "main"
-     },
-     "schema": {
--      "default": "[USERNAME]",
-+      "default": "default",
-       "description": "The schema to use",
--      "value": "[USERNAME]"
-+      "value": "default"
-     },
-     "warehouse_id": {
-       "default": "f00dcafe",
-@@ -26,11 +26,9 @@
-     "git": {
-       "bundle_root_path": "."
-     },
--    "mode": "[TARGET]elopment",
-+    "mode": "[TARGET]uction",
-     "deployment": {
--      "lock": {
--        "enabled": false
--      }
-+      "lock": {}
-     },
-     "uuid": "[UUID]"
-   },
-@@ -65,15 +63,14 @@
-         },
-         "format": "MULTI_TASK",
-         "id": "0",
--        "max_concurrent_runs": 4,
--        "name": "[[TARGET] [USERNAME]] my_default_sql_sql_job",
-+        "name": "my_default_sql_sql_job",
-         "parameters": [
-           {
-             "default": "main",
-             "name": "catalog"
-           },
-           {
--            "default": "[USERNAME]",
-+            "default": "default",
-             "name": "schema"
-           },
-           {
-@@ -84,8 +81,8 @@
-         "queue": {
-           "enabled": true
-         },
--        "tags": {
--          "[TARGET]": "[USERNAME]"
-+        "run_as": {
-+          "user_name": "[USERNAME]"
-         },
-         "tasks": [
-           {
-@@ -113,7 +110,6 @@
-           }
-         ],
-         "trigger": {
--          "pause_status": "PAUSED",
-           "periodic": {
-             "interval": 1,
-             "unit": "DAYS"
-@@ -128,13 +124,14 @@
-       "."
-     ]
-   },
--  "presets": {
--    "name_prefix": "[[TARGET] [USERNAME]] ",
--    "pipelines_[TARGET]elopment": true,
--    "trigger_pause_status": "PAUSED",
--    "jobs_max_concurrent_runs": 4,
--    "tags": {
--      "[TARGET]": "[USERNAME]"
-+  "run_as": {
-+    "user_name": "[USERNAME]"
-+  },
-+  "presets": {},
-+  "permissions": [
-+    {
-+      "level": "CAN_MANAGE",
-+      "user_name": "[USERNAME]"
-     }
--  }
-+  ]
- }
 
 Exit code: 1
 
diff --git a/acceptance/bundle/templates/default-sql/script b/acceptance/bundle/templates/default-sql/script
index f8c1c909d..24377d6be 100644
--- a/acceptance/bundle/templates/default-sql/script
+++ b/acceptance/bundle/templates/default-sql/script
@@ -12,7 +12,7 @@ printf "\n=== Testing validate"
 
 trace $CLI bundle validate -t dev -o json | replace-target dev > ../../out.validate.dev.json
 trace $CLI bundle validate -t prod -o json | replace-target prod > ../../out.validate.prod.json
-errcode trace diff -u ../../out.validate.dev.json ../../out.validate.prod.json
+errcode trace diff -u ../../out.validate.dev.json ../../out.validate.prod.json > ../../out.validate.diff
 
 
 printf "\n=== Testing deploy"
@@ -38,7 +38,7 @@ errcode trace $CLI bundle summary -t prod -o json | replace-target prod > ../../
 
 errcode trace $CLI bundle summary -t prod
 
-errcode trace diff -u ../../out.summary.dev.json ../../out.summary.prod.json
+errcode trace diff -u ../../out.summary.dev.json ../../out.summary.prod.json > ../../out.summary.diff
 
 
 printf "\n=== Testing validate second time, there should be no difference"