diff --git a/pylintrc b/pylintrc
index 929471725..c4f4c16b9 100644
--- a/pylintrc
+++ b/pylintrc
@@ -38,7 +38,7 @@ disable=
   consider-using-with
 
 [EXCEPTIONS]
-overgeneral-exceptions=Exception
+overgeneral-exceptions=builtins.Exception
 
 
 [TYPECHECK]
diff --git a/requirements_tests.txt b/requirements_tests.txt
index b94d69102..007687a0a 100644
--- a/requirements_tests.txt
+++ b/requirements_tests.txt
@@ -5,7 +5,7 @@ flake8-docstrings==1.7.0
 flake8==6.0.0
 pre-commit==3.2.1
 pydocstyle==6.3.0
-pylint==2.15.10
+pylint==2.17.1
 pytest-aiohttp==1.0.4
 pytest-asyncio==0.18.3
 pytest-cov==4.0.0
diff --git a/supervisor/addons/__init__.py b/supervisor/addons/__init__.py
index e0baa026b..ac12591b0 100644
--- a/supervisor/addons/__init__.py
+++ b/supervisor/addons/__init__.py
@@ -178,8 +178,8 @@ class AddonManager(CoreSysAttributes):
         except DockerError as err:
             self.data.uninstall(addon)
             raise AddonsError() from err
-        else:
-            self.local[slug] = addon
+
+        self.local[slug] = addon
 
         # Reload ingress tokens
         if addon.with_ingress:
@@ -198,8 +198,8 @@ class AddonManager(CoreSysAttributes):
             await addon.instance.remove()
         except DockerError as err:
             raise AddonsError() from err
-        else:
-            addon.state = AddonState.UNKNOWN
+
+        addon.state = AddonState.UNKNOWN
 
         await addon.unload()
 
@@ -328,9 +328,9 @@ class AddonManager(CoreSysAttributes):
             await addon.instance.install(addon.version)
         except DockerError as err:
             raise AddonsError() from err
-        else:
-            self.data.update(store)
-            _LOGGER.info("Add-on '%s' successfully rebuilt", slug)
+
+        self.data.update(store)
+        _LOGGER.info("Add-on '%s' successfully rebuilt", slug)
 
         # restore state
         if last_state == AddonState.STARTED:
diff --git a/supervisor/docker/interface.py b/supervisor/docker/interface.py
index b75edd11f..17e619487 100644
--- a/supervisor/docker/interface.py
+++ b/supervisor/docker/interface.py
@@ -274,8 +274,8 @@ class DockerInterface(CoreSysAttributes):
                 f"Error happened on Content-Trust check for {image}:{version!s}: {err!s}",
                 _LOGGER.error,
             ) from err
-        else:
-            self._meta = docker_image.attrs
+
+        self._meta = docker_image.attrs
 
     def exists(self) -> Awaitable[bool]:
         """Return True if Docker image exists in local repository."""
@@ -694,8 +694,8 @@ class DockerInterface(CoreSysAttributes):
             raise DockerRequestError(
                 f"Communication issues with dockerd on Host: {err}", _LOGGER.warning
             ) from err
-        else:
-            _LOGGER.info("Found %s versions: %s", self.image, available_version)
+
+        _LOGGER.info("Found %s versions: %s", self.image, available_version)
 
         # Sort version and return latest version
         available_version.sort(reverse=True)
diff --git a/supervisor/homeassistant/core.py b/supervisor/homeassistant/core.py
index 2905820cb..3d71f3a04 100644
--- a/supervisor/homeassistant/core.py
+++ b/supervisor/homeassistant/core.py
@@ -226,9 +226,9 @@ class HomeAssistantCore(CoreSysAttributes):
                 raise HomeAssistantUpdateError(
                     "Updating Home Assistant image failed", _LOGGER.warning
                 ) from err
-            else:
-                self.sys_homeassistant.version = self.instance.version
-                self.sys_homeassistant.image = self.sys_updater.image_homeassistant
+
+            self.sys_homeassistant.version = self.instance.version
+            self.sys_homeassistant.image = self.sys_updater.image_homeassistant
 
             if running:
                 await self._start()
diff --git a/supervisor/host/network.py b/supervisor/host/network.py
index f2ca39dcb..09b91c535 100644
--- a/supervisor/host/network.py
+++ b/supervisor/host/network.py
@@ -300,8 +300,8 @@ class NetworkManager(CoreSysAttributes):
         except DBusError as err:
             _LOGGER.warning("Can't request a new scan: %s", err)
             raise HostNetworkError() from err
