diff --git a/.github/ISSUE_TEMPLATE/beta_bug_report.md b/.github/ISSUE_TEMPLATE/beta_bug_report.md
new file mode 100644
index 0000000..7cd36b1
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/beta_bug_report.md
@@ -0,0 +1,55 @@
+---
+name: Beta bug report
+about: Report issues found while testing beta features
+labels: 'beta,bug'
+assignees: ''
+
+---
+
+**Describe the beta bug**
+A clear and concise description of the issue you encountered while testing a beta feature.
+
+**Beta Feature**
+Which beta feature were you testing? (e.g. new UI, experimental downloads, etc.)
+
+**To Reproduce**
+Steps to reproduce the behavior:
+1. ...
+2. ...
+3. ...
+
+**Expected behavior**
+What did you expect to happen?
+
+**Actual behavior**
+What actually happened?
+
+**Screenshots or Recordings**
+If applicable, add screenshots or screen recordings to help explain your problem.
+
+**Environment**
+- OS: [e.g. Ubuntu 22.04]
+- Browser/App version: [e.g. Chrome 123, App v1.2.3-beta]
+- Device: [e.g. Desktop, Mobile]
+- Docker/Standalone: [e.g. Docker, Standalone]
+
+**docker-compose.yaml (if applicable)**
+```
+Paste it here
+```
+
+**.env (if applicable)**
+```
+Paste it here
+```
+
+**Config (if applicable)**
+- You can either share a screenshot of the config page or, preferably, the config file (should be under `./config/main.json`, depending on your setup)
+
+**Logs**
+```
+Paste relevant logs here (restart the app before reproducing if possible)
+```
+
+**Feedback for Developers**
+Any suggestions, feedback, or context that might help us understand or fix the issue faster. 
\ No newline at end of file
diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
index 79f6a27..6e3739c 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -1,8 +1,7 @@
 ---
 name: Bug report
 about: Create a report to help us improve
-title: "[BUG]"
-labels: ''
+labels: 'bug'
 assignees: ''
 
 ---
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
new file mode 100644
index 0000000..f8af81f
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -0,0 +1,21 @@
+---
+name: Feature request
+about: Suggest a new feature or improvement for the project
+labels: 'enhancement'
+assignees: ''
+
+---
+
+**Describe the feature you'd like**
+A clear and concise description of the feature or improvement you are requesting.
+
+**Is your feature request related to a problem? Please describe.**
+If applicable, provide context about the problem this feature would solve.
+
+**Additional context**
+Add any other context, mockups, or screenshots about the feature request here.
+
+**Environment (if relevant)**
+- OS: [e.g. Ubuntu 22.04]
+- Browser/App version: [e.g. Chrome 123, App v1.2.3]
+- Device: [e.g. Desktop, Mobile] 
\ No newline at end of file
diff --git a/docker-compose.yaml b/docker-compose.yaml
index 9e9b9ac..2c19e70 100755
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -2,6 +2,7 @@ name: spotizerr
 
 services:
   spotizerr:
+    image: cooldockerizer93/spotizerr
     volumes:
       - ./data:/app/data
       - ./downloads:/app/downloads  # <-- Change this for your music library dir