diff --git a/apps/coordinator-api/src/app/routers/confidential.py b/apps/coordinator-api/src/app/routers/confidential.py
index b32cdaeb..d032e309 100755
--- a/apps/coordinator-api/src/app/routers/confidential.py
+++ b/apps/coordinator-api/src/app/routers/confidential.py
@@ -42,8 +42,9 @@ def get_encryption_service() -> EncryptionService:
     if encryption_service is None:
         # Initialize with key manager
         from ..services.key_management import FileKeyStorage
+        import tempfile
 
-        key_storage = FileKeyStorage("/tmp/aitbc_keys")
+        key_storage = FileKeyStorage(tempfile.gettempdir() + "/aitbc_keys")
         key_manager = KeyManager(key_storage)
         encryption_service = EncryptionService(key_manager)
     return encryption_service
@@ -54,8 +55,9 @@ def get_key_manager() -> KeyManager:
     global key_manager
     if key_manager is None:
         from ..services.key_management import FileKeyStorage
+        import tempfile
 
-        key_storage = FileKeyStorage("/tmp/aitbc_keys")
+        key_storage = FileKeyStorage(tempfile.gettempdir() + "/aitbc_keys")
         key_manager = KeyManager(key_storage)
     return key_manager
 
diff --git a/cli/miner_management.py b/cli/miner_management.py
index a1479354..5e2cc197 100644
--- a/cli/miner_management.py
+++ b/cli/miner_management.py
@@ -309,7 +309,8 @@ def submit_job_result(
         response = requests.post(
             f"{coordinator_url}/v1/miners/{job_id}/result",
             headers=headers,
-            json=payload
+            json=payload,
+            timeout=30
         )
         
         if response.status_code == 200:
@@ -384,7 +385,8 @@ def update_capabilities(
         response = requests.put(
             f"{coordinator_url}/v1/miners/{miner_id}/capabilities",
             headers=headers,
-            json=payload
+            json=payload,
+            timeout=30
         )
         
         if response.status_code == 200:
@@ -450,7 +452,8 @@ def list_marketplace_offers(
         response = requests.get(
             f"{coordinator_url}/v1/marketplace/miner-offers",
             headers=admin_headers,
-            params=params
+            params=params,
+            timeout=30
         )
         
         if response.status_code == 200:
@@ -503,7 +506,8 @@ def create_marketplace_offer(
         response = requests.post(
             f"{coordinator_url}/v1/marketplace/offers",
             headers=admin_headers,
-            json=payload
+            json=payload,
+            timeout=30
         )
         
         if response.status_code == 200: