diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
index 6072a61bf..6338b9b2a 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -1,50 +1,74 @@
 name:⚠️  Bug Report
-description: Report a reproducible bug in the current release of NetBox
+description: Report a reproducible bug in the current release of Ravda
 labels: ["bug"]
 body:
   - type: markdown
     attributes:
   - type: input
     attributes:
-      label: NetBox version
-      description: What version of NetBox are you currently running?
-      placeholder: v3.6.4
+      label: Ravada version
+      description: What version of Ravada are you currently running?
+      placeholder: 
     validations:
       required: true
   - type: dropdown
     attributes:
-      label: Python version
-      description: What version of Python are you currently running?
+      label: Client/Server
+      description: What browser do you have?
       options:
-        - "3.8"
-        - "3.9"
-        - "3.10"
-        - "3.11"
+        - "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: >
-        Describe in detail the exact steps that someone else can take to
-        reproduce this bug using the current stable release of NetBox. Begin with the
-        creation of any necessary database objects and call out every operation being
-        performed explicitly. If reporting a bug in the REST API, be sure to reconstruct
-        the raw HTTP request(s) being made: Don't rely on a client library such as
-        pynetbox. Additionally, **do not rely on the demo instance** for reproducing
-        suspected bugs, as its data is prone to modification or deletion at any time.
+        A clear and concise description of what you expected to happen.
       placeholder: |   
-	1. Go to '...'
-        2. Click on '...'
-        3. Scroll down to
-	4. See error
     validations:
       required: true
   - type: textarea
     attributes:
       label: Expected Behavior
       description: What did you expect to happen?
-      placeholder: A new widget should have been created with the specified attributes
+      placeholder: 
     validations:
       required: true
   - type: textarea
diff --git a/.github/ISSUE_TEMPLATE/documentation_change.md b/.github/ISSUE_TEMPLATE/documentation_change.md
index cc33be7c2..2b08f7d00 100644
--- a/.github/ISSUE_TEMPLATE/documentation_change.md
+++ b/.github/ISSUE_TEMPLATE/documentation_change.md
@@ -1,5 +1,5 @@
 name: 📖 Documentation Change
-description: Suggest an addition or modification to the NetBox documentation
+description: Suggest an addition or modification to the Ravada documentation
 labels: ["documentation"]
 body:
   - type: dropdown