diff --git a/CODEOWNERS b/CODEOWNERS
index 16dd4ff613..435789eec9 100644
--- a/CODEOWNERS
+++ b/CODEOWNERS
@@ -58,13 +58,19 @@ esphome/components/sensor/* @esphome/core
 esphome/components/shutdown/* @esphome/core
 esphome/components/sim800l/* @glmnet
 esphome/components/spi/* @esphome/core
+esphome/components/ssd1325_base/* @kbx81
+esphome/components/ssd1325_spi/* @kbx81
 esphome/components/ssd1331_base/* @kbx81
 esphome/components/ssd1331_spi/* @kbx81
+esphome/components/ssd1351_base/* @kbx81
+esphome/components/ssd1351_spi/* @kbx81
+esphome/components/st7789v/* @kbx81
 esphome/components/substitutions/* @esphome/core
 esphome/components/sun/* @OttoWinter
 esphome/components/switch/* @esphome/core
 esphome/components/tcl112/* @glmnet
 esphome/components/teleinfo/* @0hax
+esphome/components/thermostat/* @kbx81
 esphome/components/time/* @OttoWinter
 esphome/components/tm1637/* @glmnet
 esphome/components/tmp102/* @timsavage
diff --git a/esphome/components/ssd1325_base/__init__.py b/esphome/components/ssd1325_base/__init__.py
index 6cb0dafe54..e51f67e8b4 100644
--- a/esphome/components/ssd1325_base/__init__.py
+++ b/esphome/components/ssd1325_base/__init__.py
@@ -6,6 +6,8 @@ from esphome.const import CONF_BRIGHTNESS, CONF_EXTERNAL_VCC, CONF_LAMBDA, CONF_
                           CONF_RESET_PIN
 from esphome.core import coroutine
 
+CODEOWNERS = ['@kbx81']
+
 ssd1325_base_ns = cg.esphome_ns.namespace('ssd1325_base')
 SSD1325 = ssd1325_base_ns.class_('SSD1325', cg.PollingComponent, display.DisplayBuffer)
 SSD1325Model = ssd1325_base_ns.enum('SSD1325Model')
diff --git a/esphome/components/ssd1325_spi/display.py b/esphome/components/ssd1325_spi/display.py
index 2d8e91c3df..9471cf9c76 100644
--- a/esphome/components/ssd1325_spi/display.py
+++ b/esphome/components/ssd1325_spi/display.py
@@ -4,6 +4,8 @@ from esphome import pins
 from esphome.components import spi, ssd1325_base
 from esphome.const import CONF_DC_PIN, CONF_ID, CONF_LAMBDA, CONF_PAGES
 
+CODEOWNERS = ['@kbx81']
+
 AUTO_LOAD = ['ssd1325_base']
 DEPENDENCIES = ['spi']
 
diff --git a/esphome/components/ssd1351_base/__init__.py b/esphome/components/ssd1351_base/__init__.py
index 198f81668e..3bff245b82 100644
--- a/esphome/components/ssd1351_base/__init__.py
+++ b/esphome/components/ssd1351_base/__init__.py
@@ -5,6 +5,8 @@ from esphome.components import display
 from esphome.const import CONF_BRIGHTNESS, CONF_LAMBDA, CONF_MODEL, CONF_RESET_PIN
 from esphome.core import coroutine
 
+CODEOWNERS = ['@kbx81']
+
 ssd1351_base_ns = cg.esphome_ns.namespace('ssd1351_base')
 SSD1351 = ssd1351_base_ns.class_('SSD1351', cg.PollingComponent, display.DisplayBuffer)
 SSD1351Model = ssd1351_base_ns.enum('SSD1351Model')
diff --git a/esphome/components/ssd1351_spi/display.py b/esphome/components/ssd1351_spi/display.py
index 16b0d4387a..30b4c73085 100644
--- a/esphome/components/ssd1351_spi/display.py
+++ b/esphome/components/ssd1351_spi/display.py
@@ -4,6 +4,8 @@ from esphome import pins
 from esphome.components import spi, ssd1351_base
 from esphome.const import CONF_DC_PIN, CONF_ID, CONF_LAMBDA, CONF_PAGES
 
+CODEOWNERS = ['@kbx81']
+
 AUTO_LOAD = ['ssd1351_base']
 DEPENDENCIES = ['spi']
 
diff --git a/esphome/components/st7789v/display.py b/esphome/components/st7789v/display.py
index 36e5acaa72..5815ae599c 100644
--- a/esphome/components/st7789v/display.py
+++ b/esphome/components/st7789v/display.py
@@ -6,6 +6,8 @@ from esphome.const import CONF_BACKLIGHT_PIN, CONF_BRIGHTNESS, CONF_CS_PIN, CONF
                           CONF_LAMBDA, CONF_RESET_PIN
 from . import st7789v_ns
 
+CODEOWNERS = ['@kbx81']
+
 DEPENDENCIES = ['spi']
 
 ST7789V = st7789v_ns.class_('ST7789V', cg.PollingComponent, spi.SPIDevice,
diff --git a/esphome/components/thermostat/climate.py b/esphome/components/thermostat/climate.py
index c9cb81194c..bd8633ee1c 100644
--- a/esphome/components/thermostat/climate.py
+++ b/esphome/components/thermostat/climate.py
@@ -11,6 +11,8 @@ from esphome.const import CONF_AUTO_MODE, CONF_AWAY_CONFIG, CONF_COOL_ACTION, CO
     CONF_ID, CONF_IDLE_ACTION, CONF_OFF_MODE, CONF_SENSOR, CONF_SWING_BOTH_ACTION, \
     CONF_SWING_HORIZONTAL_ACTION, CONF_SWING_OFF_ACTION, CONF_SWING_VERTICAL_ACTION
 
+CODEOWNERS = ['@kbx81']
+
 thermostat_ns = cg.esphome_ns.namespace('thermostat')
 ThermostatClimate = thermostat_ns.class_('ThermostatClimate', climate.Climate, cg.Component)
 ThermostatClimateTargetTempConfig = thermostat_ns.struct('ThermostatClimateTargetTempConfig')