diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml
index 9f285e26b4f..8460baeb143 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.yml
+++ b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -103,6 +103,8 @@ body:
         - 'systemd-boot'
         - 'systemd-cgtop'
         - 'systemd-coredump'
+        - 'systemd-creds'
+        - 'systemd-cryptenroll'
         - 'systemd-cryptsetup'
         - 'systemd-delta'
         - 'systemd-dissect'
diff --git a/.github/ISSUE_TEMPLATE/feature_request.yml b/.github/ISSUE_TEMPLATE/feature_request.yml
index aec3e0eaa3b..6c7e8368466 100644
--- a/.github/ISSUE_TEMPLATE/feature_request.yml
+++ b/.github/ISSUE_TEMPLATE/feature_request.yml
@@ -42,6 +42,8 @@ body:
         - 'systemd-boot'
         - 'systemd-cgtop'
         - 'systemd-coredump'
+        - 'systemd-creds'
+        - 'systemd-cryptenroll'
         - 'systemd-cryptsetup'
         - 'systemd-delta'
         - 'systemd-dissect'
diff --git a/.github/advanced-issue-labeler.yml b/.github/advanced-issue-labeler.yml
index 442a1be4066..3e713627d56 100644
--- a/.github/advanced-issue-labeler.yml
+++ b/.github/advanced-issue-labeler.yml
@@ -22,8 +22,11 @@ policy:
           - name: coredump
             keys: ['coredumpctl', 'systemd-coredump']
 
+          - name: creds
+            keys: ['systemd-creds']
+
           - name: cryptsetup
-            keys: ['systemd-cryptsetup']
+            keys: ['systemd-cryptsetup', 'systemd-cryptenroll']
 
           - name: delta
             keys: ['systemd-delta']