diff --git a/keepercommander/commands/credential_provision.py b/keepercommander/commands/credential_provision.py
index d19711948..93af9cbb9 100644
--- a/keepercommander/commands/credential_provision.py
+++ b/keepercommander/commands/credential_provision.py
@@ -1773,7 +1773,7 @@ def _create_dag_link(
             pam_config_record = vault.KeeperRecord.load(params, pam_config_uid)
 
             # Create RecordLink instance
-            record_link = RecordLink(record=pam_config_record, params=params, fail_on_corrupt=False, use_per_graph_endpoints=True)
+            record_link = RecordLink(record=pam_config_record, params=params, fail_on_corrupt=False, use_per_graph_endpoints=False)
 
             # Create belongs_to relationship: PAM User belongs_to PAM Configuration
             record_link.belongs_to(
diff --git a/keepercommander/commands/discover/job_remove.py b/keepercommander/commands/discover/job_remove.py
index 9a15a1755..58ced88e7 100644
--- a/keepercommander/commands/discover/job_remove.py
+++ b/keepercommander/commands/discover/job_remove.py
@@ -39,7 +39,7 @@ def execute(self, params, **kwargs):
         all_gateways = GatewayContext.all_gateways(params)
 
         def _find_job(configuration_record) -> Optional[Dict]:
-            jobs_obj = Jobs(record=configuration_record, params=params, use_per_graph_endpoints=True)
+            jobs_obj = Jobs(record=configuration_record, params=params, use_per_graph_endpoints=False)
             job_item = jobs_obj.get_job(job_id)
             if job_item is not None:
                 return {
diff --git a/keepercommander/commands/discover/job_start.py b/keepercommander/commands/discover/job_start.py
index 4c80016e8..f3e3bc234 100644
--- a/keepercommander/commands/discover/job_start.py
+++ b/keepercommander/commands/discover/job_start.py
@@ -112,7 +112,7 @@ def execute(self, params, **kwargs):
             multi_conf_msg(gateway, err)
             return
 
-        jobs = Jobs(record=gateway_context.configuration, params=params, use_per_graph_endpoints=True)
+        jobs = Jobs(record=gateway_context.configuration, params=params, use_per_graph_endpoints=False)
         current_job_item = jobs.current_job
         removed_prior_job = None
         if current_job_item is not None:
diff --git a/keepercommander/commands/discover/job_status.py b/keepercommander/commands/discover/job_status.py
index f4e8c046d..378e6ae39 100644
--- a/keepercommander/commands/discover/job_status.py
+++ b/keepercommander/commands/discover/job_status.py
@@ -160,7 +160,7 @@ def print_job_detail(params: KeeperParams,
                          job_id: str):
 
         def _find_job(configuration_record) -> Optional[Dict]:
-            jobs_obj = Jobs(record=configuration_record, params=params, use_per_graph_endpoints=True)
+            jobs_obj = Jobs(record=configuration_record, params=params, use_per_graph_endpoints=False)
             job_item = jobs_obj.get_job(job_id)
             if job_item is not None:
                 return {
@@ -175,7 +175,7 @@ def _find_job(configuration_record) -> Optional[Dict]:
         if gateway_context is not None:
             jobs = payload["jobs"]
             job = jobs.get_job(job_id)  # type: JobItem
-            infra = Infrastructure(record=gateway_context.configuration, params=params, use_per_graph_endpoints=True)
+            infra = Infrastructure(record=gateway_context.configuration, params=params, use_per_graph_endpoints=False)
 
             color = bcolors.OKBLUE
             status = "RUNNING"
@@ -325,7 +325,7 @@ def execute(self, params, **kwargs):
                 if len(gateway_context.gateway_name) > max_gateway_name:
                     max_gateway_name = len(gateway_context.gateway_name)
 
-                jobs = Jobs(record=configuration_record, params=params, use_per_graph_endpoints=True)
+                jobs = Jobs(record=configuration_record, params=params, use_per_graph_endpoints=False)
                 if show_history is True:
                     job_list = reversed(jobs.history)
                 else:
diff --git a/keepercommander/commands/discover/result_process.py b/keepercommander/commands/discover/result_process.py
index 54dabd931..7ac4df28d 100644
--- a/keepercommander/commands/discover/result_process.py
+++ b/keepercommander/commands/discover/result_process.py
@@ -1334,7 +1334,7 @@ def _get_directory_info(domain: str,
     def remove_job(params: KeeperParams, configuration_record: KeeperRecord, job_id: str):
 
         try:
-            jobs = Jobs(record=configuration_record, params=params, use_per_graph_endpoints=True)
+            jobs = Jobs(record=configuration_record, params=params, use_per_graph_endpoints=False)
             jobs.cancel(job_id)
             print(f"{bcolors.OKGREEN}No items left to process. Removing completed discovery job.{bcolors.ENDC}")
         except Exception as err:
@@ -1353,7 +1353,7 @@ def preview(self, job_item: JobItem, params: KeeperParams, gateway_context: Gate
                                params=params,
                                logger=logging,
                                debug_level=debug_level,
-                               use_per_graph_endpoints=True)
+                               use_per_graph_endpoints=False)
         infra.load(sync_point)
 
         configuration = None
@@ -1512,7 +1512,7 @@ def execute(self, params: KeeperParams, **kwargs):
             # Get the current job.
             # There can only be one active job.
             # This will give us the sync point for the delta
-            jobs = Jobs(record=configuration_record, params=params, logger=logging, debug_level=debug_level, use_per_graph_endpoints=True)
+            jobs = Jobs(record=configuration_record, params=params, logger=logging, debug_level=debug_level, use_per_graph_endpoints=False)
             job_item = jobs.current_job
             if job_item is None:
                 continue
diff --git a/keepercommander/commands/discover/rule_add.py b/keepercommander/commands/discover/rule_add.py
index a472c3dd8..36137fd92 100644
--- a/keepercommander/commands/discover/rule_add.py
+++ b/keepercommander/commands/discover/rule_add.py
@@ -134,7 +134,7 @@ def execute(self, params, **kwargs):
                 return
 
             # If the rule passes its validation, then add control DAG
-            rules = Rules(record=gateway_context.configuration, params=params, use_per_graph_endpoints=True)
+            rules = Rules(record=gateway_context.configuration, params=params, use_per_graph_endpoints=False)
             new_rule = ActionRuleItem(
                 name=kwargs.get("name"),
                 action=kwargs.get("rule_action"),
diff --git a/keepercommander/commands/discover/rule_list.py b/keepercommander/commands/discover/rule_list.py
index 6f2f4145d..22207f4bf 100644
--- a/keepercommander/commands/discover/rule_list.py
+++ b/keepercommander/commands/discover/rule_list.py
@@ -101,7 +101,7 @@ def execute(self, params, **kwargs):
             multi_conf_msg(gateway, err)
             return
 
-        rules = Rules(record=gateway_context.configuration, params=params, use_per_graph_endpoints=True)
+        rules = Rules(record=gateway_context.configuration, params=params, use_per_graph_endpoints=False)
         rule_list = rules.rule_list(rule_type=RuleTypeEnum.ACTION,
                                     search=kwargs.get("search"))  # type: List[RuleItem]
         if len(rule_list) == 0:
diff --git a/keepercommander/commands/discover/rule_remove.py b/keepercommander/commands/discover/rule_remove.py
index ad081d3e4..164faa338 100644
--- a/keepercommander/commands/discover/rule_remove.py
+++ b/keepercommander/commands/discover/rule_remove.py
@@ -46,7 +46,7 @@ def execute(self, params, **kwargs):
             return
 
         try:
-            rules = Rules(record=gateway_context.configuration, params=params, use_per_graph_endpoints=True)
+            rules = Rules(record=gateway_context.configuration, params=params, use_per_graph_endpoints=False)
             if remove_all:
                 rules.remove_all(RuleTypeEnum.ACTION)
                 print(f"{bcolors.OKGREEN}All rules removed.{bcolors.ENDC}")
diff --git a/keepercommander/commands/discover/rule_update.py b/keepercommander/commands/discover/rule_update.py
index 0f8aeef5d..7ffdda461 100644
--- a/keepercommander/commands/discover/rule_update.py
+++ b/keepercommander/commands/discover/rule_update.py
@@ -64,7 +64,7 @@ def execute(self, params, **kwargs):
 
         try:
             rule_id = kwargs.get("rule_id")
-            rules = Rules(record=gateway_context.configuration, params=params, use_per_graph_endpoints=True)
+            rules = Rules(record=gateway_context.configuration, params=params, use_per_graph_endpoints=False)
             rule_item = rules.get_rule_item(rule_type=RuleTypeEnum.ACTION, rule_id=rule_id)
             if rule_item is None:
                 raise ValueError("Rule Id does not exist.")
diff --git a/keepercommander/commands/discoveryrotation.py b/keepercommander/commands/discoveryrotation.py
index 7671ef65d..20f2d0206 100644
--- a/keepercommander/commands/discoveryrotation.py
+++ b/keepercommander/commands/discoveryrotation.py
@@ -3372,7 +3372,7 @@ def record_rotate(self, params, record_uid, slient: bool = False):
                 # Check the graph for the noop setting.
                 record_link = RecordLink(record=pam_config,
                                          params=params,
-                                         fail_on_corrupt=False, use_per_graph_endpoints=True)
+                                         fail_on_corrupt=False, use_per_graph_endpoints=False)
                 acl = record_link.get_acl(record_uid, pam_config.record_uid)
                 if acl is not None and acl.rotation_settings is not None:
                     is_noop = acl.rotation_settings.noop
diff --git a/keepercommander/commands/pam_debug/acl.py b/keepercommander/commands/pam_debug/acl.py
index cdf1918eb..a85f49286 100644
--- a/keepercommander/commands/pam_debug/acl.py
+++ b/keepercommander/commands/pam_debug/acl.py
@@ -57,7 +57,7 @@ def execute(self, params: KeeperParams, **kwargs):
         record_link = RecordLink(record=gateway_context.configuration,
                                  params=params,
                                  logger=logging,
-                                 debug_level=debug_level, use_per_graph_endpoints=True)
+                                 debug_level=debug_level, use_per_graph_endpoints=False)
 
         user_record = vault.KeeperRecord.load(params, user_uid)  # type: Optional[TypedRecord]
         if user_record is None:
diff --git a/keepercommander/commands/pam_debug/gateway.py b/keepercommander/commands/pam_debug/gateway.py
index 2f53a620a..a7cfc4d42 100644
--- a/keepercommander/commands/pam_debug/gateway.py
+++ b/keepercommander/commands/pam_debug/gateway.py
@@ -49,11 +49,11 @@ def execute(self, params: KeeperParams, **kwargs):
             multi_conf_msg(gateway, err)
             return
 
-        infra = Infrastructure(record=gateway_context.configuration, params=params, fail_on_corrupt=False, use_per_graph_endpoints=True)
+        infra = Infrastructure(record=gateway_context.configuration, params=params, fail_on_corrupt=False, use_per_graph_endpoints=False)
         infra.load()
 
-        record_link = RecordLink(record=gateway_context.configuration, params=params, fail_on_corrupt=False, use_per_graph_endpoints=True)
-        user_service = UserService(record=gateway_context.configuration, params=params, fail_on_corrupt=False, use_per_graph_endpoints=True)
+        record_link = RecordLink(record=gateway_context.configuration, params=params, fail_on_corrupt=False, use_per_graph_endpoints=False)
+        user_service = UserService(record=gateway_context.configuration, params=params, fail_on_corrupt=False, use_per_graph_endpoints=False)
 
         if gateway_context is None:
             print(f"  {self._f('Cannot get gateway information. Gateway may not be up.')}")
diff --git a/keepercommander/commands/pam_debug/graph.py b/keepercommander/commands/pam_debug/graph.py
index 8daeb4838..be482f8e6 100644
--- a/keepercommander/commands/pam_debug/graph.py
+++ b/keepercommander/commands/pam_debug/graph.py
@@ -78,7 +78,7 @@ def _do_text_list_infra(self, params: KeeperParams, gateway_context: GatewayCont
                             indent: int = 0):
 
         infra = Infrastructure(record=gateway_context.configuration, params=params, logger=logging,
-                               debug_level=debug_level, use_per_graph_endpoints=True)
+                               debug_level=debug_level, use_per_graph_endpoints=False)
         infra.load(sync_point=0)
 
         try:
@@ -164,7 +164,7 @@ def _do_text_list_rl(self, params: KeeperParams, gateway_context: GatewayContext
         record_link = RecordLink(record=gateway_context.configuration,
                                  params=params,
                                  logger=logging,
-                                 debug_level=debug_level, use_per_graph_endpoints=True)
+                                 debug_level=debug_level, use_per_graph_endpoints=False)
         configuration = record_link.dag.get_root
         
         record = vault.KeeperRecord.load(params, configuration.uid)  # type: Optional[TypedRecord]
@@ -316,7 +316,7 @@ def _do_text_list_service(self, params: KeeperParams, gateway_context: GatewayCo
                               indent: int = 0):
 
         user_service = UserService(record=gateway_context.configuration, params=params, logger=logging,
-                                   debug_level=debug_level, use_per_graph_endpoints=True)
+                                   debug_level=debug_level, use_per_graph_endpoints=False)
         configuration = user_service.dag.get_root
 
         def _handle(current_vertex: DAGVertex, parent_vertex: Optional[DAGVertex] = None, indent: int = 0):
@@ -364,7 +364,7 @@ def _do_text_list_jobs(self, params: KeeperParams, gateway_context: GatewayConte
                            indent: int = 0):
 
         infra = Infrastructure(record=gateway_context.configuration, params=params, logger=logging,
-                               debug_level=debug_level, fail_on_corrupt=False, use_per_graph_endpoints=True)
+                               debug_level=debug_level, fail_on_corrupt=False, use_per_graph_endpoints=False)
         infra.load(sync_point=0)
 
         pad = ""
