diff --git a/.github/actions/pick_assignee/action.yml b/.github/actions/pick_assignee/action.yml
index 5f45ba036f..ab8eeacee3 100644
--- a/.github/actions/pick_assignee/action.yml
+++ b/.github/actions/pick_assignee/action.yml
@@ -19,6 +19,7 @@ runs:
           "3u13r"
           "daniel-weisse"
           "derpsteb"
+          "msanft"
         )
         assignee=${possibleAssignees[$RANDOM % ${#possibleAssignees[@]}]}
         echo "assignee=$assignee" | tee -a "$GITHUB_OUTPUT"
diff --git a/.github/teams_payload_template.json b/.github/teams_payload_template.json
index 5f9c36b241..02fab5b10b 100644
--- a/.github/teams_payload_template.json
+++ b/.github/teams_payload_template.json
@@ -19,6 +19,14 @@
                                 "name": "Adrian Stobbe"
                             }
                         },
+                        {
+                            "type": "mention",
+                            "text": "<at>msanft</at>",
+                            "mentioned": {
+                                "id": "1359ea62-4415-423e-b808-9d9acb96def0",
+                                "name": "Moritz Sanft"
+                            }
+                        },
                         {
                             "type": "mention",
                             "text": "<at>3u13r</at>",