diff --git a/.github/ISSUE_TEMPLATE/bug.yml b/.github/ISSUE_TEMPLATE/bug.yml
index c89e3b8c..9158c3ed 100644
--- a/.github/ISSUE_TEMPLATE/bug.yml
+++ b/.github/ISSUE_TEMPLATE/bug.yml
@@ -1,4 +1,4 @@
-name: Bug report
+name: Bug Report
 description: 'Create a report to help us improve'
 labels: bug
 body:
@@ -15,6 +15,8 @@ body:
     attributes:
       description: Please verify that you've followed these steps.
       options:
+        - label: I understand project setup issues should be asked on [StackOverflow](https://stackoverflow.com/questions/tagged/http-proxy-middleware) or in [GitHub Discussions](https://github.com/chimurai/http-proxy-middleware/discussions).
+          required: true
         - label: I updated to latest `http-proxy-middleware`.
           required: true
   - type: textarea
@@ -22,25 +24,39 @@ body:
       label: 'Describe the bug (be clear and concise)'
     validations:
       required: true
+  - type: markdown
+    attributes:
+      value: 'If possible, please provide minimal example on CodeSandbox that demonstrates the issue. You can use the following template: https://codesandbox.io/s/http-proxy-middleware-44oc1'
   - type: textarea
     attributes:
+      label: 'Step-by-step reproduction instructions'
+      value: |
+        1. ...
+        2. ...
       render: shell
-      label: 'Server and `http-proxy-middleware` configuration'
     validations:
       required: true
-  - type: markdown
+  - type: textarea
     attributes:
-      value: 'If possible, please provide minimal example on CodeSandbox that demonstrates the issue. You can use the following template: https://codesandbox.io/s/http-proxy-middleware-44oc1'
+      label: 'Expected behavior (be clear and concise)'
+      placeholder: Tell us in a clear and concise description of what you expected to happen.
+    validations:
+      required: true
   - type: textarea
     attributes:
-      label: 'Step-by-step reproduction instructions'
+      render: typescript
+      label: 'What http-proxy-middleware configuration are you using?'
+      placeholder: 'Paste your http-proxy configuration here...'
     validations:
       required: true
   - type: textarea
     attributes:
-      label: 'Expected behavior'
+      render: shell
+      label: 'What OS/version and node/version are you seeing the problem?'
+      placeholder: 'ie. MacOS 11.4 and Node 16.2.0'
     validations:
       required: true
   - type: textarea
     attributes:
       label: 'Additional context (optional)'
+      placeholder: 'Please add any addition information that might help the investigation'
diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
deleted file mode 100644
index ba26f269..00000000
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ /dev/null
@@ -1,53 +0,0 @@
----
-name: Bug report
-about: Create a report to help us improve
-title: '[BUG]'
-labels: ''
-assignees: ''
----
-
-Please note your issue will be closed without comment if do not fill out the issue checklist and provide ALL the requested information.
-
-**`yarn why http-proxy-middleware` OR `npm ls http-proxy-middleware` output (mask private folder names with \*\*\*\*\*)**
-
-```shell
-# paste output here
-```
-
-**Please verify that you've followed these steps**
-
-[ ] - I've updated to latest `http-proxy-middleware`.
-
-**Describe the bug**
-
-A clear and concise description of what the bug is.
-
-**To Reproduce**
-
-If possible, please provide minimal example on CodeSandbox that demonstrates the issue. You can use the following template: https://codesandbox.io/s/http-proxy-middleware-44oc1
-
-**Step-by-step reproduction instructions**
-
-```text
-1. ...
-2. ...
-```
-
-**Expected behavior**
-
-A clear and concise description of what you expected to happen.
-
-**`http-proxy-middleware` configuration**
-
-```javascript
-// paste code and configuration here
-```
-
-**Server (please complete the following information):**
-
-- OS: [e.g. MacOS, Windows]
-- NodeJS version: [e.g. 12.4]
-
-**Additional context**
-
-Add any other context about the problem here.
diff --git a/.github/ISSUE_TEMPLATE/feature.yml b/.github/ISSUE_TEMPLATE/feature.yml
index e77f8224..4ea89268 100644
--- a/.github/ISSUE_TEMPLATE/feature.yml
+++ b/.github/ISSUE_TEMPLATE/feature.yml
@@ -5,8 +5,10 @@ body:
   - type: textarea
     attributes:
       label: "Describe the feature you'd love to see"
+      placeholder: 'A clear and concise description of the feature request'
     validations:
       required: true
   - type: textarea
     attributes:
       label: 'Additional context (optional)'
+      placeholder: 'Add any other context about the feature request here.'
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
deleted file mode 100644
index 83d5d457..00000000
--- a/.github/ISSUE_TEMPLATE/feature_request.md
+++ /dev/null
@@ -1,15 +0,0 @@
----
-name: Feature request
-about: Suggest an idea for this project
-title: '[FEATURE]'
-labels: ''
-assignees: ''
----
-
-**Describe the feature you'd love to see**
-
-A clear and concise description of the feature request
-
-**Additional context**
-
-Add any other context about the feature request here.