diff --git a/worker/orca-agent/requirements.txt b/worker/orca-agent/requirements.txt
index 132c25c..7448156 100644
--- a/worker/orca-agent/requirements.txt
+++ b/worker/orca-agent/requirements.txt
@@ -17,4 +17,4 @@ sqlmodel>=0.0.22
 openai>=0.28.0
 colorama>=0.4.67
 prometheus-swarm>=0.1.7
-prometheus-test>=0.1.4
+prometheus-test>=0.1.5
diff --git a/worker/orca-agent/tests/stages/worker_audit.py b/worker/orca-agent/tests/stages/worker_audit.py
index 8667879..36c142b 100644
--- a/worker/orca-agent/tests/stages/worker_audit.py
+++ b/worker/orca-agent/tests/stages/worker_audit.py
@@ -23,8 +23,8 @@ def prepare(runner, worker, target_name):
     #     "taskId": runner.get("task_id"),
     #     "roundNumber": runner.get("current_round"),
     #     "prUrl": pr_url,
-    #     "stakingKey": worker.staking_public_key,
-    #     "pubKey": worker.public_key,
+    #     "stakingKey": worker.get_key("staking_public"),
+    #     "pubKey": worker.get_key("main_public"),
     # }
 
     # Structure the payload according to what the server expects
@@ -47,13 +47,15 @@ def prepare(runner, worker, target_name):
     #     "prUrl": pr_url,
     #     "repoOwner": submission_data.get("repoOwner"),
     #     "repoName": submission_data.get("repoName"),
-    #     "githubUsername": worker.env.get("GITHUB_USERNAME"),
-    #     "stakingKey": worker.staking_public_key,
-    #     "pubKey": worker.public_key,
+    #     "githubUsername": worker.get_env("GITHUB_USERNAME"),
+    #     "stakingKey": worker.get_key("staking_public"),
+    #     "pubKey": worker.get_key("main_public"),
     #     "stakingSignature": create_signature(
-    #         worker.staking_signing_key, auditor_payload
+    #         worker.get_key("staking_signing"), auditor_payload
+    #     ),
+    #     "publicSignature": create_signature(
+    #         worker.get_key("main_signing"), auditor_payload
     #     ),
-    #     "publicSignature": create_signature(worker.public_signing_key, auditor_payload),
     # }
     return {"submission": submission_data}
 
diff --git a/worker/orca-agent/tests/stages/worker_check.py b/worker/orca-agent/tests/stages/worker_check.py
index fb52307..5a397f1 100644
--- a/worker/orca-agent/tests/stages/worker_check.py
+++ b/worker/orca-agent/tests/stages/worker_check.py
@@ -11,9 +11,9 @@ def prepare(runner, worker):
         return None
 
     return {
-        "stakingKey": worker.staking_public_key,
+        "stakingKey": worker.get_key("staking_public"),
         "roundNumber": runner.get("current_round"),
-        "githubUsername": worker.env.get("GITHUB_USERNAME"),
+        "githubUsername": worker.get_env("GITHUB_USERNAME"),
         "prUrl": pr_url,
     }
 
diff --git a/worker/orca-agent/tests/stages/worker_fetch.py b/worker/orca-agent/tests/stages/worker_fetch.py
index 69548ad..9062a2c 100644
--- a/worker/orca-agent/tests/stages/worker_fetch.py
+++ b/worker/orca-agent/tests/stages/worker_fetch.py
@@ -11,18 +11,20 @@ def prepare(runner, worker):
         "taskId": runner.get("task_id"),
         "roundNumber": runner.get("current_round"),
         "action": "fetch-todo",
-        "githubUsername": worker.env.get("GITHUB_USERNAME"),
-        "stakingKey": worker.staking_public_key,
-        "pubKey": worker.public_key,
+        "githubUsername": worker.get_env("GITHUB_USERNAME"),
+        "stakingKey": worker.get_key("staking_public"),
+        "pubKey": worker.get_key("main_public"),
     }
 
     return {
         "taskId": runner.get("task_id"),
         "roundNumber": runner.get("current_round"),
-        "stakingKey": worker.staking_public_key,
-        "pubKey": worker.public_key,
-        "stakingSignature": create_signature(worker.staking_signing_key, payload),
-        "publicSignature": create_signature(worker.public_signing_key, payload),
+        "stakingKey": worker.get_key("staking_public"),
+        "pubKey": worker.get_key("main_public"),
+        "stakingSignature": create_signature(
+            worker.get_key("staking_signing"), payload
+        ),
+        "publicSignature": create_signature(worker.get_key("main_signing"), payload),
     }
 
 
diff --git a/worker/orca-agent/tests/stages/worker_pr.py b/worker/orca-agent/tests/stages/worker_pr.py
index eee8010..fce59ff 100644
--- a/worker/orca-agent/tests/stages/worker_pr.py
+++ b/worker/orca-agent/tests/stages/worker_pr.py
@@ -13,12 +13,12 @@ def prepare(runner, worker):
         "action": "add-todo-pr",
         "roundNumber": runner.get("current_round"),
         "prUrl": pr_url,
-        "stakingKey": worker.staking_public_key,
-        "pubKey": worker.public_key,
+        "stakingKey": worker.get_key("staking_public"),
+        "pubKey": worker.get_key("main_public"),
     }
     return {
-        "signature": create_signature(worker.staking_signing_key, payload),
-        "stakingKey": worker.staking_public_key,
+        "signature": create_signature(worker.get_key("staking_signing"), payload),
+        "stakingKey": worker.get_key("staking_public"),
     }
 
 
diff --git a/worker/orca-agent/tests/stages/worker_submission.py b/worker/orca-agent/tests/stages/worker_submission.py
index 7ffcbd0..caacd71 100644
--- a/worker/orca-agent/tests/stages/worker_submission.py
+++ b/worker/orca-agent/tests/stages/worker_submission.py
@@ -21,17 +21,19 @@ def prepare(runner, worker):
     submitter_payload = {
         "taskId": runner.get("task_id"),
         "roundNumber": runner.get("current_round"),
-        "stakingKey": worker.staking_public_key,
-        "pubKey": worker.public_key,
+        "stakingKey": worker.get_key("staking_public"),
+        "pubKey": worker.get_key("main_public"),
         "action": "audit",
         **submission_data,
     }
 
     return {
         **submission_data,
-        "signature": create_signature(worker.staking_signing_key, submitter_payload),
-        "stakingKey": worker.staking_public_key,
-        "pubKey": worker.public_key,
+        "signature": create_signature(
+            worker.get_key("staking_signing"), submitter_payload
+        ),
+        "stakingKey": worker.get_key("staking_public"),
+        "pubKey": worker.get_key("main_public"),
     }