diff --git a/cookiecutter/tap-template/{{cookiecutter.tap_id}}/.github/{% if cookiecutter.include_ci_files == 'GitHub' %}dependabot.yml{%endif%} b/cookiecutter/tap-template/{{cookiecutter.tap_id}}/.github/{% if cookiecutter.include_ci_files == 'GitHub' %}dependabot.yml{%endif%}
index 86a1bce0b7..933e6b1c26 100644
--- a/cookiecutter/tap-template/{{cookiecutter.tap_id}}/.github/{% if cookiecutter.include_ci_files == 'GitHub' %}dependabot.yml{%endif%}	
+++ b/cookiecutter/tap-template/{{cookiecutter.tap_id}}/.github/{% if cookiecutter.include_ci_files == 'GitHub' %}dependabot.yml{%endif%}	
@@ -9,15 +9,18 @@ updates:
     directory: "/"
     schedule:
       interval: "daily"
-    prefix: "chore(deps): "
-    prefix-development: "chore(deps-dev): "
+    commit-message:
+      prefix: "chore(deps): "
+      prefix-development: "chore(deps-dev): "
   - package-ecosystem: pip
     directory: "/.github/workflows"
     schedule:
       interval: daily
-    prefix: "ci: "
+    commit-message:
+      prefix: "ci: "
   - package-ecosystem: github-actions
     directory: "/"
     schedule:
       interval: "weekly"
-    prefix: "ci: "
+    commit-message:
+      prefix: "ci: "
diff --git a/cookiecutter/target-template/{{cookiecutter.target_id}}/.github/{% if cookiecutter.include_ci_files == 'GitHub' %}dependabot.yml{%endif%} b/cookiecutter/target-template/{{cookiecutter.target_id}}/.github/{% if cookiecutter.include_ci_files == 'GitHub' %}dependabot.yml{%endif%}
index 86a1bce0b7..933e6b1c26 100644
--- a/cookiecutter/target-template/{{cookiecutter.target_id}}/.github/{% if cookiecutter.include_ci_files == 'GitHub' %}dependabot.yml{%endif%}	
+++ b/cookiecutter/target-template/{{cookiecutter.target_id}}/.github/{% if cookiecutter.include_ci_files == 'GitHub' %}dependabot.yml{%endif%}	
@@ -9,15 +9,18 @@ updates:
     directory: "/"
     schedule:
       interval: "daily"
-    prefix: "chore(deps): "
-    prefix-development: "chore(deps-dev): "
+    commit-message:
+      prefix: "chore(deps): "
+      prefix-development: "chore(deps-dev): "
   - package-ecosystem: pip
     directory: "/.github/workflows"
     schedule:
       interval: daily
-    prefix: "ci: "
+    commit-message:
+      prefix: "ci: "
   - package-ecosystem: github-actions
     directory: "/"
     schedule:
       interval: "weekly"
-    prefix: "ci: "
+    commit-message:
+      prefix: "ci: "
diff --git a/e2e-tests/cookiecutters/tap-rest-basic_auth-github-ci.json b/e2e-tests/cookiecutters/tap-rest-basic_auth-github-ci.json
new file mode 100644
index 0000000000..e75e7a6cf1
--- /dev/null
+++ b/e2e-tests/cookiecutters/tap-rest-basic_auth-github-ci.json
@@ -0,0 +1,15 @@
+{
+    "cookiecutter": {
+      "source_name": "AutomaticTestTap",
+      "admin_name": "Automatic Tester",
+      "tap_id": "tap-rest-basic_auth",
+      "library_name": "tap_rest_basic_auth",
+      "variant": "None (Skip)",
+      "stream_type": "REST",
+      "auth_method": "Basic Auth",
+      "include_ci_files": "GitHub",
+      "license": "Apache-2.0",
+      "_template": "../tap-template/",
+      "_output_dir": "."
+    }
+}