diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml
index dce021e..b143235 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.yml
+++ b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -12,12 +12,9 @@ body:
       label: Product or component
       description: Where did the issue occur? This helps us route reports filed in the wrong repository.
       options:
-        - Hex.pm website or API
-        - Hex CLI
-        - HexDocs hosting, rendering, or search
-        - Package preview
-        - Version diff
-        - Bob or package builds
+        - "hexpm/hexpm: Website, API server, HexDocs hosting/processing, package preview, and package version diff"
+        - "hexpm/hex: Package manager client CLI and Mix task integration for Erlang/Elixir"
+        - "hexpm/bob: Automated build service for Elixir, Erlang, Docker tags, and package artifacts"
         - Infrastructure
         - Other
     validations:
diff --git a/.github/ISSUE_TEMPLATE/documentation.yml b/.github/ISSUE_TEMPLATE/documentation.yml
index c7ae4d4..d3c126d 100644
--- a/.github/ISSUE_TEMPLATE/documentation.yml
+++ b/.github/ISSUE_TEMPLATE/documentation.yml
@@ -12,9 +12,8 @@ body:
       label: Documentation type
       description: Which documentation is affected?
       options:
-        - Hex.pm documentation
-        - HexDocs hosting, rendering, or search
-        - Package-authored content (report this to the package repository)
+        - "hexpm/hexpm: Hex.pm documentation, and HexDocs hosting"
+        - "Package-specific documentation (please report to package maintainers)"
         - Other
     validations:
       required: true
diff --git a/.github/ISSUE_TEMPLATE/feature_request.yml b/.github/ISSUE_TEMPLATE/feature_request.yml
index c1df66e..cd225ff 100644
--- a/.github/ISSUE_TEMPLATE/feature_request.yml
+++ b/.github/ISSUE_TEMPLATE/feature_request.yml
@@ -12,12 +12,9 @@ body:
       label: Product or component
       description: Which product or component would this improve?
       options:
-        - Hex.pm website or API
-        - Hex CLI
-        - HexDocs hosting, rendering, or search
-        - Package preview
-        - Version diff
-        - Bob or package builds
+        - "hexpm/hexpm: Website, API server, HexDocs hosting/processing, package preview, and package version diff"
+        - "hexpm/hex: Package manager client CLI and Mix task integration for Erlang/Elixir"
+        - "hexpm/bob: Automated build service for Elixir, Erlang, Docker tags, and package artifacts"
         - Infrastructure
         - Other
     validations:
diff --git a/.github/ISSUE_TEMPLATE/question.yml b/.github/ISSUE_TEMPLATE/question.yml
index f487107..58566a0 100644
--- a/.github/ISSUE_TEMPLATE/question.yml
+++ b/.github/ISSUE_TEMPLATE/question.yml
@@ -12,12 +12,9 @@ body:
       label: Product or component
       description: What is your question about?
       options:
-        - Hex.pm website or API
-        - Hex CLI
-        - HexDocs hosting, rendering, or search
-        - Package preview
-        - Version diff
-        - Bob or package builds
+        - "hexpm/hexpm: Website, API server, HexDocs hosting/processing, package preview, and package version diff"
+        - "hexpm/hex: Package manager client CLI and Mix task integration for Erlang/Elixir"
+        - "hexpm/bob: Automated build service for Elixir, Erlang, Docker tags, and package artifacts"
         - Infrastructure
         - Other
     validations: