diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
index f3d5c41..71c1619 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -1,38 +1,53 @@
----
-name: Bug report
-about: Create a report to help us improve
-title: ''
-labels: bug
-assignees: ''
+# Bug Report
+
+Thank you for taking the time to report a bug in Donetick! Please fill out the information below to help us diagnose and fix the issue as quickly as possible.
 
 ---
 
-**Describe the bug**
-A clear and concise description of what the bug is.
+## Description
+*A clear and concise description of the bug.*
+
+**Expected Behavior:**
+*A clear and concise description of what you expected to happen.*
+
+**Actual Behavior:**
+*A clear and concise description of what actually happened.*
+
+---
+
+## Steps to Reproduce
+*Steps to reproduce the behavior.*
 
-**To Reproduce**
-Steps to reproduce the behavior:
 1. Go to '...'
-2. Click on '....'
-3. Scroll down to '....'
+2. Click on '...'
+3. Scroll down to '...'
 4. See error
 
-**Expected behavior**
-A clear and concise description of what you expected to happen.
+---
 
-**Screenshots**
-If applicable, add screenshots to help explain your problem.
+## Screenshots (if applicable)
+*Attach screenshots or screen recordings to help explain the issue.*
 
-**Desktop (please complete the following information):**
- - OS: [e.g. iOS]
- - Browser [e.g. chrome, safari]
- - Version [e.g. 22]
+---
 
-**Smartphone (please complete the following information):**
- - Device: [e.g. iPhone6]
- - OS: [e.g. iOS8.1]
- - Browser [e.g. stock browser, safari]
- - Version [e.g. 22]
+## Environment
+- **Donetick Version:** (e.g., v1.2.3)
+- **Deployment Method:** (Self-hosted, Docker, Cloud, etc.)
+- **Operating System:** (e.g., Windows, macOS, Linux)
+- **Browser & Version:** (if applicable, e.g., Chrome 110.0, Firefox 99.0)
+- **Relevant Logs:** (Paste any relevant error messages or logs here.)
+
+---
+
+## Additional Context
+*Add any other context about the problem here.*
+
+---
+
+### Checklist
+- [ ] I have searched for existing issues that might be related to this bug.
+- [ ] I have provided detailed information to help reproduce the issue.
+- [ ] I have included logs or screenshots where applicable.
+
+Thank you for reporting this issue!
 
-**Additional context**
-Add any other context about the problem here.