diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
index bb137c76e3..c789e28e3a 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -6,17 +6,35 @@ labels: 'bug'
 assignees: ''
 
 ---
+<!-- You MUST fill out this template. We will close issues that don't include enough information to reproduce -->
+#### Describe the bug
+<!-- a short description of the problem -->
 
-**Describe the bug**
+#### Setup and configuration
+**Current version**:
+<!-- run `git log -n 1` to see this -->
+```bash
+```
 
-**Steps to Reproduce**
+<!-- tell us everything about your environment -->
+**My config.toml and environment vars** (be sure to redact API keys):
+```toml
+```
+
+**My model and agent** (you can see these settings in the UI):
+* Model:
+* Agent:
+
+**Commands I ran to install and run OpenDevin**:
+```
+```
+
+**Steps to Reproduce**:
 1.
 2.
 3.
 
-**Expected behavior**
+**Logs, error messages, and screenshots**:
 
-**Actual behavior**
+#### Additional Context
 
-**Additional context**
-<!-- Please include logs, screenshots, etc. -->