diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml
index 313234f82a..a0547b8b52 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.yml
+++ b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -82,6 +82,7 @@ body:
         - 'homectl'
         - 'hostnamectl'
         - 'hardware database files'
+        - 'importctl'
         - 'journalctl'
         - 'kernel-install'
         - 'loginctl'
@@ -112,7 +113,7 @@ body:
         - 'systemd-homed'
         - 'systemd-hostnamed'
         - 'systemd-hwdb'
-        - 'systemd-import'
+        - 'systemd-importd'
         - 'systemd-journal-gatewayd'
         - 'systemd-journal-remote'
         - 'systemd-journal-upload'
diff --git a/.github/ISSUE_TEMPLATE/feature_request.yml b/.github/ISSUE_TEMPLATE/feature_request.yml
index f6f8ac0f75..5e5996d757 100644
--- a/.github/ISSUE_TEMPLATE/feature_request.yml
+++ b/.github/ISSUE_TEMPLATE/feature_request.yml
@@ -21,6 +21,7 @@ body:
         - 'homectl'
         - 'hostnamectl'
         - 'hardware database files'
+        - 'importctl'
         - 'journalctl'
         - 'kernel-install'
         - 'loginctl'
@@ -51,7 +52,7 @@ body:
         - 'systemd-homed'
         - 'systemd-hostnamed'
         - 'systemd-hwdb'
-        - 'systemd-import'
+        - 'systemd-importd'
         - 'systemd-journal-gatewayd'
         - 'systemd-journal-remote'
         - 'systemd-journal-upload'
diff --git a/.github/advanced-issue-labeler.yml b/.github/advanced-issue-labeler.yml
index 4e19392598..b06cc20292 100644
--- a/.github/advanced-issue-labeler.yml
+++ b/.github/advanced-issue-labeler.yml
@@ -53,7 +53,7 @@ policy:
             keys: ['systemd-hwdb', 'hardware database files']
 
           - name: import
-            keys: ['systemd-import']
+            keys: ['systemd-importd', 'importctl']
 
           - name: journal
             keys: ['systemd-journald', 'journalctl']