diff --git a/ansible/tasks/ioc/ioc-install.yml b/ansible/tasks/ioc/ioc-install.yml
index ff930fe..3ae3d41 100644
--- a/ansible/tasks/ioc/ioc-install.yml
+++ b/ansible/tasks/ioc/ioc-install.yml
@@ -1,11 +1,12 @@
 ---
-- name: Clone repo and get/set ioc_port
-  ansible.builtin.import_tasks: ../utils/get-ioc-port.yml
+- name: Init service name
+  ansible.builtin.import_tasks: ../utils/init-service-name.yml
 
-- name: Initialize service name
-  ansible.builtin.set_fact:
-    # Uses preferred_service_name_lower if defined in vars, otherwise falls back to the CLI extra-vars
-    target_service_name_lower: "{{ preferred_service_name_lower | default(service_name_lower) }}"
+- name: Clone repo 
+  ansible.builtin.import_tasks: ../utils/clone-repo.yml
+
+- name: Get and set ioc_port
+  ansible.builtin.import_tasks: ../utils/get-ioc-port.yml
 
 - name: "[{{ target_service_name_lower }}] Establish environment naming conventions"
   ansible.builtin.set_fact:
diff --git a/ansible/tasks/ioc/ioc-restart.yml b/ansible/tasks/ioc/ioc-restart.yml
index 615e3fc..ad637ac 100644
--- a/ansible/tasks/ioc/ioc-restart.yml
+++ b/ansible/tasks/ioc/ioc-restart.yml
@@ -1,16 +1,9 @@
 ---
-- name: Clone this repository
-  ansible.builtin.git:
-    repo: "git@gitea.psi.ch:sls/hla_framework_bd.git"
-    dest: "{{ workspace_dir }}"
-    accept_hostkey: true
-    version: "{{ branch_name }}"
-    force: true
+- name: Init service name
+  ansible.builtin.import_tasks: ../utils/init-service-name.yml
 
-- name: Initialize service name
-  ansible.builtin.set_fact:
-    # Uses preferred_service_name_lower if defined in vars, otherwise falls back to the CLI extra-vars
-    target_service_name_lower: "{{ preferred_service_name_lower | default(service_name_lower) }}"
+- name: Clone repo 
+  ansible.builtin.import_tasks: ../utils/clone-repo.yml
 
 - name: "[{{ target_service_name_lower }}] Establish environment naming conventions"
   ansible.builtin.set_fact:
diff --git a/ansible/tasks/ioc/ioc-start.yml b/ansible/tasks/ioc/ioc-start.yml
index 110e40c..28d3e64 100644
--- a/ansible/tasks/ioc/ioc-start.yml
+++ b/ansible/tasks/ioc/ioc-start.yml
@@ -1,5 +1,11 @@
 ---
-- name: Clone repo and get/set ioc_port
+- name: Init service name
+  ansible.builtin.import_tasks: ../utils/init-service-name.yml
+
+- name: Clone repo 
+  ansible.builtin.import_tasks: ../utils/clone-repo.yml
+
+- name: Get and set ioc_port
   ansible.builtin.import_tasks: ../utils/get-ioc-port.yml
 
 - name: "[{{ ioc_port }}] Start IOC"
diff --git a/ansible/tasks/utils/clone-repo.yml b/ansible/tasks/utils/clone-repo.yml
new file mode 100644
index 0000000..3c782bb
--- /dev/null
+++ b/ansible/tasks/utils/clone-repo.yml
@@ -0,0 +1,8 @@
+---
+- name: Clone this repository
+  ansible.builtin.git:
+    repo: "git@gitea.psi.ch:sls/hla_framework_bd.git"
+    dest: "{{ workspace_dir }}"
+    accept_hostkey: true
+    version: "{{ branch_name }}"
+    force: true
diff --git a/ansible/tasks/utils/get-ioc-port.yml b/ansible/tasks/utils/get-ioc-port.yml
index cb4c0ea..2f18c69 100644
--- a/ansible/tasks/utils/get-ioc-port.yml
+++ b/ansible/tasks/utils/get-ioc-port.yml
@@ -1,12 +1,4 @@
 ---
-- name: Clone this repository
-  ansible.builtin.git:
-    repo: "git@gitea.psi.ch:sls/hla_framework_bd.git"
-    dest: "{{ workspace_dir }}"
-    accept_hostkey: true
-    version: "{{ branch_name }}"
-    force: true
-
 - name: Read the service registry file
   ansible.builtin.slurp:
     src: "{{ workspace_dir }}/config/services_registry.yml"
diff --git a/ansible/tasks/utils/init-service-name.yml b/ansible/tasks/utils/init-service-name.yml
new file mode 100644
index 0000000..46ad173
--- /dev/null
+++ b/ansible/tasks/utils/init-service-name.yml
@@ -0,0 +1,5 @@
+---
+- name: Initialize service name
+  ansible.builtin.set_fact:
+    # Uses preferred_service_name_lower if defined in vars, otherwise falls back to the CLI extra-vars
+    target_service_name_lower: "{{ preferred_service_name_lower | default(service_name_lower) }}"
diff --git a/cli/src/ioc.py b/cli/src/ioc.py
index 0ad52e1..9b325ac 100644
--- a/cli/src/ioc.py
+++ b/cli/src/ioc.py
@@ -54,9 +54,9 @@ def start(
 ):
     registry = ServiceRegistry.read_from_config()
     service = registry.get_service(name=service_name_lower)
-    ioc_port_var = f"ioc_port={service.ioc_port}"
+    service_name_var = f"service_name_lower={service.name_lower}"
 
-    run_playbook(playbook=str(IOC_PLAYBOOK_START), env=env, vars=[ioc_port_var])
+    run_playbook(playbook=str(IOC_PLAYBOOK_START), env=env, vars=[service_name_var])
 
 
 @ioc.command()
@@ -67,9 +67,9 @@ def start_all(
     services = registry.get_services()
 
     for service in services:
-        ioc_port_var = f"ioc_port={service.ioc_port}"
+        service_name_var = f"service_name_lower={service.name_lower}"
 
-        run_playbook(playbook=str(IOC_PLAYBOOK_START), env=env, vars=[ioc_port_var])
+        run_playbook(playbook=str(IOC_PLAYBOOK_START), env=env, vars=[service_name_var])
 
 
 @ioc.command(no_args_is_help=True)