diff --git a/.gitlab/issue_templates/Feature Proposal - basic.md b/.gitlab/issue_templates/Feature Proposal - basic.md
index 980751621f0223820a9c0eddb92dafe90b76c8e9..b16b5910b72a70cb5561c2e8fdf0158740d833b3 100644
--- a/.gitlab/issue_templates/Feature Proposal - basic.md	
+++ b/.gitlab/issue_templates/Feature Proposal - basic.md	
@@ -13,4 +13,6 @@ Use the following resources to find the appropriate labels:
 - https://about.gitlab.com/handbook/product/categories/features/
 -->
 
-/label ~"type::feature" ~feature::addition ~"group::" ~"section::" ~"Category:" ~"GitLab Core"/~"GitLab Premium"/~"GitLab Ultimate"
+/label ~"group::" ~"section::" ~"Category::" 
+/label ~"GitLab Free" ~"GitLab Premium" ~"GitLab Ultimate"
+/label ~"type::feature" ~"feature::addition" ~documentation
diff --git a/.gitlab/issue_templates/Feature Proposal - lean.md b/.gitlab/issue_templates/Feature Proposal - lean.md
index 05376ac60fa1a261570470d6908650cca811d156..c5255315373696506201b043db706c48e33c0d78 100644
--- a/.gitlab/issue_templates/Feature Proposal - lean.md	
+++ b/.gitlab/issue_templates/Feature Proposal - lean.md	
@@ -52,4 +52,7 @@ Use the following resources to find the appropriate labels:
 - https://about.gitlab.com/handbook/product/categories/features/
 -->
 
-/label ~"type::feature" ~"group::" ~"section::"  ~"Category::" ~"GitLab Free"/~"GitLab Premium"/~"GitLab Ultimate" ~documentation ~direction
+/label ~"type::feature"
+/label ~"group::" ~"section::"  ~"Category::"
+/label ~"GitLab Free" ~"GitLab Premium" ~"GitLab Ultimate"
+/label ~documentation ~direction
diff --git a/.gitlab/issue_templates/Feature proposal - detailed.md b/.gitlab/issue_templates/Feature proposal - detailed.md
index c787fc993333883e5221dac103dad213586dd8c5..f75ee08bfcb44bedb7f57a21049c20aee824183c 100644
--- a/.gitlab/issue_templates/Feature proposal - detailed.md	
+++ b/.gitlab/issue_templates/Feature proposal - detailed.md	
@@ -118,6 +118,6 @@ Use the following resources to find the appropriate labels:
 - https://gitlab.com/gitlab-org/gitlab/-/labels
 - https://about.gitlab.com/handbook/product/categories/features/
 -->
-/label ~devops:: ~group: ~Category:
-/label  ~"GitLab Free"/~"GitLab Premium"/~"GitLab Ultimate"
+/label ~"group::" ~"section::" ~"Category::"
+/label ~"GitLab Free" ~"GitLab Premium" ~"GitLab Ultimate"
 /label ~"type::feature" ~documentation ~direction