diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
new file mode 100644
index 0000000..6c4d16e
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -0,0 +1,30 @@
+---
+name: Bug report
+about: Please use this bug report template to help reproduce and fix bugs in Noteshare.space!
+title: "[Bug]"
+labels: ''
+assignees: ''
+
+---
+
+**Describe the bug**
+A clear and concise description of what the bug is.
+
+**To Reproduce**
+Steps to reproduce the behavior:
+- Describe the steps you took to reach this bug.
+
+**Expected behavior**
+A clear and concise description of what you expected to happen.
+
+**Screenshots**
+- Provide a screenshot showing what is wrong.
+- If possible, share a note to noteshare.space and put the share link in this bug report so I can further debug the problem.
+
+**Environment (please complete the following information):**
+ - OS: [e.g. Windows, MacOS, iOS, Android, ...]
+ - Browser [e.g. chrome, safari]
+ - Version [e.g. 22]
+
+**Additional context**
+Add any other context about the problem here.
\ No newline at end of file
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
new file mode 100644
index 0000000..3048e26
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -0,0 +1,20 @@
+---
+name: Feature request
+about: Suggest an idea for this project
+title: "[Feature request]"
+labels: ''
+assignees: ''
+
+---
+
+**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 [...]
+
+**Describe the solution you'd like**
+A clear and concise description of what you want to happen.
+
+**Describe alternatives you've considered**
+A clear and concise description of any alternative solutions or features you've considered.
+
+**Additional context**
+Add any other context or screenshots about the feature request here.
\ No newline at end of file
diff --git a/webapp/src/lib/components/Footer.svelte b/webapp/src/lib/components/Footer.svelte
index 75d63f0..dbe6aac 100644
--- a/webapp/src/lib/components/Footer.svelte
+++ b/webapp/src/lib/components/Footer.svelte
@@ -13,7 +13,7 @@
 	<span>-</span>
 	<a
 		class="underline"
-		href="https://github.com/mcndt/obsidian-note-sharing/issues/new?assignees=&labels=&template=bug_report.md&title=%5BBug%5D"
+		href="https://github.com/mcndt/noteshare.space/issues/new?assignees=&labels=&template=bug_report.md&title=%5BBug%5D"
 		>🐛 Report bug</a
 	>
 	<span>-</span>