diff --git a/CODEOWNERS b/CODEOWNERS
index cb3d0817d59..879a1c8f55d 100644
--- a/CODEOWNERS
+++ b/CODEOWNERS
@@ -177,6 +177,7 @@ homeassistant/components/logi_circle/* @evanjd
 homeassistant/components/lovelace/* @home-assistant/frontend
 homeassistant/components/luci/* @fbradyirl @mzdrale
 homeassistant/components/luftdaten/* @fabaff
+homeassistant/components/lutron/* @JonGilmore
 homeassistant/components/mastodon/* @fabaff
 homeassistant/components/matrix/* @tinloaf
 homeassistant/components/mcp23017/* @jardiamj
diff --git a/homeassistant/components/lutron/manifest.json b/homeassistant/components/lutron/manifest.json
index cace2770de0..f8439e3c1ec 100644
--- a/homeassistant/components/lutron/manifest.json
+++ b/homeassistant/components/lutron/manifest.json
@@ -6,5 +6,7 @@
     "pylutron==0.2.5"
   ],
   "dependencies": [],
-  "codeowners": []
+  "codeowners": [
+    "@JonGilmore"
+  ]
 }