diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
index ce02ce4c0..f7c1a12ac 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -1,44 +1,82 @@
 ---
-name: Bug report
-about: Create a report to help us improve
-title: ''
-labels: ''
-assignees: ''
-
+name: ⚠️  Bug Report
+about: Report a reproducible bug in the current release of Ravda
+labels: ["bug"]
 ---
-
-**Describe the bug**
-A clear and concise description of what the bug is.
-
-**To Reproduce**
-Steps to reproduce the behavior:
-1. Go 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.
-
-**Server (please complete the following information):**
- - OS: [e.g. Ubuntu Server X]
- - Browser [e.g. chrome, safari]
- - Ravada Version [e.g. 0.6]
-
-**Client (please complete the following information):**
- - Browser: [e.g. Firefox]
- - OS: [e.g. Windows]
- - Spice client version [e.g. 1.8]
-
-**Additional context**
-Add any other context about the problem here.
-
-Remember that courtesy and proper grammar go a long way.
-Please take the time to craft a precise, polite issue.
-We will do our best to help, but remember that this is an open source project - none of us are getting paid a salary to develop this project, or act as your personal support hotline ;-)
-
-Carefully search the [existing issues](https://github.com/UPC/ravada/issues), both opened and closed. Your question may have already been asked and answered before!
-
+body:
+  - type: markdown
+    attributes:
+  - type: input
+    attributes:
+      label: Ravada version
+      description: What version of Ravada are you currently running?
+      placeholder: 
+    validations:
+      required: true
+  - type: dropdown
+    attributes:
+      label: Client/Server
+      description: What browser do you have?
+      options:
+        - "Server"
+        - "Client"
+    validations:
+      required: true
+  - type: dropdown 
+    attributes: 
+      label: Operating System 
+      description: What operating system are you using?
+      options: 
+        - "Ubuntu" 
+        - "Windows" 
+      visibleWhen: 
+        - field: Client/Server value: "Client" 
+    validations: 
+      required: true
+  - type: dropdown 
+    attributes: 
+      label: Operating System 
+      description: What operating system are you using? 
+      options: 
+        - "Ubuntu Server" 
+        - "Windows Server" 
+        - "Ubuntu" 
+        - "Windows" 
+        visibleWhen: 
+          - field: Client/Server value: "Server" 
+      validations: 
+        required: true
+  - type: dropdown
+    attributes:
+      label: Browser
+      description: What browser do you have?
+      options:
+        - "Firefox"
+        - "Chrome"
+        - "Microsoft Edge"
+        - "Opera"
+        - "Others"
+    validations:
+      required: true
+  - type: textarea
+    attributes:
+      label: Steps to Reproduce
+      description: >
+        A clear and concise description of what you expected to happen.
+      placeholder: |   
+    validations:
+      required: true
+  - type: textarea
+    attributes:
+      label: Expected Behavior
+      description: What did you expect to happen?
+      placeholder: 
+    validations:
+      required: true
+  - type: textarea
+    attributes:
+      label: Observed Behavior
+      description: What happened instead?
+      placeholder: A TypeError exception was raised
+    validations:
+      required: true
diff --git a/.github/ISSUE_TEMPLATE/documentation_change.md b/.github/ISSUE_TEMPLATE/documentation_change.md
new file mode 100644
index 000000000..3f6cc57e7
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/documentation_change.md
@@ -0,0 +1,36 @@
+---
+name: 📖 Documentation Change
+about: Suggest an addition or modification to the Ravada documentation
+labels: ["documentation"]
+---
+body:
+  - type: dropdown
+    attributes:
+      label: Change Type
+      description: What type of change are you proposing?
+      options:
+        - Addition
+        - Correction
+        - Removal
+        - Cleanup (formatting, typos, etc.)
+    validations:
+      required: true
+  - type: dropdown
+    attributes:
+      label: Area
+      description: Which section of the documentation is this change to?
+      options:
+        - Features
+	      - Administrator
+	      - Guest VM
+	      - Development
+        - Other
+    validations:
+      required: true
+  - type: textarea
+    attributes:
+      label: Proposed Changes
+      description: Describe the proposed changes and why they are necessary.
+    validations:
+      required: true
+