diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
deleted file mode 100644
index 706bde4eb4..0000000000
--- a/.github/ISSUE_TEMPLATE.md
+++ /dev/null
@@ -1,13 +0,0 @@
-<!-- *Before creating an issue please make sure you are using the latest version of yarn.* -->
-
-**Do you want to request a *feature* or report a *bug*?**
-<!-- Is the feature a substantial feature request? Please use https://github.com/yarnpkg/rfcs -->
-
-**What is the current behavior?**
-
-**If the current behavior is a bug, please provide the steps to reproduce.**
-<!-- If you can, provide a link to a public repository which contains the files necessary to reproduce this. -->
-
-**What is the expected behavior?**
-
-**Please mention your node.js, yarn and operating system version.**
diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
new file mode 100644
index 0000000000..175b23fb5b
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -0,0 +1,47 @@
+---
+name: Bug report
+about: Create a report
+---
+
+<!-- 
+
+1. Please read our Rules of Conduct: https://github.com/yarnpkg/yarn/blob/master/CODE_OF_CONDUCT.md
+
+2. Please search existing issues to avoid creating duplicates. Duplicates will be closed.
+
+3. Currently, not accepting any new feature requests. Please head over to https://github.com/yarnpkg/berry for new feature requests.
+
+-->
+
+
+<!-- Please fill out all sections. Issues with this not compeleted will be closed. --->
+
+
+### Bug description
+<!-- Any context around the issue or bug is helpful. -->
+
+**Command**
+
+```sh
+yarn [your command]
+```
+
+**What is the current behavior?**
+<!-- Describe how yarn is currently functioning with respect to the bug. -->
+
+
+**What is the expected behavior?**
+<!-- Describe how you expect it to work -->
+
+
+**Steps to Reproduce**
+<!-- If you can, provide a link to a public repository which contains the files necessary to reproduce this. -->
+
+1. 
+2.
+
+**Environment**
+
+- Node Version: `x.x.x`
+- Yarn v1 Version: `1.x.x` 
+- OS and version: 
diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml
new file mode 100644
index 0000000000..89e05efb1a
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -0,0 +1,6 @@
+
+blank_issues_enabled: false
+contact_links:
+  - name: Yarn v1 documentation
+    url:  https://legacy.yarnpkg.com/en/docs
+    about: Please visit the documentation for v1.x.x before opening a bug report