diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
deleted file mode 100644
index cb3aac83607a..000000000000
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ /dev/null
@@ -1,68 +0,0 @@
----
-name: "Bug Report"
-about: "Is something not working as expected?"
----
-
-<!--
-  Before opening a new issue please:
-  
-  - Verify you have the latest versions of Jekyll and Minimal Mistakes 
-    installed by running `bundle update`.
-  - Thoroughly read the theme's documentation at
-    https://mmistakes.github.io/minimal-mistakes/docs/quick-start-guide/
-  - Search all issues at https://github.com/mmistakes/minimal-mistakes/issues 
-    for solutions and to avoid duplication.
-  - Ask for help at http://talk.jekyllrb.com/
-  
-  If none of the above solved your problem, you can continue below.
--->
-
-## Environment
-
-<!--
-  Please include theme version, Jekyll version, public git repository, whether 
-  you are hosting with GitHub Pages, and the operating system you tested with.
-
-  Issues without a link to a public repository or ZIP file will likely go ignored.
-  Being able to see your actual files is necessary to troubleshoot, as most 
-  issues stem from invalid/missing YAML Front Matter, a mis-configured _config.yml 
-  file, or problematic site content. 
--->
-
-- Minimal Mistakes version:
-- Ruby gem or remote theme version:
-- Jekyll version:
-- Git repository URL:
-- Hosted on GitHub Pages (if yes provide URL to site):
-- Operating system:
-
-## Expected behavior
-
-<!--
-  What is it you expected to happen? This should be a description of how the
-  functionality you tried to use is supposed to work.
--->
-
-## Steps to reproduce the behavior
-
-<!--
-  Describe the steps you took for this problem to come up. Such as: you installed
-  the theme, customized _config.yml, added your own posts, and started up a 
-  Jekyll server locally.
-
-  If an error occurred on GitHub Pages when pushing, please test a local version
-  following these setup instructions: 
-  https://help.github.com/articles/setting-up-your-github-pages-site-locally-with-jekyll/
-
-  Then provide a complete log by running `bundle exec jekyll build --trace --verbose` 
-  and include this output in the filed issue.
-
-  Screenshots can also be included if they help illustrate a behavior.
--->
-
-## Other
-
-<!--
-  NOTE: Please provide a code repository, gist, code snippet, sample files, 
-  screenshots, or anything else you think will aid in reproducing the issue.
--->
diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml
index 3adfbcd18905..ac8b933ce42a 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.yml
+++ b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -19,7 +19,7 @@ body:
   - type: textarea
     id: environment
     attributes:
-      label: What happened?
+      label: Theme version and system environment
       description: |
         Please include theme version, Jekyll version, public git repository, whether
         you are hosting with GitHub Pages, and the operating system you tested with.
@@ -33,8 +33,21 @@ body:
         - Ruby gem or remote theme version:
         - Jekyll version:
         - Git repository URL:
-        - Hosted on GitHub Pages (if yes provide URL to site):
+        - URL to the page with the problem:
         - Operating system:
+        - Browser version:
+    validations:
+      required: true
+
+  - type: textarea
+    id: what-happened
+    attributes:
+      label: What happened?
+      description: |
+        Describe the problem **in detail**. For example:
+
+        - What is missing?
+        - What error do you see? Attach the error log if available.
     validations:
       required: true
 
@@ -78,4 +91,4 @@ body:
         Please provide a code repository, gist, code snippet, sample files,
         screenshots, or anything else you think will aid in reproducing the issue.
     validations:
-      required: false
\ No newline at end of file
+      required: false
diff --git a/.github/ISSUE_TEMPLATE/documentation.md b/.github/ISSUE_TEMPLATE/documentation.md
deleted file mode 100644
index 25f111fd7a23..000000000000
--- a/.github/ISSUE_TEMPLATE/documentation.md
+++ /dev/null
@@ -1,16 +0,0 @@
----
-name: "Documentation"
-about: "Found a typo or something that needs clarification?"
----
-
-<!-- Thanks for taking the time to open an issue and help make the docs better -->
-
-## Motivation
-
-<!-- Why should we update our docs? -->
-
-<!-- What should we do instead? -->
-
-## Suggestion
-
-<!-- What should we do instead? -->
\ No newline at end of file