diff --git a/.github/ISSUE_TEMPLATE/3_transfer-request.yml b/.github/ISSUE_TEMPLATE/3_transfer-request.yml
index 10bbda5..4f060b6 100644
--- a/.github/ISSUE_TEMPLATE/3_transfer-request.yml
+++ b/.github/ISSUE_TEMPLATE/3_transfer-request.yml
@@ -1,5 +1,5 @@
 name: Plugin Transfer Request
-description: Request to transfer your plugin into Homebridge ownership.
+description: Request to transfer your plugin into the Homebridge Plugins organization.
 title: 'Transfer Request: homebridge-'
 labels:
   - request-transfer
@@ -11,9 +11,6 @@ body:
     attributes:
       value: |
         - You must be the developer of the plugin to request the transfer.
-        - You must be willing to transfer the GitHub repository to the Homebridge Plugins organization.
-        - You must be willing to transfer the NPM package to the Homebridge organization.
-        - Another developer may request to maintain the plugin.
   - type: input
     id: plugin-name
     attributes:
@@ -28,6 +25,23 @@ body:
       placeholder: https://github.com/homebridge/homebridge-xyz
     validations:
       required: true
+  - type: markdown
+    attributes:
+      value: '## Maintenance'
+#  - type: markdown
+#    attributes:
+#      value: |
+#        - If you select no to the following question, then:
+#        - You must be willing to transfer the NPM package to the Homebridge organization.
+#        - Another developer may request to maintain the plugin.
+  - type: dropdown
+    attributes:
+      label: Do you plan to maintain the plugin in the Homebridge Plugins organization?
+      options:
+        - Yes
+        - No
+    validations:
+      required: true
   - type: markdown
     attributes:
       value: '## More Information'