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 16292bc84..3b6241938 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
@@ -42,7 +42,7 @@ targets:
       catalog: main
       schema: default
     permissions:
-      - user_name: $USERNAME
+      - user_name_OR_service_principal_name: $USERNAME
         level: CAN_MANAGE
     run_as:
       user_name: $USERNAME
diff --git a/acceptance/bundle/templates/default-sql/output/my_default_sql/resources/my_default_sql_sql.job.yml b/acceptance/bundle/templates/default-sql/output/my_default_sql/resources/my_default_sql_sql.job.yml
index 86de0f9db..d927ac7f7 100644
--- a/acceptance/bundle/templates/default-sql/output/my_default_sql/resources/my_default_sql_sql.job.yml
+++ b/acceptance/bundle/templates/default-sql/output/my_default_sql/resources/my_default_sql_sql.job.yml
@@ -10,10 +10,6 @@ resources:
           interval: 1
           unit: DAYS
 
-      email_notifications:
-        on_failure:
-          - $USERNAME
-
       parameters:
         - name: catalog
           default: ${var.catalog}
diff --git a/acceptance/bundle/templates/default-sql/test.toml b/acceptance/bundle/templates/default-sql/test.toml
new file mode 100644
index 000000000..702d7ae04
--- /dev/null
+++ b/acceptance/bundle/templates/default-sql/test.toml
@@ -0,0 +1,12 @@
+[[Repls]]
+Old = '- (user_name|service_principal_name): \$USERNAME'
+New = '- user_name_OR_service_principal_name: $$USERNAME'
+
+[[Repls]]
+Old = '''
+      email_notifications:
+        on_failure:
+          - \$USERNAME
+
+'''
+New = ''