diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
index 13a11c29..ca1ca289 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -1,24 +1,38 @@
 ---
 name: Bug report
-about: Create a report to help us improve
+about: Create a report to help improve
 title: ''
 labels: 'bug'
 assignees: ''
 
 ---
 
-**Describe the bug**
-A clear and concise description of what the bug is.
+Your issue may already be reported!
+Please search on the [issue tracker](../) before creating one.
 
-**To Reproduce**
-Steps to reproduce the behavior:
-1. Go to '...'
-2. Click on '....'
-3. Scroll down to '....'
-4. See error
+## Expected Behavior
+<!--- What should happen? -->
+<!--- How it should work? -->
 
-**Expected behavior**
-A clear and concise description of what you expected to happen.
+## Current Behavior
+<!--- What happens instead of the expected behavior? -->
 
-**Additional context**
-Add any other context about the problem here, such as a custom nixpkgs fork you're using.
+## Possible Solution
+<!--- Not obligatory, but suggest a fix/reason for the bug, -->
+<!--- or ideas how to implement the addition or change -->
+
+## Steps to Reproduce
+<!--- An unambiguous set of steps to reproduce this bug. -->
+<!--- Linked fork or gist if needed. -->
+1.
+2.
+3.
+4.
+
+## Context
+<!--- How has this issue affected you? What are you trying to accomplish? -->
+<!--- Providing context helps us come up with a solution that is most useful in the real world. -->
+
+## Your Environment
+<!--- Include relevant details about the environment you experienced the bug in. -->
+<!--- If you have run `flk update`, for example, post the flake.lock file. -->