diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 677540746..62b5fc1b7 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -39,6 +39,7 @@ Jade-1-Blue/*                                      @madmaxms
 Jade-1/*                                           @madmaxms
 LM-Light-Panel/*                                   @smilesbright
 MGSE-Unity/*                                       @freemangilgamesh
+Material/*                                         @fredcw
 Metallic_Cyan/*                                    @karthikbhupathy13
 Mint-X-Dark/*                                      @Shatur95
 Mint-XP/*                                          @fmcgorenc
diff --git a/.github/ISSUE_TEMPLATE/01_bug_report.yml b/.github/ISSUE_TEMPLATE/01_bug_report.yml
index b405baddf..5288435e2 100644
--- a/.github/ISSUE_TEMPLATE/01_bug_report.yml
+++ b/.github/ISSUE_TEMPLATE/01_bug_report.yml
@@ -88,6 +88,7 @@ body:
     - Kiss-Kool-Viper
     - LM-Light-Panel @smilesbright
     - Loki
+    - Material @fredcw
     - Metallic_Cyan @karthikbhupathy13
     - MGSE-Unity @freemangilgamesh
     - Mint-X-Dark @Shatur95
diff --git a/.github/ISSUE_TEMPLATE/02_feature_request.yml b/.github/ISSUE_TEMPLATE/02_feature_request.yml
index d91761d23..518092e27 100644
--- a/.github/ISSUE_TEMPLATE/02_feature_request.yml
+++ b/.github/ISSUE_TEMPLATE/02_feature_request.yml
@@ -56,6 +56,7 @@ body:
     - Kiss-Kool-Viper
     - LM-Light-Panel @smilesbright
     - Loki
+    - Material @fredcw
     - Metallic_Cyan @karthikbhupathy13
     - MGSE-Unity @freemangilgamesh
     - Mint-X-Dark @Shatur95