diff --git a/NEXT_CHANGELOG.md b/NEXT_CHANGELOG.md
index f1c821f5a3b..4c506c3b86f 100644
--- a/NEXT_CHANGELOG.md
+++ b/NEXT_CHANGELOG.md
@@ -14,5 +14,6 @@
 ### Bundles
 * Fix "bundle summary -o json" to render null values properly ([#2990](https://github.com/databricks/cli/pull/2990))
 * Fixed null pointer de-reference if artifacts missing fields ([#3022](https://github.com/databricks/cli/pull/3022))
+* Update bundle templates to also include `resources/*/*.yml` ([#3024](https://github.com/databricks/cli/pull/3024))
 
 ### API Changes
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 4285a44eba0..8b4eec80573 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
@@ -7,6 +7,7 @@ bundle:
 
 include:
   - resources/*.yml
+  - resources/*/*.yml
 
 # Deployment targets.
 # The default schema, catalog, etc. for dbt are defined in dbt_profiles/profiles.yml
diff --git a/acceptance/bundle/templates/default-python/classic/output/my_default_python/databricks.yml b/acceptance/bundle/templates/default-python/classic/output/my_default_python/databricks.yml
index 6080a368f9d..91c01f25dae 100644
--- a/acceptance/bundle/templates/default-python/classic/output/my_default_python/databricks.yml
+++ b/acceptance/bundle/templates/default-python/classic/output/my_default_python/databricks.yml
@@ -6,6 +6,7 @@ bundle:
 
 include:
   - resources/*.yml
+  - resources/*/*.yml
 
 targets:
   dev:
diff --git a/acceptance/bundle/templates/default-python/serverless/output/my_default_python/databricks.yml b/acceptance/bundle/templates/default-python/serverless/output/my_default_python/databricks.yml
index 6080a368f9d..91c01f25dae 100644
--- a/acceptance/bundle/templates/default-python/serverless/output/my_default_python/databricks.yml
+++ b/acceptance/bundle/templates/default-python/serverless/output/my_default_python/databricks.yml
@@ -6,6 +6,7 @@ bundle:
 
 include:
   - resources/*.yml
+  - resources/*/*.yml
 
 targets:
   dev:
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 07562ce7ad1..e9d9093a969 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
@@ -6,6 +6,7 @@ bundle:
 
 include:
   - resources/*.yml
+  - resources/*/*.yml
 
 # Variable declarations. These variables are assigned in the dev/prod targets below.
 variables:
diff --git a/acceptance/bundle/templates/experimental-jobs-as-code/output/my_jobs_as_code/databricks.yml b/acceptance/bundle/templates/experimental-jobs-as-code/output/my_jobs_as_code/databricks.yml
index d336c9acfb2..b09d99917ee 100644
--- a/acceptance/bundle/templates/experimental-jobs-as-code/output/my_jobs_as_code/databricks.yml
+++ b/acceptance/bundle/templates/experimental-jobs-as-code/output/my_jobs_as_code/databricks.yml
@@ -24,6 +24,7 @@ artifacts:
 
 include:
   - resources/*.yml
+  - resources/*/*.yml
 
 targets:
   dev:
diff --git a/acceptance/bundle/templates/telemetry/dbt-sql/out.databricks.yml b/acceptance/bundle/templates/telemetry/dbt-sql/out.databricks.yml
index e2aa7e9831c..741b6d2b0a1 100644
--- a/acceptance/bundle/templates/telemetry/dbt-sql/out.databricks.yml
+++ b/acceptance/bundle/templates/telemetry/dbt-sql/out.databricks.yml
@@ -7,6 +7,7 @@ bundle:
 
 include:
   - resources/*.yml
+  - resources/*/*.yml
 
 # Deployment targets.
 # The default schema, catalog, etc. for dbt are defined in dbt_profiles/profiles.yml
diff --git a/acceptance/bundle/templates/telemetry/default-python/out.databricks.yml b/acceptance/bundle/templates/telemetry/default-python/out.databricks.yml
index 80a431edc64..5adba2b4d8d 100644
--- a/acceptance/bundle/templates/telemetry/default-python/out.databricks.yml
+++ b/acceptance/bundle/templates/telemetry/default-python/out.databricks.yml
@@ -6,6 +6,7 @@ bundle:
 
 include:
   - resources/*.yml
+  - resources/*/*.yml
 
 targets:
   dev:
diff --git a/acceptance/bundle/templates/telemetry/default-sql/out.databricks.yml b/acceptance/bundle/templates/telemetry/default-sql/out.databricks.yml
index 49704391ea6..608980ee904 100644
--- a/acceptance/bundle/templates/telemetry/default-sql/out.databricks.yml
+++ b/acceptance/bundle/templates/telemetry/default-sql/out.databricks.yml
@@ -6,6 +6,7 @@ bundle:
 
 include:
   - resources/*.yml
+  - resources/*/*.yml
 
 # Variable declarations. These variables are assigned in the dev/prod targets below.
 variables:
diff --git a/libs/template/templates/dbt-sql/template/{{.project_name}}/databricks.yml.tmpl b/libs/template/templates/dbt-sql/template/{{.project_name}}/databricks.yml.tmpl
index d991c06ffec..3b452014a6f 100644
--- a/libs/template/templates/dbt-sql/template/{{.project_name}}/databricks.yml.tmpl
+++ b/libs/template/templates/dbt-sql/template/{{.project_name}}/databricks.yml.tmpl
@@ -7,6 +7,7 @@ bundle:
 
 include:
   - resources/*.yml
+  - resources/*/*.yml
 
 # Deployment targets.
 # The default schema, catalog, etc. for dbt are defined in dbt_profiles/profiles.yml
diff --git a/libs/template/templates/default-python/template/{{.project_name}}/databricks.yml.tmpl b/libs/template/templates/default-python/template/{{.project_name}}/databricks.yml.tmpl
index 04d22a764ef..3bbfd4c7f38 100644
--- a/libs/template/templates/default-python/template/{{.project_name}}/databricks.yml.tmpl
+++ b/libs/template/templates/default-python/template/{{.project_name}}/databricks.yml.tmpl
@@ -6,6 +6,7 @@ bundle:
 
 include:
   - resources/*.yml
+  - resources/*/*.yml
 
 targets:
   dev:
diff --git a/libs/template/templates/default-sql/template/{{.project_name}}/databricks.yml.tmpl b/libs/template/templates/default-sql/template/{{.project_name}}/databricks.yml.tmpl
index 6acdf40e78e..2d61f52bd27 100644
--- a/libs/template/templates/default-sql/template/{{.project_name}}/databricks.yml.tmpl
+++ b/libs/template/templates/default-sql/template/{{.project_name}}/databricks.yml.tmpl
@@ -6,6 +6,7 @@ bundle:
 
 include:
   - resources/*.yml
+  - resources/*/*.yml
 
 # Variable declarations. These variables are assigned in the dev/prod targets below.
 variables:
diff --git a/libs/template/templates/experimental-jobs-as-code/template/{{.project_name}}/databricks.yml.tmpl b/libs/template/templates/experimental-jobs-as-code/template/{{.project_name}}/databricks.yml.tmpl
index 70f56171c6e..ec91f6d9647 100644
--- a/libs/template/templates/experimental-jobs-as-code/template/{{.project_name}}/databricks.yml.tmpl
+++ b/libs/template/templates/experimental-jobs-as-code/template/{{.project_name}}/databricks.yml.tmpl
@@ -26,6 +26,7 @@ artifacts:
 {{ end -}}
 include:
   - resources/*.yml
+  - resources/*/*.yml
 
 targets:
   dev:
diff --git a/libs/template/templates/lakeflow-pipelines/databricks_template_schema.json b/libs/template/templates/lakeflow-pipelines/databricks_template_schema.json
index 53841d36f4c..8fbc13c69f2 100644
--- a/libs/template/templates/lakeflow-pipelines/databricks_template_schema.json
+++ b/libs/template/templates/lakeflow-pipelines/databricks_template_schema.json
@@ -14,7 +14,7 @@
             "default": "{{default_catalog}}",
             "pattern": "^\\w*$",
             "pattern_match_failure_message": "Invalid catalog name.",
-            "description": "\nInitial catalog.\ndefault_catalog",
+            "description": "\nInitial catalog:\ndefault_catalog",
             "order": 3
         },
         "personal_schemas": {