diff --git a/geant/gap_ansible/roles/iptrunk_migration/tasks/main.yml b/geant/gap_ansible/roles/iptrunk_migration/tasks/main.yml
index 67c71a7c5c477d2b82b512e8a3855e750f8de9dc..9474d27a6c5024cbd1a740214478f5911dd07577 100644
--- a/geant/gap_ansible/roles/iptrunk_migration/tasks/main.yml
+++ b/geant/gap_ansible/roles/iptrunk_migration/tasks/main.yml
@@ -45,10 +45,16 @@
   ansible.builtin.set_fact:
     ansible_host: "{{ new_node.router.router_site.site_ts_address }}"
     ansible_port: "{{ new_node.router.router_ts_port }}"
+  when:
+    verb == "deploy" and ( new_node.router.router_access_via_ts | ansible.builtin.bool ) is true
+
+# TODO: set ansible_connection / ansible_network_os when not TS
+- name: Set connection and host OS
+  ansible.builtin.set_fact:
     ansible_connection: "{{ netconf_access[new_node.router.vendor].ansible_connection }}"
     ansible_network_os: "{{ netconf_access[new_node.router.vendor].ansible_network_os }}"
   when:
-    verb == "deploy" and ( new_node.router.router_access_via_ts | ansible.builtin.bool ) is true
+    verb == "deploy"
 
 - name: Print the ID
   ansible.builtin.debug: