diff --git a/moonraker/components/machine.py b/moonraker/components/machine.py
index b711f2f..945a111 100644
--- a/moonraker/components/machine.py
+++ b/moonraker/components/machine.py
@@ -1522,9 +1522,12 @@ class InstallValidator:
                 self._link_data_file(key_dest, ssl_key)
                 cfg_source.remove_option("server", "ssl_key_path")
 
-            # Remove deprecated debug option
+            # Remove deprecated debug options
             if server_cfg.has_option("enable_debug_logging"):
                 cfg_source.remove_option("server", "enable_debug_logging")
+            um_cfg = server_cfg["update_manager"]
+            if um_cfg.has_option("enable_repo_debug"):
+                cfg_source.remove_option("update_manager", "enable_repo_debug")
         except Exception:
             cfg_source.cancel()
             raise
diff --git a/moonraker/components/update_manager/update_manager.py b/moonraker/components/update_manager/update_manager.py
index a3223cc..e59ba85 100644
--- a/moonraker/components/update_manager/update_manager.py
+++ b/moonraker/components/update_manager/update_manager.py
@@ -464,8 +464,8 @@ class CommandHelper:
         self.server = config.get_server()
         self.http_client: HttpClient
         self.http_client = self.server.lookup_component("http_client")
-        self.debug_enabled = config.getboolean('enable_repo_debug', False)
-        if self.debug_enabled:
+        config.getboolean('enable_repo_debug', False, deprecate=True)
+        if self.server.is_debug_enabled():
             logging.warning("UPDATE MANAGER: REPO DEBUG ENABLED")
         shell_cmd: SCMDComp = self.server.lookup_component('shell_command')
         self.scmd_error = shell_cmd.error