@@ -461,7 +461,7 @@ def _do_render_infra(self, params: KeeperParams, gateway_context: GatewayContext
                          debug_level: int = 0):
 
         infra = Infrastructure(record=gateway_context.configuration, params=params, logger=logging,
-                               debug_level=debug_level, use_per_graph_endpoints=True)
+                               debug_level=debug_level, use_per_graph_endpoints=False)
         infra.load(sync_point=0)
 
         print("")
@@ -487,7 +487,7 @@ def _do_render_rl(self, params: KeeperParams, gateway_context: GatewayContext, f
         rl = RecordLink(record=gateway_context.configuration,
                         params=params,
                         logger=logging,
-                        debug_level=debug_level, use_per_graph_endpoints=True)
+                        debug_level=debug_level, use_per_graph_endpoints=False)
 
         print("")
         dot_instance = rl.to_dot(
@@ -510,7 +510,7 @@ def _do_render_service(self, params: KeeperParams, gateway_context: GatewayConte
                            graph_format: str, debug_level: int = 0):
 
         service = UserService(record=gateway_context.configuration, params=params, logger=logging,
-                              debug_level=debug_level, use_per_graph_endpoints=True)
+                              debug_level=debug_level, use_per_graph_endpoints=False)
 
         print("")
         dot_instance = service.to_dot(
@@ -532,7 +532,7 @@ def _do_render_service(self, params: KeeperParams, gateway_context: GatewayConte
     def _do_render_jobs(self, params: KeeperParams, gateway_context: GatewayContext, filepath: str,
                         graph_format: str, debug_level: int = 0):
 
-        jobs = Jobs(record=gateway_context.configuration, params=params, logger=logging, debug_level=debug_level, use_per_graph_endpoints=True)
+        jobs = Jobs(record=gateway_context.configuration, params=params, logger=logging, debug_level=debug_level, use_per_graph_endpoints=False)
 
         print("")
         dot_instance = jobs.dag.to_dot()
diff --git a/keepercommander/commands/pam_debug/info.py b/keepercommander/commands/pam_debug/info.py
index c8f690518..f07794148 100644
--- a/keepercommander/commands/pam_debug/info.py
+++ b/keepercommander/commands/pam_debug/info.py
@@ -65,7 +65,7 @@ def execute(self, params: KeeperParams, **kwargs):
 
             for configuration_record in configuration_records:
 
-                record_link = RecordLink(record=configuration_record, params=params, use_per_graph_endpoints=True)
+                record_link = RecordLink(record=configuration_record, params=params, use_per_graph_endpoints=False)
                 record_vertex = record_link.dag.get_vertex(record.record_uid)
                 if record_vertex is not None and record_vertex.active is True:
                     controller_uid = configuration_record.record_uid
@@ -95,10 +95,10 @@ def execute(self, params: KeeperParams, **kwargs):
             print(f"{bcolors.FAIL}Could not find the gateway for configuration record.{controller_uid}{bcolors.ENDC}")
             return
 
-        infra = Infrastructure(record=configuration_record, params=params, use_per_graph_endpoints=True)
+        infra = Infrastructure(record=configuration_record, params=params, use_per_graph_endpoints=False)
         infra.load()
-        record_link = RecordLink(record=configuration_record, params=params, use_per_graph_endpoints=True)
-        user_service = UserService(record=configuration_record, params=params, use_per_graph_endpoints=True)
+        record_link = RecordLink(record=configuration_record, params=params, use_per_graph_endpoints=False)
+        user_service = UserService(record=configuration_record, params=params, use_per_graph_endpoints=False)
 
         print("")
         print(self._h("Record Information"))
diff --git a/keepercommander/commands/pam_debug/link.py b/keepercommander/commands/pam_debug/link.py
index f2489d2f0..b8bddba8d 100644
--- a/keepercommander/commands/pam_debug/link.py
+++ b/keepercommander/commands/pam_debug/link.py
@@ -53,7 +53,7 @@ def execute(self, params: KeeperParams, **kwargs):
         record_link = RecordLink(record=gateway_context.configuration,
                                  params=params,
                                  logger=logging,
-                                 debug_level=debug_level, use_per_graph_endpoints=True)
+                                 debug_level=debug_level, use_per_graph_endpoints=False)
 
         resource_record = vault.KeeperRecord.load(params, resource_uid)  # type: Optional[TypedRecord]
         if resource_record is None:
diff --git a/keepercommander/commands/pam_debug/rotation_setting.py b/keepercommander/commands/pam_debug/rotation_setting.py
index fd2d6ed19..2557f8a15 100644
--- a/keepercommander/commands/pam_debug/rotation_setting.py
+++ b/keepercommander/commands/pam_debug/rotation_setting.py
@@ -164,7 +164,7 @@ def execute(self, params: KeeperParams, **kwargs):
                       f"It's a {resource_record.record_type}.{bcolors.ENDC}")
                 return
 
