diff --git a/CODEOWNERS b/CODEOWNERS
index 74c8a196a29..ad30ebc2194 100644
--- a/CODEOWNERS
+++ b/CODEOWNERS
@@ -962,7 +962,7 @@ homeassistant/components/trace/* @home-assistant/core
 tests/components/trace/* @home-assistant/core
 homeassistant/components/tractive/* @Danielhiversen @zhulik @bieniu
 tests/components/tractive/* @Danielhiversen @zhulik @bieniu
-homeassistant/components/trafikverket_train/* @endor-force
+homeassistant/components/trafikverket_train/* @endor-force @gjohansson-ST
 homeassistant/components/trafikverket_weatherstation/* @endor-force @gjohansson-ST
 tests/components/trafikverket_weatherstation/* @endor-force @gjohansson-ST
 homeassistant/components/transmission/* @engrbm87 @JPHutchins
diff --git a/homeassistant/components/trafikverket_train/manifest.json b/homeassistant/components/trafikverket_train/manifest.json
index b640d2e59e1..36a1d47623e 100644
--- a/homeassistant/components/trafikverket_train/manifest.json
+++ b/homeassistant/components/trafikverket_train/manifest.json
@@ -3,6 +3,6 @@
   "name": "Trafikverket Train",
   "documentation": "https://www.home-assistant.io/integrations/trafikverket_train",
   "requirements": ["pytrafikverket==0.1.6.2"],
-  "codeowners": ["@endor-force"],
+  "codeowners": ["@endor-force", "@gjohansson-ST"],
   "iot_class": "cloud_polling"
 }