-        else:
-            await asyncio.sleep(5)
+
+        await asyncio.sleep(5)
 
         # Process AP
         return [
diff --git a/supervisor/plugins/audio.py b/supervisor/plugins/audio.py
index 98170a62d..5e4760657 100644
--- a/supervisor/plugins/audio.py
+++ b/supervisor/plugins/audio.py
@@ -134,10 +134,10 @@ class PluginAudio(PluginBase):
             await self.instance.update(version, image=self.sys_updater.image_audio)
         except DockerError as err:
             raise AudioUpdateError("Audio update failed", _LOGGER.error) from err
-        else:
-            self.version = version
-            self.image = self.sys_updater.image_audio
-            self.save_data()
+
+        self.version = version
+        self.image = self.sys_updater.image_audio
+        self.save_data()
 
         # Cleanup
         with suppress(DockerError):
diff --git a/supervisor/plugins/cli.py b/supervisor/plugins/cli.py
index b4baec56c..73ef84e05 100644
--- a/supervisor/plugins/cli.py
+++ b/supervisor/plugins/cli.py
@@ -91,10 +91,10 @@ class PluginCli(PluginBase):
             await self.instance.update(version, image=self.sys_updater.image_cli)
         except DockerError as err:
             raise CliUpdateError("CLI update failed", _LOGGER.error) from err
-        else:
-            self.version = version
-            self.image = self.sys_updater.image_cli
-            self.save_data()
+
+        self.version = version
+        self.image = self.sys_updater.image_cli
+        self.save_data()
 
         # Cleanup
         with suppress(DockerError):
diff --git a/supervisor/plugins/dns.py b/supervisor/plugins/dns.py
index e6c13e87d..85f2f4f7a 100644
--- a/supervisor/plugins/dns.py
+++ b/supervisor/plugins/dns.py
@@ -204,10 +204,10 @@ class PluginDns(PluginBase):
             await self.instance.update(version, image=self.sys_updater.image_dns)
         except DockerError as err:
             raise CoreDNSUpdateError("CoreDNS update failed", _LOGGER.error) from err
-        else:
-            self.version = version
-            self.image = self.sys_updater.image_dns
-            self.save_data()
+
+        self.version = version
+        self.image = self.sys_updater.image_dns
+        self.save_data()
 
         # Cleanup
         with suppress(DockerError):
diff --git a/supervisor/plugins/multicast.py b/supervisor/plugins/multicast.py
index 68ba79958..28523fa0a 100644
--- a/supervisor/plugins/multicast.py
+++ b/supervisor/plugins/multicast.py
@@ -90,10 +90,10 @@ class PluginMulticast(PluginBase):
             raise MulticastUpdateError(
                 "Multicast update failed", _LOGGER.error
             ) from err
-        else:
-            self.version = version
-            self.image = self.sys_updater.image_multicast
-            self.save_data()
+
+        self.version = version
+        self.image = self.sys_updater.image_multicast
+        self.save_data()
 
         # Cleanup
         with suppress(DockerError):
diff --git a/supervisor/plugins/observer.py b/supervisor/plugins/observer.py
index e1e1be065..0981eca7d 100644
--- a/supervisor/plugins/observer.py
+++ b/supervisor/plugins/observer.py
@@ -96,10 +96,10 @@ class PluginObserver(PluginBase):
         except DockerError as err:
             _LOGGER.error("HA observer update failed")
             raise ObserverUpdateError() from err
-        else:
-            self.version = version
-            self.image = self.sys_updater.image_observer
-            self.save_data()
+
+        self.version = version
+        self.image = self.sys_updater.image_observer
+        self.save_data()
 
         # Cleanup
         with suppress(DockerError):
diff --git a/supervisor/supervisor.py b/supervisor/supervisor.py
index 974d7a42a..c8c13d127 100644
--- a/supervisor/supervisor.py
+++ b/supervisor/supervisor.py
@@ -204,10 +204,10 @@ class Supervisor(CoreSysAttributes):
             raise SupervisorUpdateError(
                 f"Update of Supervisor failed: {err!s}", _LOGGER.error
             ) from err
-        else:
-            self.sys_config.version = version
-            self.sys_config.image = self.sys_updater.image_supervisor
-            self.sys_config.save_data()
+
+        self.sys_config.version = version
+        self.sys_config.image = self.sys_updater.image_supervisor
+        self.sys_config.save_data()
 
         self.sys_create_task(self.sys_core.stop())