diff --git a/geant/gap_ansible/roles/edge_port/tasks/connection_tasks.yaml b/geant/gap_ansible/roles/edge_port/tasks/connection_tasks.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..56768fbf4d4364c78a9c879dd0b7852133418deb
--- /dev/null
+++ b/geant/gap_ansible/roles/edge_port/tasks/connection_tasks.yaml
@@ -0,0 +1,11 @@
+---
+- name: Set ansible_host to terminal server when router is offline
+  when: router.router_access_via_ts | ansible.builtin.bool
+  ansible.builtin.set_fact:
+    ansible_host: "{{ router.router_site.site_ts_address }}"
+    ansible_port: "{{ router.router_ts_port }}"
+
+- name: Load netconf connection config
+  ansible.builtin.set_fact:
+    ansible_connection: "{{ netconf_access[router.vendor].ansible_connection }}"
+    ansible_network_os: "{{ netconf_access[router.vendor].ansible_network_os }}"
diff --git a/geant/gap_ansible/roles/edge_port/tasks/main.yml b/geant/gap_ansible/roles/edge_port/tasks/main.yml
index 172cbfa9e9cc2d0cd119ee957903653cacfb3961..4a0d1f4c22127a4714c01d43249dab195ade9f76 100644
--- a/geant/gap_ansible/roles/edge_port/tasks/main.yml
+++ b/geant/gap_ansible/roles/edge_port/tasks/main.yml
@@ -7,6 +7,9 @@
   when: verb in verbs
   ansible.builtin.include_tasks: compile.yaml
 
-- name: Include create if selected
+- name: Include set connection tasks
+  ansible.builtin.include_tasks: connection_tasks.yaml
+
+- name: Include deploy tasks
   when: verb in verbs
   ansible.builtin.include_tasks: deploy.yaml
diff --git a/geant/gap_ansible/roles/edge_port/tasks/standard_tasks.yaml b/geant/gap_ansible/roles/edge_port/tasks/standard_tasks.yaml
index 5a966bca7df6038d07be25d5e0b4baf77497a9d5..f0bc6dea1395562feca38e574974bdccfe9ace16 100644
--- a/geant/gap_ansible/roles/edge_port/tasks/standard_tasks.yaml
+++ b/geant/gap_ansible/roles/edge_port/tasks/standard_tasks.yaml
@@ -24,17 +24,6 @@
   ansible.builtin.include_vars:
     dir: /opt/ansible_inventory/group_vars/all
 
-- name: Set ansible_host to terminal server when router is offline
-  when: router.router_access_via_ts | ansible.builtin.bool
-  ansible.builtin.set_fact:
-    ansible_host: "{{ router.router_site.site_ts_address }}"
-    ansible_port: "{{ router.router_ts_port }}"
-
-- name: Load netconf connection config
-  ansible.builtin.set_fact:
-    ansible_connection: "{{ netconf_access[router.vendor].ansible_connection }}"
-    ansible_network_os: "{{ netconf_access[router.vendor].ansible_network_os }}"
-
 - name: Generate an ID for this run
   ansible.builtin.set_fact:
     opid: "{{ lookup('community.general.random_string', length=18, special=false) }}"