diff --git a/keepercommander/commands/discover/job_start.py b/keepercommander/commands/discover/job_start.py
index 3549e3801..18105b139 100644
--- a/keepercommander/commands/discover/job_start.py
+++ b/keepercommander/commands/discover/job_start.py
@@ -233,4 +233,4 @@ def execute(self, params, **kwargs):
             print(f"To stop and remove the current job, use the command "
                   f"'{bcolors.OKGREEN}pam action discover remove -j <Job ID>'.")
         else:
-            print_router_response(router_response, conversation_id)
+            print_router_response(router_response, "job_info", conversation_id, gateway_uid=gateway_context.gateway_uid)
diff --git a/keepercommander/commands/discoveryrotation.py b/keepercommander/commands/discoveryrotation.py
index 89ce6d3c3..8d0fba5f4 100644
--- a/keepercommander/commands/discoveryrotation.py
+++ b/keepercommander/commands/discoveryrotation.py
@@ -1975,7 +1975,7 @@ def execute(self, params, **kwargs):
             message_type=pam_pb2.CMT_GENERAL,
             is_streaming=False
         )
-        print_router_response(router_response, conversation_id)
+        print_router_response(router_response, 'job_info', conversation_id)
 
 
 class PAMGatewayActionJobCommand(Command):
@@ -2006,7 +2006,7 @@ def execute(self, params, **kwargs):
             destination_gateway_uid_str=gateway_uid
         )
 
-        print_router_response(router_response, original_conversation_id=conversation_id, response_type='job_info')
+        print_router_response(router_response, 'job_info', original_conversation_id=conversation_id, gateway_uid=gateway_uid)
 
 
 class PAMGatewayActionRotateCommand(Command):
@@ -2156,7 +2156,7 @@ def execute(self, params, **kwargs):
             destination_gateway_uid_str=destination_gateway_uid_str
         )
 
-        print_router_response(router_response, response_type='gateway_info', is_verbose=is_verbose)
+        print_router_response(router_response, 'gateway_info', is_verbose=is_verbose, gateway_uid=destination_gateway_uid_str)
 
 
 class PAMGatewayActionDiscoverCommandBase(Command):
diff --git a/keepercommander/commands/discoveryrotation_v1.py b/keepercommander/commands/discoveryrotation_v1.py
index a28dd0665..e67cdf86a 100644
--- a/keepercommander/commands/discoveryrotation_v1.py
+++ b/keepercommander/commands/discoveryrotation_v1.py
@@ -1497,7 +1497,7 @@ def execute(self, params, **kwargs):
             message_type=pam_pb2.CMT_GENERAL,
             is_streaming=False
         )
-        print_router_response(router_response, conversation_id)
+        print_router_response(router_response, 'job_info', conversation_id)
 
 
 class PAMGatewayActionJobCommand(Command):
@@ -1529,7 +1529,7 @@ def execute(self, params, **kwargs):
             destination_gateway_uid_str=gateway_uid
         )
 
-        print_router_response(router_response, original_conversation_id=conversation_id, response_type='job_info')
+        print_router_response(router_response, 'job_info', original_conversation_id=conversation_id, gateway_uid=gateway_uid)
 
 
 class PAMGatewayActionRotateCommand(Command):
@@ -1629,7 +1629,7 @@ def execute(self, params, **kwargs):
                                                               gateway_destination=facade.controller_uid),
             message_type=pam_pb2.CMT_ROTATE, is_streaming=False)
 
-        print_router_response(router_response, conversation_id)
+        print_router_response(router_response, 'job_info', conversation_id, gateway_uid=facade.controller_uid)
 
 
 class PAMGatewayActionServerInfoCommand(Command):
@@ -1651,7 +1651,7 @@ def execute(self, params, **kwargs):
             destination_gateway_uid_str=destination_gateway_uid_str
         )
 
-        print_router_response(router_response, response_type='gateway_info', is_verbose=is_verbose)
+        print_router_response(router_response, 'gateway_info', is_verbose=is_verbose, gateway_uid=destination_gateway_uid_str)
 
 
 class PAMGatewayRemoveCommand(Command):