-        record_link = RecordLink(record=configuration_record, params=params, use_per_graph_endpoints=True)
+        record_link = RecordLink(record=configuration_record, params=params, use_per_graph_endpoints=False)
 
         parent_uid = resource_record_uid or configuration_record_uid
         parent_vertex = record_link.get_record_link(parent_uid)
diff --git a/keepercommander/commands/pam_debug/vertex.py b/keepercommander/commands/pam_debug/vertex.py
index 35bd26acd..05bbe493d 100644
--- a/keepercommander/commands/pam_debug/vertex.py
+++ b/keepercommander/commands/pam_debug/vertex.py
@@ -53,7 +53,7 @@ def execute(self, params: KeeperParams, **kwargs):
             return
 
         infra = Infrastructure(record=gateway_context.configuration, params=params, fail_on_corrupt=False,
-                               debug_level=debug_level, use_per_graph_endpoints=True)
+                               debug_level=debug_level, use_per_graph_endpoints=False)
         infra.load()
 
         vertex_uid = kwargs.get("vertex_uid")
diff --git a/keepercommander/commands/pam_service/add.py b/keepercommander/commands/pam_service/add.py
index c03441e3b..56e9e2e0d 100644
--- a/keepercommander/commands/pam_service/add.py
+++ b/keepercommander/commands/pam_service/add.py
@@ -60,9 +60,9 @@ def execute(self, params: KeeperParams, **kwargs):
             return
 
         user_service = UserService(record=gateway_context.configuration, params=params, fail_on_corrupt=False,
-                                   agent=f"Cmdr/{__version__}", use_per_graph_endpoints=True)
+                                   agent=f"Cmdr/{__version__}", use_per_graph_endpoints=False)
         record_link = RecordLink(record=gateway_context.configuration, params=params, fail_on_corrupt=False,
-                                 agent=f"Cmdr/{__version__}", use_per_graph_endpoints=True)
+                                 agent=f"Cmdr/{__version__}", use_per_graph_endpoints=False)
 
         ###############
 
