diff --git a/README.md b/README.md
index 5d0910f4f..bf185be17 100644
--- a/README.md
+++ b/README.md
@@ -354,7 +354,7 @@ services:
 
 Found an issue?
 
-[![Open Issue](https://img.shields.io/badge/Report-ff6b6b?style=for-the-badge)](https://github.com/booklore-app/booklore/issues)
+[![Open Issue](https://img.shields.io/badge/Report-ff6b6b?style=for-the-badge)](https://github.com/booklore-app/booklore/issues/new?template=bug_report.yml)
 
 </td>
 <td align="center">
@@ -363,7 +363,7 @@ Found an issue?
 
 Have an idea?
 
-[![Request Feature](https://img.shields.io/badge/Suggest-4ecdc4?style=for-the-badge)](https://github.com/booklore-app/booklore/issues/new?template=feature_request.md)
+[![Request Feature](https://img.shields.io/badge/Suggest-4ecdc4?style=for-the-badge)](https://github.com/booklore-app/booklore/issues/new?template=feature_request.yml)
 
 </td>
 <td align="center">
diff --git a/docs/OIDC-Setup-With-PocketID.md b/docs/OIDC-Setup-With-PocketID.md
index 9bf58f16d..154c9c40c 100644
--- a/docs/OIDC-Setup-With-PocketID.md
+++ b/docs/OIDC-Setup-With-PocketID.md
@@ -53,4 +53,4 @@ To enable OIDC authentication in BookLore, you need to set the following within
 
 ### Step 4: Test the Integration
 
-Once configured, simply click Save Settings and then click the Enabled radio button to activate it. Simply log out and log back in and you should be working with no issues! Any issues please raise an issue on the [Github](https://github.com/booklore-app/booklore/issues/new)
+Once configured, simply click Save Settings and then click the Enabled radio button to activate it. Simply log out and log back in and you should be working with no issues! Any issues please raise an issue on the [Github](https://github.com/booklore-app/booklore/issues/new?template=bug_report.yml)