diff --git a/src/backend/services/auth/strategies/base.py b/src/backend/services/auth/strategies/base.py
index e305545824..38112519a2 100644
--- a/src/backend/services/auth/strategies/base.py
+++ b/src/backend/services/auth/strategies/base.py
@@ -43,14 +43,13 @@ class BaseOAuthStrategy:
     def __init__(self, *args, **kwargs):
         self._post_init_check()
 
-    @classmethod
-    def _post_init_check(cls):
+    def _post_init_check(self):
         if any(
             [
-                cls.NAME is None,
+                self.NAME is None,
             ]
         ):
-            raise ValueError(f"{cls.__name__} must have NAME attribute defined.")
+            raise ValueError(f"{self.__name__} must have NAME attribute defined.")
 
     @abstractmethod
     def get_client_id(self, **kwargs: Any):
diff --git a/src/backend/tools/base.py b/src/backend/tools/base.py
index 203a9328dd..af5456b217 100644
--- a/src/backend/tools/base.py
+++ b/src/backend/tools/base.py
@@ -26,10 +26,9 @@ class BaseTool():
     def __init__(self, *args, **kwargs):
         self._post_init_check()
 
-    @classmethod
-    def _post_init_check(cls):
-        if cls.ID is None:
-            raise ValueError(f"{cls.__name__} must have ID attribute defined.")
+    def _post_init_check(self):
+        if self.ID is None:
+            raise ValueError(f"{self.__name__} must have ID attribute defined.")
 
     @classmethod
     @abstractmethod
@@ -68,13 +67,12 @@ def __init__(self, *args, **kwargs):
 
         self._post_init_check()
 
-    @classmethod
-    def _post_init_check(cls):
+    def _post_init_check(self):
         if any(
             [
-                cls.BACKEND_HOST is None,
-                cls.FRONTEND_HOST is None,
-                cls.AUTH_SECRET_KEY is None,
+                self.BACKEND_HOST is None,
+                self.FRONTEND_HOST is None,
+                self.AUTH_SECRET_KEY is None,
             ]
         ):
             raise ValueError(