diff --git a/.github/ISSUE_TEMPLATE/bug.md b/.github/ISSUE_TEMPLATE/bug.md
index e976eb97..62a4ec68 100644
--- a/.github/ISSUE_TEMPLATE/bug.md
+++ b/.github/ISSUE_TEMPLATE/bug.md
@@ -1,8 +1,7 @@
 # Template for Bug Issue
 
-Please use this template if the issue that you are reporting is a (potential) bug in CV32E40P RTL, Documentation, Verification environment or Tool and Build system.
+Please use this template if the issue that you are reporting is a (potential) bug in CV32E41P RTL, Documentation, Verification environment or Tool and Build system.
 
-<br>**Note**: Please file bugs related to the CV32E40P User Manual in https://github.com/openhwgroup/core-v-docs instead.
 <br>**Note**: Please file bugs related to the core-v-verif verification environment in https://github.com/openhwgroup/core-v-verif instead.
 <br>**Note**: Please file bugs related to the PULP tool chain in https://github.com/pulp-platform/pulp-riscv-gnu-toolchain instead.
 
@@ -13,7 +12,7 @@ A clear and concise description of what the bug is.
 Indicate the component in which you found a problem (and we will add the appropriate label):
 
 **Component:RTL**: For issues in the RTL (e.g. for files in the rtl directory)
-**Component:Doc **: For issues in the Documentation (e.g. for README.md files)
+**Component:Doc **: For issues in the Documentation (e.g. for README.md and files in the doc directory)
 **Component:Verif**: For issues in the verification environment or test cases (e.g. for behavioral code, testbench, C code, etc.)
 **Component:Tool-and-build**: For issues in the tool and build flow (e.g. Makefile, FuseSoc, etc.)
 
diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml
index 669fae31..9033ae84 100644
--- a/.github/ISSUE_TEMPLATE/config.yml
+++ b/.github/ISSUE_TEMPLATE/config.yml
@@ -1,18 +1,18 @@
 blank_issues_enabled: false
 contact_links:
   - name: Bug
-    url: https://github.com/openhwgroup/cv32e40p/issues/new?template=bug.md
+    url: https://github.com/openhwgroup/cv32e41p/issues/new?template=bug.md
     about: For bugs in the RTL, Documentation, Verification environment or Tool and Build system.
     labels: "Type:Bug"
   - name: Task
-    url: https://github.com/openhwgroup/cv32e40p/issues/new?template=task.md
+    url: https://github.com/openhwgroup/cv32e41p/issues/new?template=task.md
     about: For any task except bug fixes.
     labels: "Type:Task"
   - name: Question
-    url: https://github.com/openhwgroup/cv32e40p/issues/new?template=question.md
+    url: https://github.com/openhwgroup/cv32e41p/issues/new?template=question.md
     about: For general questions.
     labels: "Type:Question"
   - name: Enhancement
-    url: https://github.com/openhwgroup/cv32e40p/issues/new?template=enhancement.md
+    url: https://github.com/openhwgroup/cv32e41p/issues/new?template=enhancement.md
     about: For feature requests and enhancements.
     labels: "Type:Enhancement"