diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index 54c8eb8c33..b247cb8aed 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -20,7 +20,11 @@
 
 <!-- Please select one for your PR and delete the other. -->
 
-Changelog Category: User facing changes | Technical changes
+Changelog Category (reviewers may add a label for the release notes):
+
+- [x] User facing changes
+- [ ] Technical changes only
+- [ ] Feature toggled
 
 <!-- Choose a pull request title above which explains your change to a
      a user of the Open Food Network app. -->
diff --git a/.github/release.yml b/.github/release.yml
index 2a108dc6c8..c6540dd8e2 100644
--- a/.github/release.yml
+++ b/.github/release.yml
@@ -6,6 +6,13 @@ changelog:
       exclude:
         labels:
           - dependencies
-    - title: Dependencies 📦
+          - feature toggled
+          - technical changes only
+    - title: "Experimental features for testing 😎"
+        - feature toggled
+    - title: "Technical changes 🔧"
+      labels:
+        - technical changes only
+    - title: "Dependencies 📦"
       labels:
         - dependencies