diff --git a/awx/api/views/__init__.py b/awx/api/views/__init__.py
index a7803bca4e..128bc3cca1 100644
--- a/awx/api/views/__init__.py
+++ b/awx/api/views/__init__.py
@@ -368,11 +368,6 @@ class InstanceList(ListCreateAPIView):
     search_fields = ('hostname',)
     ordering = ('id',)
 
-    def perform_create(self, serializer):
-        obj = serializer.save(node_state=models.Instance.States.INSTALLED)
-        for instance in models.Instance.objects.filter(node_type__in=[models.Instance.Types.CONTROL, models.Instance.Types.HYBRID]):
-            models.InstanceLink.objects.create(source=instance, target=obj, link_state=models.InstanceLink.States.ADDING)
-
 
 class InstanceDetail(RetrieveUpdateAPIView):
 
@@ -384,9 +379,6 @@ class InstanceDetail(RetrieveUpdateAPIView):
         r = super(InstanceDetail, self).update(request, *args, **kwargs)
         if status.is_success(r.status_code):
             obj = self.get_object()
-            if obj.node_state == models.Instance.States.DEPROVISIONING:
-                models.InstanceLink.objects.filter(target=obj).update(link_state=models.InstanceLink.States.REMOVING)
-                models.InstanceLink.objects.filter(source=obj).update(link_state=models.InstanceLink.States.REMOVING)
             obj.set_capacity_value()
             obj.save(update_fields=['capacity'])
             r.data = serializers.InstanceSerializer(obj, context=self.get_serializer_context()).to_representation(obj)
diff --git a/awx/main/models/ha.py b/awx/main/models/ha.py
index 9ecaece5de..38e8ac0068 100644
--- a/awx/main/models/ha.py
+++ b/awx/main/models/ha.py
@@ -427,11 +427,11 @@ def on_instance_group_saved(sender, instance, created=False, raw=False, **kwargs
 def on_instance_saved(sender, instance, created=False, raw=False, **kwargs):
     if settings.IS_K8S and instance.node_type in (Instance.Types.EXECUTION,):
         if instance.node_state == Instance.States.DEPROVISIONING:
-            from awx.main.tasks.receptor import wait_for_jobs  # prevents circular import
+            from awx.main.tasks.receptor import remove_deprovisioned_node  # prevents circular import
 
             # wait for jobs on the node to complete, then delete the
             # node and kick off write_receptor_config
-            connection.on_commit(lambda: wait_for_jobs.apply_async(instance.hostname))
+            connection.on_commit(lambda: remove_deprovisioned_node.apply_async([instance.hostname]))
 
         if instance.node_state == Instance.States.INSTALLED:
             from awx.main.tasks.receptor import write_receptor_config  # prevents circular import
diff --git a/awx/main/tasks/receptor.py b/awx/main/tasks/receptor.py
index 3ec579844e..baf95dd412 100644
--- a/awx/main/tasks/receptor.py
+++ b/awx/main/tasks/receptor.py
@@ -646,9 +646,15 @@ def write_receptor_config():
 
         this_inst = Instance.objects.me()
         instances = Instance.objects.filter(node_type=Instance.Types.EXECUTION)
+        existing_peers = {link.target_id for link in InstanceLink.objects.filter(source=this_inst)}
+        new_links = []
         for instance in instances:
             peer = {'tcp-peer': {'address': f'{instance.hostname}:{instance.listener_port}', 'tls': 'tlsclient'}}
             receptor_config.append(peer)
+            if instance.id not in existing_peers:
+                new_links.append(InstanceLink(source=this_inst, target=instance, link_state=InstanceLink.States.ADDING))
+
+        InstanceLink.objects.bulk_create(new_links)
 
         with open(__RECEPTOR_CONF, 'w') as file:
             yaml.dump(receptor_config, file, default_flow_style=False)
@@ -672,7 +678,10 @@ def write_receptor_config():
 
 
 @task(queue=get_local_queuename)
-def wait_for_jobs(hostname):
+def remove_deprovisioned_node(hostname):
+    InstanceLink.objects.filter(source__hostname=hostname).update(link_state=InstanceLink.States.REMOVING)
+    InstanceLink.objects.filter(target__hostname=hostname).update(link_state=InstanceLink.States.REMOVING)
+
     node_jobs = UnifiedJob.objects.filter(
         execution_node=hostname,
         status__in=(