diff --git a/.github/ISSUE_TEMPLATE/openapi-spec-bug-report.md b/.github/ISSUE_TEMPLATE/openapi-spec-bug-report.md
new file mode 100644
index 0000000000..f239f0b437
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/openapi-spec-bug-report.md
@@ -0,0 +1,10 @@
+---
+name: OpenAPI Spec Bug Report
+about: Create a report to help us improve the OpenAPI Spec
+title: "[OpenAPI Spec Bug] "
+labels: bug
+assignees: ''
+
+---
+
+**Describe the bug**
diff --git a/.github/ISSUE_TEMPLATE/GH_ACTION_ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE/release-bug.md
similarity index 63%
rename from .github/ISSUE_TEMPLATE/GH_ACTION_ISSUE_TEMPLATE.md
rename to .github/ISSUE_TEMPLATE/release-bug.md
index 80715c5c07..bcd88fa578 100644
--- a/.github/ISSUE_TEMPLATE/GH_ACTION_ISSUE_TEMPLATE.md
+++ b/.github/ISSUE_TEMPLATE/release-bug.md
@@ -1,6 +1,10 @@
 ---
+name: Release Bug
+about: This template is used by the CD to file bugs during the release process
 title: "({{env.TARGET_ENV}}) The {{env.RELEASE_NAME}} Release has failed. :scream_cat:"
 labels: failed-release
+assignees: ''
+
 ---
-See https://github.com/mongodb/openapi/actions/runs/{{env.GITHUB_RUN_ID}}
 
+See https://github.com/mongodb/openapi/actions/runs/{{env.GITHUB_RUN_ID}}