diff --git a/src/api-service/__app__/agent_commands/__init__.py b/src/api-service/__app__/agent_commands/__init__.py
index f6f26fcad..e4ad63650 100644
--- a/src/api-service/__app__/agent_commands/__init__.py
+++ b/src/api-service/__app__/agent_commands/__init__.py
@@ -10,11 +10,11 @@ from onefuzztypes.responses import BoolResult, PendingNodeCommand
 
 from ..onefuzzlib.agent_authorization import verify_token
 from ..onefuzzlib.pools import NodeMessage
-from ..onefuzzlib.request import not_ok, ok, parse_uri
+from ..onefuzzlib.request import not_ok, ok, parse_request
 
 
 def get(req: func.HttpRequest) -> func.HttpResponse:
-    request = parse_uri(NodeCommandGet, req)
+    request = parse_request(NodeCommandGet, req)
     if isinstance(request, Error):
         return not_ok(request, context="NodeCommandGet")
 
@@ -31,7 +31,7 @@ def get(req: func.HttpRequest) -> func.HttpResponse:
 
 
 def delete(req: func.HttpRequest) -> func.HttpResponse:
-    request = parse_uri(NodeCommandDelete, req)
+    request = parse_request(NodeCommandDelete, req)
     if isinstance(request, Error):
         return not_ok(request, context="NodeCommandDelete")
 
diff --git a/src/api-service/__app__/agent_registration/__init__.py b/src/api-service/__app__/agent_registration/__init__.py
index 6816df5f2..41d13ccde 100644
--- a/src/api-service/__app__/agent_registration/__init__.py
+++ b/src/api-service/__app__/agent_registration/__init__.py
@@ -20,8 +20,8 @@ from ..onefuzzlib.request import not_ok, ok, parse_uri
 
 def create_registration_response(machine_id: UUID, pool: Pool) -> func.HttpResponse:
     base_address = "https://%s.azurewebsites.net" % get_instance_name()
-    events_url = "%s/api/agents/events?machine_id=%s" % (base_address, machine_id)
-    commands_url = "%s/api/agents/commands?machine_id=%s" % (base_address, machine_id)
+    events_url = "%s/api/agents/events" % base_address
+    commands_url = "%s/api/agents/commands" % base_address
     work_queue = get_queue_sas(
         pool.get_pool_queue(),
         account_id=get_fuzz_storage(),