diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
index 12e5d71653..4262d28545 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -1,12 +1,11 @@
 ---
 name: Bug report
-about: Something not working as expected? Let us look into it
-title: ""
+about: "Found a bug? Please fill out the sections below. \U0001F44D"
+title: "[BUG]"
 labels: bug
-assignees: ""
----
+assignees: ''
 
-Found a bug? Please fill out the sections below. 👍
+---
 
 ### Issue Summary
 
@@ -18,27 +17,30 @@ A summary of the issue. This needs to be a clear detailed-rich summary.
 
 ### Steps to Reproduce
 
-<!--
 1. (for example) Went to ...
 2. Clicked on...
 3. ...
 
-Any other relevant information. For example, why do you consider this a bug and what did you expect to happen instead?
--->
+### Expected behavior
+A clear and concise description of what you expected to happen.
 
-(Write your answer here.)
+### Other information
 
-## Environment
+#### Screenshots
+If applicable, add screenshots to help explain your problem.
 
+#### Environment
 - [ ] Formbricks Cloud (app.formbricks.com)
-- [ ] self-hosted snoopForms, version/commit: [please provide]
+- [ ] self-hosted Formbricks, version/commit: [please provide]
 
-### Additional Context
+#### Desktop (please complete the following information):
+ - OS: [e.g. iOS]
+ - Browser [e.g. chrome, safari]
+ - Version [e.g. 22]
 
-<!--
-- Browser version, screen recording, console logs, network requests: You can make a recording with [Bird Eats Bug](https://birdeatsbug.com/).
-- Node.js version
-- Anything else that you think could be an issue.
--->
+#### Node.JS version
+[e.g. v18.15.0]
 
-(Write your answer here.)
+#### Anything else?
+- Screen recording, console logs, network requests: You can make a recording with [Bird Eats Bug](https://birdeatsbug.com/).
+- Anything else that you think could be an issue?
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
index 87d2eb23d4..b3af7baafb 100644
--- a/.github/ISSUE_TEMPLATE/feature_request.md
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -1,41 +1,20 @@
 ---
 name: Feature request
-about: Suggest a feature or idea
-title: ""
-labels: feature
-assignees: ""
+about: "Suggest an idea for this project \U0001F680"
+title: "[FEATURE]"
+labels: enhancement
+assignees: ''
+
 ---
 
-### Is your proposal related to a problem?
+**Is your feature request related to a problem? Please describe.**
+A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
 
-<!--
-  Provide a clear and concise description of what the problem is.
-  For example, "I'm always frustrated when..."
--->
+**Describe the solution you'd like**
+A clear and concise description of what you want to happen.
 
-(Write your answer here.)
+**Describe alternatives you've considered**
+A clear and concise description of any alternative solutions or features you've considered.
 
-### Describe the solution you'd like
-
-<!--
-  Provide a clear and concise description of what you want to happen.
--->
-
-(Describe your proposed solution here.)
-
-### Describe alternatives you've considered
-
-<!--
-  Let us know about other solutions you've tried or researched.
--->
-
-(Write your answer here.)
-
-### Additional context
-
-<!--
-  Is there anything else you can add about the proposal?
-  You might want to link to related issues here, if you haven't already.
--->
-
-(Write your answer here.)
+**Additional context**
+Add any other context or screenshots about the feature request here.