diff --git a/CODEOWNERS b/CODEOWNERS
index 4e7b0a0cd2a..418eb745ecb 100644
--- a/CODEOWNERS
+++ b/CODEOWNERS
@@ -49,7 +49,7 @@ homeassistant/components/broadlink/* @danielhiversen
 homeassistant/components/brunt/* @eavanvalkenburg
 homeassistant/components/bt_smarthub/* @jxwolstenholme
 homeassistant/components/buienradar/* @mjj4791 @ties
-homeassistant/components/cert_expiry/* @cereal2nd
+homeassistant/components/cert_expiry/* @Cereal2nd @jjlawren
 homeassistant/components/cisco_ios/* @fbradyirl
 homeassistant/components/cisco_mobility_express/* @fbradyirl
 homeassistant/components/cisco_webex_teams/* @fbradyirl
diff --git a/homeassistant/components/cert_expiry/__init__.py b/homeassistant/components/cert_expiry/__init__.py
index 7c7efea7333..f5078219809 100644
--- a/homeassistant/components/cert_expiry/__init__.py
+++ b/homeassistant/components/cert_expiry/__init__.py
@@ -15,3 +15,11 @@ async def async_setup_entry(hass: HomeAssistantType, entry: ConfigEntry):
         hass.config_entries.async_forward_entry_setup(entry, "sensor")
     )
     return True
+
+
+async def async_unload_entry(hass, entry):
+    """Unload a config entry."""
+    hass.async_create_task(
+        hass.config_entries.async_forward_entry_unload(entry, "sensor")
+    )
+    return True
diff --git a/homeassistant/components/cert_expiry/manifest.json b/homeassistant/components/cert_expiry/manifest.json
index 97f72f2ad11..48816809bbd 100644
--- a/homeassistant/components/cert_expiry/manifest.json
+++ b/homeassistant/components/cert_expiry/manifest.json
@@ -5,5 +5,8 @@
     "requirements": [],
     "config_flow": true,
     "dependencies": [],
-    "codeowners": ["@cereal2nd"]
+    "codeowners": [
+        "@Cereal2nd",
+        "@jjlawren"
+    ]
 }