diff --git a/roles/2-common/tasks/iiab-startup.yml b/roles/2-common/tasks/iiab-startup.yml
index 178115443..fd4cbb7c5 100644
--- a/roles/2-common/tasks/iiab-startup.yml
+++ b/roles/2-common/tasks/iiab-startup.yml
@@ -1,20 +1,20 @@
-- name: Does systemd iiab-startup.service exist?
+- name: Does /usr/libexec/iiab-startup.sh exist?
   stat:
-    path: "{{ systemd_location }}/iiab-startup.service"
-  register: startup_unit
-
-- name: Copy iiab-startup.service to /etc/systemd/system
-  template:
-    src: iiab-startup.service
-    dest: /etc/systemd/system/
-  when: not startup_unit.stat.exists
+    path: /usr/libexec/iiab-startup.sh
+  register: startup_script
 
 - name: Copy template script to /usr/libexec/iiab-startup.sh
   template:
     src: iiab-startup.sh
     dest: /usr/libexec/
     mode: 0755
-  when: not startup_unit.stat.exists
+  when: not startup_script.stat.exists
+
+- name: Copy iiab-startup.service to /etc/systemd/system
+  template:
+    src: iiab-startup.service
+    dest: "{{ systemd_location }}"
+  when: not startup_script.stat.exists
 
 - name: Enable & restart the systemd service after daemon-reload
   # shell: systemctl daemon-reload
@@ -25,4 +25,4 @@
     daemon_reload: yes
     enabled: yes
     state: restarted
-  when: not startup_unit.stat.exists
+  when: not startup_script.stat.exists