diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml
index 5300b8aa11b..21e6eede3eb 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.yml
+++ b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -1,16 +1,16 @@
 name: Bug 🐞
 description: Report a bug report
-labels: [kind/bug]
+labels: [kind/bug 🐞]
 
 body:
   - type: markdown
     attributes:
       value: |
-        Before opening a bug report, please search for the behaviour in the existing issues. 
-        
+        Before opening a bug report, please search for the behaviour in the existing issues.
+
         ---
-        
-        Thank you for taking the time to file a bug report. To address this bug as fast as possible, we need some information. 
+
+        Thank you for taking the time to file a bug report. To address this bug as fast as possible, we need some information.
 
   - type: textarea
     id: bug-description
@@ -69,20 +69,20 @@ body:
         - "0.0.2"
         - "0.0.1"
     validations:
-      required: true 
+      required: true
 
   - type: textarea
     id: steps
     attributes:
       label: Steps to reproduce
-      description: What steps do we need to take to reproduce this error? 
+      description: What steps do we need to take to reproduce this error?
 
   - type: textarea
     id: logs
     attributes:
       label: Relevant log output
-      description: If applicable, provide relevant log output. 
-      render: shell 
+      description: If applicable, provide relevant log output.
+      render: shell
 
   - type: textarea
     id: additional-context
diff --git a/.github/ISSUE_TEMPLATE/config.yaml b/.github/ISSUE_TEMPLATE/config.yml
similarity index 100%
rename from .github/ISSUE_TEMPLATE/config.yaml
rename to .github/ISSUE_TEMPLATE/config.yml
diff --git a/.github/ISSUE_TEMPLATE/enhancement.yml b/.github/ISSUE_TEMPLATE/enhancement.yml
index 75120825b1d..7077e68470d 100644
--- a/.github/ISSUE_TEMPLATE/enhancement.yml
+++ b/.github/ISSUE_TEMPLATE/enhancement.yml
@@ -1,15 +1,15 @@
-name: Enhancement 👋
+name: Enhancement ✨
 description: Suggest an enhancement to an existing feature
-labels: [kind/enhancement]
+labels: [kind/enhancement ✨]
 
 body:
   - type: markdown
     attributes:
       value: |
-        Before opening a new enhancement, please search for potential existing issues. 
-        
+        Before opening a new enhancement, please search for potential existing issues.
+
         ---
-        
+
         Thank you for taking the time to file an enhancement request, we appreciate and value your time to help the project!
 
   - type: textarea
diff --git a/.github/ISSUE_TEMPLATE/epic.yml b/.github/ISSUE_TEMPLATE/epic.yml
index f9892e07b09..dea54900a55 100644
--- a/.github/ISSUE_TEMPLATE/epic.yml
+++ b/.github/ISSUE_TEMPLATE/epic.yml
@@ -1,13 +1,13 @@
-name: Epic
+name: Epic ⚡
 description: A high-level feature
-labels: [kind/epic]
+labels: [kind/epic ⚡]
 
 body:
   - type: markdown
     attributes:
       value: |
         Epics are normally created by the development team, to group a set of related features and plan work across multiple sprints.
-        The features this epic includes are referenced with the text of the epic. 
+        The features this epic includes are referenced with the text of the epic.
 
   - type: textarea
     id: domain
diff --git a/.github/ISSUE_TEMPLATE/feature_request.yml b/.github/ISSUE_TEMPLATE/feature_request.yml
index 615961abf31..37b40cfb955 100644
--- a/.github/ISSUE_TEMPLATE/feature_request.yml
+++ b/.github/ISSUE_TEMPLATE/feature_request.yml
@@ -1,15 +1,15 @@
 name: Feature 💡
 description: Suggest an idea for this project
-labels: [kind/feature]
+labels: [kind/feature 💡]
 
 body:
   - type: markdown
     attributes:
       value: |
-        Before opening a feature request, please search for potential existing issues. 
-        
+        Before opening a feature request, please search for potential existing issues.
+
         ---
-        
+
         Thank you for taking the time to file a feature request, we appreciate and value your time to help the project!
 
   - type: textarea