diff --git a/CODEOWNERS b/CODEOWNERS
index 46e66291eeb..51a2c5c6db2 100644
--- a/CODEOWNERS
+++ b/CODEOWNERS
@@ -695,8 +695,8 @@ build.json @home-assistant/supervisor
 /tests/components/mikrotik/ @engrbm87
 /homeassistant/components/mill/ @danielhiversen
 /tests/components/mill/ @danielhiversen
-/homeassistant/components/min_max/ @fabaff
-/tests/components/min_max/ @fabaff
+/homeassistant/components/min_max/ @gjohansson-ST
+/tests/components/min_max/ @gjohansson-ST
 /homeassistant/components/minecraft_server/ @elmurato
 /tests/components/minecraft_server/ @elmurato
 /homeassistant/components/minio/ @tkislan
diff --git a/homeassistant/components/min_max/manifest.json b/homeassistant/components/min_max/manifest.json
index 7324d682caa..788e259d4ec 100644
--- a/homeassistant/components/min_max/manifest.json
+++ b/homeassistant/components/min_max/manifest.json
@@ -3,7 +3,7 @@
   "integration_type": "helper",
   "name": "Min/Max",
   "documentation": "https://www.home-assistant.io/integrations/min_max",
-  "codeowners": ["@fabaff"],
+  "codeowners": ["@gjohansson-ST"],
   "quality_scale": "internal",
   "iot_class": "calculated",
   "config_flow": true