diff --git a/keepercommander/commands/pam_service/list.py b/keepercommander/commands/pam_service/list.py
index b19b34283..3c9657be8 100644
--- a/keepercommander/commands/pam_service/list.py
+++ b/keepercommander/commands/pam_service/list.py
@@ -42,7 +42,7 @@ def execute(self, params: KeeperParams, **kwargs):
             return
 
         user_service = UserService(record=gateway_context.configuration, params=params, fail_on_corrupt=False,
-                                   agent=f"Cmdr/{__version__}", use_per_graph_endpoints=True)
+                                   agent=f"Cmdr/{__version__}", use_per_graph_endpoints=False)
 
         service_map = {}
         for resource_vertex in user_service.dag.get_root.has_vertices(edge_type=EdgeType.LINK):
diff --git a/keepercommander/commands/pam_service/remove.py b/keepercommander/commands/pam_service/remove.py
index 58f545592..1851072ef 100644
--- a/keepercommander/commands/pam_service/remove.py
+++ b/keepercommander/commands/pam_service/remove.py
@@ -57,7 +57,7 @@ def execute(self, params: KeeperParams, **kwargs):
             return
 
         user_service = UserService(record=gateway_context.configuration, params=params, fail_on_corrupt=False,
-                                   agent=f"Cmdr/{__version__}", use_per_graph_endpoints=True)
+                                   agent=f"Cmdr/{__version__}", use_per_graph_endpoints=False)
 
         machine_record = vault.KeeperRecord.load(params, machine_uid)  # type: Optional[TypedRecord]
         if machine_record is None:
diff --git a/keepercommander/discovery_common/record_link.py b/keepercommander/discovery_common/record_link.py
index db55bcfdb..6c4abefa3 100644
--- a/keepercommander/discovery_common/record_link.py
+++ b/keepercommander/discovery_common/record_link.py
@@ -56,7 +56,7 @@ def __init__(self,
         # Based on the connection type, use_write_protobuf might be set to False is True was passed.
         # Use self.conn.use_write_protobuf; don't use passed in use_write_protobuf.
         # If using protobuf to write, then use the endpoint.
-        # `use_per_graph_endpoints=True` also forces the endpoints on, independent
+        # `use_per_graph_endpoints=False` also forces the endpoints on, independent
         # of the protobuf flags.
         self.write_endpoint = None
         if use_per_graph_endpoints or self.conn.use_write_protobuf:
