diff --git a/acceptance/bundle/templates/helpers-error/databricks_template_schema.json b/acceptance/bundle/templates-machinery/helpers-error/databricks_template_schema.json
similarity index 100%
rename from acceptance/bundle/templates/helpers-error/databricks_template_schema.json
rename to acceptance/bundle/templates-machinery/helpers-error/databricks_template_schema.json
diff --git a/acceptance/bundle/templates/helpers-error/output.txt b/acceptance/bundle/templates-machinery/helpers-error/output.txt
similarity index 100%
rename from acceptance/bundle/templates/helpers-error/output.txt
rename to acceptance/bundle/templates-machinery/helpers-error/output.txt
diff --git a/acceptance/bundle/templates/helpers-error/script b/acceptance/bundle/templates-machinery/helpers-error/script
similarity index 100%
rename from acceptance/bundle/templates/helpers-error/script
rename to acceptance/bundle/templates-machinery/helpers-error/script
diff --git a/acceptance/bundle/templates/helpers-error/template/helpers.txt.tmpl b/acceptance/bundle/templates-machinery/helpers-error/template/helpers.txt.tmpl
similarity index 100%
rename from acceptance/bundle/templates/helpers-error/template/helpers.txt.tmpl
rename to acceptance/bundle/templates-machinery/helpers-error/template/helpers.txt.tmpl
diff --git a/acceptance/bundle/templates/helpers-error/test.toml b/acceptance/bundle/templates-machinery/helpers-error/test.toml
similarity index 100%
rename from acceptance/bundle/templates/helpers-error/test.toml
rename to acceptance/bundle/templates-machinery/helpers-error/test.toml
diff --git a/acceptance/bundle/templates/helpers/databricks_template_schema.json b/acceptance/bundle/templates-machinery/helpers/databricks_template_schema.json
similarity index 100%
rename from acceptance/bundle/templates/helpers/databricks_template_schema.json
rename to acceptance/bundle/templates-machinery/helpers/databricks_template_schema.json
diff --git a/acceptance/bundle/templates/helpers/output.txt b/acceptance/bundle/templates-machinery/helpers/output.txt
similarity index 100%
rename from acceptance/bundle/templates/helpers/output.txt
rename to acceptance/bundle/templates-machinery/helpers/output.txt
diff --git a/acceptance/bundle/templates/helpers/script b/acceptance/bundle/templates-machinery/helpers/script
similarity index 100%
rename from acceptance/bundle/templates/helpers/script
rename to acceptance/bundle/templates-machinery/helpers/script
diff --git a/acceptance/bundle/templates/helpers/template/helpers.txt.tmpl b/acceptance/bundle/templates-machinery/helpers/template/helpers.txt.tmpl
similarity index 100%
rename from acceptance/bundle/templates/helpers/template/helpers.txt.tmpl
rename to acceptance/bundle/templates-machinery/helpers/template/helpers.txt.tmpl
diff --git a/acceptance/bundle/templates/helpers/test.toml b/acceptance/bundle/templates-machinery/helpers/test.toml
similarity index 100%
rename from acceptance/bundle/templates/helpers/test.toml
rename to acceptance/bundle/templates-machinery/helpers/test.toml
diff --git a/acceptance/bundle/templates-machinery/test.toml b/acceptance/bundle/templates-machinery/test.toml
new file mode 100644
index 000000000..9083ecd1b
--- /dev/null
+++ b/acceptance/bundle/templates-machinery/test.toml
@@ -0,0 +1,2 @@
+# Testing template machinery, by default there is no need to check against cloud.
+LocalOnly = true
diff --git a/acceptance/bundle/templates/wrong-path/output.txt b/acceptance/bundle/templates-machinery/wrong-path/output.txt
similarity index 100%
rename from acceptance/bundle/templates/wrong-path/output.txt
rename to acceptance/bundle/templates-machinery/wrong-path/output.txt
diff --git a/acceptance/bundle/templates/wrong-path/script b/acceptance/bundle/templates-machinery/wrong-path/script
similarity index 100%
rename from acceptance/bundle/templates/wrong-path/script
rename to acceptance/bundle/templates-machinery/wrong-path/script
diff --git a/acceptance/bundle/templates/wrong-path/test.toml b/acceptance/bundle/templates-machinery/wrong-path/test.toml
similarity index 100%
rename from acceptance/bundle/templates/wrong-path/test.toml
rename to acceptance/bundle/templates-machinery/wrong-path/test.toml
diff --git a/acceptance/bundle/templates/wrong-url/output.txt b/acceptance/bundle/templates-machinery/wrong-url/output.txt
similarity index 100%
rename from acceptance/bundle/templates/wrong-url/output.txt
rename to acceptance/bundle/templates-machinery/wrong-url/output.txt
diff --git a/acceptance/bundle/templates/wrong-url/script b/acceptance/bundle/templates-machinery/wrong-url/script
similarity index 100%
rename from acceptance/bundle/templates/wrong-url/script
rename to acceptance/bundle/templates-machinery/wrong-url/script
diff --git a/acceptance/bundle/templates/wrong-url/test.toml b/acceptance/bundle/templates-machinery/wrong-url/test.toml
similarity index 100%
rename from acceptance/bundle/templates/wrong-url/test.toml
rename to acceptance/bundle/templates-machinery/wrong-url/test.toml