diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml
index 65952aa112..eeb24c01c7 100644
--- a/.github/ISSUE_TEMPLATE/config.yml
+++ b/.github/ISSUE_TEMPLATE/config.yml
@@ -1,8 +1,8 @@
 blank_issues_enabled: false
 contact_links:
-  - name: ❓ Red Hat Developer Hub JIRA
+  - name: 🔌 Janus-IDP Plugins
     url: https://issues.redhat.com/browse/RHIDP
-    about: Please report any showcase/RHDH issues or feature requests in JIRA - https://issues.redhat.com/browse/RHIDP
-  - name: ❓ Backstage Community Plugins
+    about: Please report any issues with existing plugins in this repo in JIRA - https://issues.redhat.com/browse/RHIDP
+  - name: 🔌 Backstage Community Plugins
     url: https://github.com/backstage/community-plugins/issues
-    about: Please report any plugin issues or feature requests in https://github.com/backstage/community-plugins/issues
+    about: For new plugin / feature requests, see https://github.com/backstage/community-plugins/issues
diff --git a/.github/ISSUE_TEMPLATE/plugin.yaml b/.github/ISSUE_TEMPLATE/plugin.yaml
deleted file mode 100644
index fbf8304345..0000000000
--- a/.github/ISSUE_TEMPLATE/plugin.yaml
+++ /dev/null
@@ -1,52 +0,0 @@
-name: 🔌 Plugin
-description: 'Submit a proposal for a new Plugin'
-title: '🔌 Plugin: '
-labels: [plugin, status/triage]
-body:
-  - type: markdown
-    attributes:
-      value: |
-        We value your time and efforts to submit this Plugin request form. 🙏
-  - type: textarea
-    id: plugin-summary
-    validations:
-      required: true
-    attributes:
-      label: '🔖 Summary'
-      description: 'Provide a general summary of the plugin and how it should work'
-      placeholder: 'You should add ...'
-  - type: textarea
-    id: website
-    attributes:
-      label: '🌐 Project website (if applicable)'
-      description: 'Add a link to the open source project or product this plugin will integrate with, if existing'
-      placeholder: 'Website Link is ...'
-  - type: textarea
-    id: context
-    attributes:
-      label: '✌️ Context'
-      description: 'A clear and concise description about the Plugin.'
-      placeholder: 'Providing additional context'
-  - type: checkboxes
-    id: no-duplicate-issues
-    attributes:
-      label: '👀 Have you spent some time to check if this plugin request has been raised before?'
-      options:
-        - label: "I checked and didn't find similar issue"
-          required: true
-  - type: checkboxes
-    id: read-code-of-conduct
-    attributes:
-      label: '🏢 Have you read the Code of Conduct?'
-      options:
-        - label: 'I have read the [Contributing Guidelines](https://github.com/backstage/backstage/blob/master/CODE_OF_CONDUCT.md)'
-          required: true
-  - type: dropdown
-    id: willing-to-submit-pr
-    attributes:
-      label: Are you willing to submit PR?
-      description: This is absolutely not required, but we are happy to guide you in the contribution process.
-      options:
-        - Yes I am willing to submit a PR!
-        - No, but I'm happy to collaborate on a PR with someone else
-        - No, I don't have time to work on this right now