diff --git a/.github/labeler.yml b/.github/labeler.yml
index 0b59473b94..e2ba643e65 100644
--- a/.github/labeler.yml
+++ b/.github/labeler.yml
@@ -28,6 +28,16 @@
   - changed-files:
     - any-glob-to-any-file:
       - "legacy_promotions/**/*"
+"changelog:solidus_storefront":
+- any:
+  - changed-files:
+    - any-glob-to-any-file:
+      - "storefront/**/*"
+"changelog:solidus_i18n":
+- any:
+  - changed-files:
+    - any-glob-to-any-file:
+      - "i18n/**/*"
 "changelog:solidus_sample":
 - any:
   - changed-files:
@@ -53,6 +63,8 @@
       - "!promotions/**/*"
       - "!legacy_promotions/**/*"
       - "!sample/**/*"
+      - "!storefront/**/*"
+      - "!i18n/**/*"
       - "!lib/**/*"
       - "!README.md"
       - "!solidus.gemspec"
diff --git a/.github/release.yml b/.github/release.yml
index cd4f4ffc8f..4b9d846c21 100644
--- a/.github/release.yml
+++ b/.github/release.yml
@@ -27,6 +27,15 @@ changelog:
     - title: Solidus Promotions
       labels:
         - "changelog:solidus_promotions"
+    - title: Solidus Legacy Promotions
+      labels:
+        - "changelog:solidus_legacy_promotions"
+    - title: Solidus Storefront
+      labels:
+        - "changelog:solidus_storefront"
+    - title: Solidus I18n
+      labels:
+        - "changelog:solidus_i18n"
     - title: Breaking Changes
       labels:
         - "changelog:breaking-change"