diff --git a/.github/ISSUE_TEMPLATE/0-troubleshooting-redirect.yml b/.github/ISSUE_TEMPLATE/0-troubleshooting-redirect.yml
index f4a570d..f3115f6 100644
--- a/.github/ISSUE_TEMPLATE/0-troubleshooting-redirect.yml
+++ b/.github/ISSUE_TEMPLATE/0-troubleshooting-redirect.yml
@@ -2,7 +2,7 @@ name: Troubleshooting Help
 description: "If you need troubleshooting help please use the troubleshooting form from the Turtlebot4 repo: https://github.com/turtlebot/turtlebot4/issues/new/choose."
 labels: ["troubleshooting"]
 assignees:
-  - smatar22
+  - smatarCPR
   - RustyCPR
 body:
   - type: markdown
@@ -13,4 +13,4 @@ body:
     attributes:
       label: Understand?
       options:
-        - 'Yes'
\ No newline at end of file
+        - 'Yes'
diff --git a/.github/ISSUE_TEMPLATE/2-feature.yml b/.github/ISSUE_TEMPLATE/2-feature.yml
index 1bf7583..7116630 100644
--- a/.github/ISSUE_TEMPLATE/2-feature.yml
+++ b/.github/ISSUE_TEMPLATE/2-feature.yml
@@ -2,7 +2,7 @@ name: Feature request
 description: Use this form for requesting a feature that current doesn't exist.
 labels: ["enhancement"]
 assignees:
-  - smatar22
+  - smatarCPR
   - RustyCPR
 body:
   - type: textarea
@@ -20,4 +20,4 @@ body:
   - type: textarea
     attributes:
       label: Other notes
-      description: Add anything else you thing is important.
\ No newline at end of file
+      description: Add anything else you thing is important.