diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index bed6095f1eb..127240a8b00 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -91,7 +91,7 @@
 /openstack/lyra                                        @databus23 @ArtieReus
 /openstack/maia                                        @notque @richardtief @viennaa @Kuckkuck
 /openstack/manila*                                     @Carthaca @chuan137 @galkindmitrii @kpawar-sap @sumitarora2786 @crenduchinta88
-/openstack/nannies                                     @thgrs @chuan137 @Carthaca @fwiesel @kpawar-sap
+/openstack/nannies                                     @joker-at-work @Carthaca @fwiesel @kpawar-sap
 /openstack/neutron                                     @notandy @fwiesel @sebageek @sven-rosenzweig @rhalina @swagner-de @mutax @BenjaminLudwigSAP @m-kratochvil @occamshatchet
 /openstack/nova                                        @joker-at-work @fwiesel @grandchild @leust
 /openstack/octavia                                     @notandy @BenjaminLudwigSAP @fwiesel @dusandordevicsap @velp @m-kratochvil