diff --git a/setup-scripts/KubernetesSecretsManager.py b/setup-scripts/KubernetesSecretsManager.py
index dde2592..a2d60ef 100644
--- a/setup-scripts/KubernetesSecretsManager.py
+++ b/setup-scripts/KubernetesSecretsManager.py
@@ -10,8 +10,17 @@ class KubernetesSecretsManager:
         self.api_instance = client.CoreV1Api()
         
         # Read namespace from standard K8s environment variable, default to 'default'
-        self.namespace = os.environ.get('POD_NAMESPACE', 'default')
+        #self.namespace = os.environ.get('POD_NAMESPACE', 'default')
+        self.namespace = self.get_current_namespace()
     
+    def get_current_namespace():
+        try:
+            with open("/var/run/secrets/kubernetes.io/serviceaccount/namespace", "r") as f:
+                return f.read().strip()
+        except Exception:
+            # Fallback for local testing
+            return "default"
+
     def publish_unseal_keys_credentials(self, secret_name: str, unseal_keys: list):
         """Publish the unseal keys as a Kubernetes Secret