diff --git a/geant/gap_ansible/roles/promote_p_to_pe/tasks/compile.yaml b/geant/gap_ansible/roles/promote_p_to_pe/tasks/compile.yaml
index 995efd31ecf648f16da4165617b95cee9c8e5715..91ec6aac027670b18bef80a7d317ff9b34678377 100644
--- a/geant/gap_ansible/roles/promote_p_to_pe/tasks/compile.yaml
+++ b/geant/gap_ansible/roles/promote_p_to_pe/tasks/compile.yaml
@@ -3,7 +3,8 @@
 
 - name: Set ansible host to localhost to compile config when router is offline
   when:
-    subscription.router.router_access_via_ts | ansible.builtin.bool
+    subscription.router.router_access_via_ts | ansible.builtin.bool ansible_host and
+    inventory_hostname == subscription.router.router_fqdn
   ansible.builtin.set_fact:
     ansible_host: "localhost"
     ansible_connection: local
@@ -56,7 +57,8 @@
 
 - name: Set back ansible_host to target terminal server if needed
   when:
-    subscription.router.router_access_via_ts | ansible.builtin.bool
+    subscription.router.router_access_via_ts | ansible.builtin.bool ansible_host and
+    inventory_hostname == subscription.router.router_fqdn
   ansible.builtin.set_fact:
     ansible_host: "{{ subscription.router.router_site.site_ts_address }}"
     ansible_connection: "{{ netconf_access[subscription.router.vendor].ansible_connection }}"
diff --git a/geant/gap_ansible/roles/promote_p_to_pe/tasks/main.yml b/geant/gap_ansible/roles/promote_p_to_pe/tasks/main.yml
index 4a68aacc94b4672ef2b09b525d9745c53508a12c..0b6df2e126858443f06b5708874e43a4c4e4113f 100644
--- a/geant/gap_ansible/roles/promote_p_to_pe/tasks/main.yml
+++ b/geant/gap_ansible/roles/promote_p_to_pe/tasks/main.yml
@@ -26,7 +26,8 @@
     dir: /opt/ansible_inventory/group_vars/all
 
 - name: Set ansible_host to terminal server when router is offline
-  when: subscription.router.router_access_via_ts | ansible.builtin.bool
+  when: subscription.router.router_access_via_ts | ansible.builtin.bool and
+        inventory_hostname == subscription.router.router_fqdn
   ansible.builtin.set_fact:
     ansible_host: "{{ subscription.router.router_site.site_ts_address }}"
     ansible_port: "{{ subscription.router.router_ts_port }}"