diff --git a/server_addon/deadline/client/ayon_deadline/plugins/publish/collect_user_credentials.py b/server_addon/deadline/client/ayon_deadline/plugins/publish/collect_user_credentials.py
index 2b5762e3df..e45b0090a7 100644
--- a/server_addon/deadline/client/ayon_deadline/plugins/publish/collect_user_credentials.py
+++ b/server_addon/deadline/client/ayon_deadline/plugins/publish/collect_user_credentials.py
@@ -13,7 +13,6 @@ Provides:
 import pyblish.api
 
 from ayon_api import get_server_api_connection
-from ayon_deadline import __version__, DeadlineModule
 
 
 class CollectDeadlineUserCredentials(pyblish.api.InstancePlugin):
@@ -80,10 +79,13 @@ class CollectDeadlineUserCredentials(pyblish.api.InstancePlugin):
 
         if not deadline_info["require_authentication"]:
             return
-        # TODO import 'get_addon_site_settings' when available 
+
+        addons_manager = instance.context.data["ayonAddonsManager"]
+        deadline_addon = addons_manager["deadline"]
+        # TODO import 'get_addon_site_settings' when available
         #   in public 'ayon_api'
         local_settings = get_server_api_connection().get_addon_site_settings(
-            DeadlineModule.name, __version__)
+            deadline_addon.name, deadline_addon.version)
         local_settings = local_settings["local_settings"]
         for server_info in local_settings:
             if deadline_server_name == server_info["server_name"]:
diff --git a/server_addon/deadline/client/ayon_deadline/plugins/publish/validate_deadline_pools.py b/server_addon/deadline/client/ayon_deadline/plugins/publish/validate_deadline_pools.py
index e1cd99fea3..c7445465c4 100644
--- a/server_addon/deadline/client/ayon_deadline/plugins/publish/validate_deadline_pools.py
+++ b/server_addon/deadline/client/ayon_deadline/plugins/publish/validate_deadline_pools.py
@@ -4,7 +4,6 @@ from ayon_core.pipeline import (
     PublishXmlValidationError,
     OptionalPyblishPluginMixin
 )
-from ayon_deadline import DeadlineModule
 
 
 class ValidateDeadlinePools(OptionalPyblishPluginMixin,
@@ -38,8 +37,13 @@ class ValidateDeadlinePools(OptionalPyblishPluginMixin,
             return
 
         deadline_url = instance.data["deadline"]["url"]
-        pools = self.get_pools(deadline_url,
-                               instance.data["deadline"].get("auth"))
+        addons_manager = instance.context.data["ayonAddonsManager"]
+        deadline_addon = addons_manager["deadline"]
+        pools = self.get_pools(
+            deadline_addon,
+            deadline_url,
+            instance.data["deadline"].get("auth")
+        )
 
         invalid_pools = {}
         primary_pool = instance.data.get("primaryPool")
@@ -62,15 +66,15 @@ class ValidateDeadlinePools(OptionalPyblishPluginMixin,
                 formatting_data={"pools_str": ", ".join(pools)}
             )
 
-    def get_pools(self, deadline_url, auth):
+    def get_pools(self, deadline_addon, deadline_url, auth):
         if deadline_url not in self.pools_per_url:
             self.log.debug(
                 "Querying available pools for Deadline url: {}".format(
                     deadline_url)
             )
-            pools = DeadlineModule.get_deadline_pools(deadline_url,
-                                                      auth=auth,
-                                                      log=self.log)
+            pools = deadline_addon.get_deadline_pools(
+                deadline_url, auth=auth, log=self.log
+            )
             # some DL return "none" as a pool name
             if "none" not in pools:
                 pools.append("none")