diff --git a/.github/ISSUE_TEMPLATE/autocert_bug.md b/.github/ISSUE_TEMPLATE/autocert_bug.md
deleted file mode 100644
index c4a75b6ee..000000000
--- a/.github/ISSUE_TEMPLATE/autocert_bug.md
+++ /dev/null
@@ -1,28 +0,0 @@
----
-name: Autocert Bug
-about: Report a bug you found in autocert
-labels: area/autocert bug
----
-
-### Subject of the issue
-Describe your issue here
-
-### Environment
-* Kubernetes version:
-* Cloud provider or hardware configuration:
-* OS (e.g., from /etc/os-release):
-* Kernel (e.g., `uname -a`):
-* Install tools:
-* Other:
-
-### Steps to reproduce
-Tell us how to reproduce this issue
-
-### Expected behaviour
-Tell us what should happen
-
-### Actual behaviour
-Tell us what happens instead
-
-### Additional context
-Add any other context about the problem here
diff --git a/.github/ISSUE_TEMPLATE/autocert_enhancement.md b/.github/ISSUE_TEMPLATE/autocert_enhancement.md
deleted file mode 100644
index 5260f5ece..000000000
--- a/.github/ISSUE_TEMPLATE/autocert_enhancement.md
+++ /dev/null
@@ -1,11 +0,0 @@
----
-name: Autocert Enhancement
-about: Suggest an enhancement to autocert
-labels: area/autocert enhancement
----
-
-### What would you like to be added
-
-
-### Why this is needed
-
diff --git a/.github/ISSUE_TEMPLATE/enhancement.md b/.github/ISSUE_TEMPLATE/enhancement.md
new file mode 100644
index 000000000..0915d08fd
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/enhancement.md
@@ -0,0 +1,11 @@
+---
+name: Certificates Enhancement
+about: Suggest an enhancement to step certificates
+labels: area/cert-management enhancement
+---
+
+### What would you like to be added
+
+
+### Why this is needed
+