diff --git a/.github/ISSUE_TEMPLATE/bug-report.yml b/.github/ISSUE_TEMPLATE/bug-report.yml
index 3b107f758..b09a3616c 100644
--- a/.github/ISSUE_TEMPLATE/bug-report.yml
+++ b/.github/ISSUE_TEMPLATE/bug-report.yml
@@ -4,7 +4,7 @@ description: Report a bug
 labels:
   - type/bug/unconfirmed
   - status/needs-triage
-  - priority/4-normal
+  - priority/4/normal
 body:
   - type: markdown
     attributes:
@@ -17,7 +17,7 @@ body:
         2. Please try to give as much information as possible for us to be able to reproduce the issue and provide a quick fix.
         3. Please ensure an issue does not already exist for this potential bug.
         4. Please only provide specific versions. Latest is not a version.
-        5. Please read the [Troubleshooting Sanitization](https://www.authelia.com/r/sanitize) reference guide if you plan on removing or adjusting any values for the logs or configuration files
+        5. Please read the [Troubleshooting Sanitization](https://www.authelia.com/r/sanitize) reference guide if you plan on removing or adjusting any values for the logs or configuration files.
   - type: dropdown
     id: version
     attributes:
@@ -105,6 +105,13 @@ body:
       description: Describe how we can reproduce this issue
     validations:
       required: true
+  - type: textarea
+    id: expectations
+    attributes:
+      label: Expectations
+      description: Describe the desired or expected results
+    validations:
+      required: false
   - type: textarea
     id: logs
     attributes:
@@ -121,13 +128,6 @@ body:
       render: yaml
     validations:
       required: false
-  - type: textarea
-    id: expectations
-    attributes:
-      label: Expectations
-      description: Describe the desired or expected results
-    validations:
-      required: false
   - type: textarea
     id: documentation
     attributes:
diff --git a/.github/ISSUE_TEMPLATE/feature-request.yml b/.github/ISSUE_TEMPLATE/feature-request.yml
index 00a448c06..51f27a59e 100644
--- a/.github/ISSUE_TEMPLATE/feature-request.yml
+++ b/.github/ISSUE_TEMPLATE/feature-request.yml
@@ -4,7 +4,7 @@ description: Submit a Feature for Design which Has Been Submitted as an Idea and
 labels:
   - type/feature
   - status/needs-design
-  - priority/4-normal
+  - priority/4/normal
 body:
   - type: markdown
     attributes:
diff --git a/cmd/authelia-gen/templates/github_issue_template_bug_report.yml.tmpl b/cmd/authelia-gen/templates/github_issue_template_bug_report.yml.tmpl
index 592c9383e..e947f87cd 100644
--- a/cmd/authelia-gen/templates/github_issue_template_bug_report.yml.tmpl
+++ b/cmd/authelia-gen/templates/github_issue_template_bug_report.yml.tmpl
@@ -17,7 +17,7 @@ body:
         2. Please try to give as much information as possible for us to be able to reproduce the issue and provide a quick fix.
         3. Please ensure an issue does not already exist for this potential bug.
         4. Please only provide specific versions. Latest is not a version.
-        5. Please read the [Troubleshooting Sanitization](https://www.authelia.com/r/sanitize) reference guide if you plan on removing or adjusting any values for the logs or configuration files
+        5. Please read the [Troubleshooting Sanitization](https://www.authelia.com/r/sanitize) reference guide if you plan on removing or adjusting any values for the logs or configuration files.
   - type: dropdown
     id: version
     attributes:
@@ -75,6 +75,13 @@ body:
       description: Describe how we can reproduce this issue
     validations:
       required: true
+  - type: textarea
+    id: expectations
+    attributes:
+      label: Expectations
+      description: Describe the desired or expected results
+    validations:
+      required: false
   - type: textarea
     id: logs
     attributes:
@@ -91,13 +98,6 @@ body:
       render: yaml
     validations:
       required: false
-  - type: textarea
-    id: expectations
-    attributes:
-      label: Expectations
-      description: Describe the desired or expected results
-    validations:
-      required: false
   - type: textarea
     id: documentation
     attributes:
diff --git a/cmd/authelia-gen/types.go b/cmd/authelia-gen/types.go
index e812b231c..7c47772e8 100644
--- a/cmd/authelia-gen/types.go
+++ b/cmd/authelia-gen/types.go
@@ -80,7 +80,7 @@ var labelPriorityDescriptions = [...]string{
 }
 
 func (p labelPriority) String() string {
-	return fmt.Sprintf("%s/%d-%s", labelAreaPrefixPriority, p+1, strings.ToLower(labelPriorityDescriptions[p]))
+	return fmt.Sprintf("%s/%d/%s", labelAreaPrefixPriority, p+1, strings.ToLower(labelPriorityDescriptions[p]))
 }
 
 func (p labelPriority) Description() string {