diff --git a/tasks/install_subapp.yml b/tasks/install_subapp.yml
index 615336922ce25c60001995abeaedfd951905388a..c6752575f50b501a7b6a5b0bbeff7ddcfbf19602 100644
--- a/tasks/install_subapp.yml
+++ b/tasks/install_subapp.yml
@@ -206,20 +206,26 @@
       owner: "{{ vault_subapp_user }}"
       group: "{{ vault_subapp_group }}"
 
+################################################
 
+- name: disable check_ie_sample Service
+  ansible.builtin.systemd:
+    unit: "check_ie_sample.service"
+    enabled: false
+  loop: "{{ lookup('dict', vault_check_ie_sample_hosts) }}"
+  when: ansible_hostname == item.key
+  no_log: true
 
+- name: disable & start check_ie_sample Timer
+  ansible.builtin.systemd:
+    unit: "check_ie_sample.timer"
+    enabled: false
+  loop: "{{ lookup('dict', vault_check_ie_sample_hosts) }}"
+  when: ansible_hostname == item.key
+  no_log: true
 
 - name: alte Stichproben entfernen
   block:
-    # - name: Services disablen
-    #   ansible.builtin.systemd:
-    #     name: "{{ item }}"
-    #     state: stopped
-    #     enabled: false
-    #   loop:
-    #     - "stichprobe-daily-report.timer"
-    #     - "stichprobe-daily-report.service"
-    #   tags: [notest]
     - name: Systemd-Units und Config entfernen
       ansible.builtin.file:
         path: "{{ item }}"
@@ -230,44 +236,5 @@
         - "/home/{{ vault_subapp_user }}/.subapp/stichprobe.ini"
         - "/etc/systemd/user/check_ie_sample.timer"
         - "/etc/systemd/user/check_ie_sample.service"
-
-- name: deploy check_ie_sample Service
-  ansible.builtin.template:
-    src: "usr/local/lib/systemd/system/check_ie_sample.service.j2"
-    dest: "/usr/local/lib/systemd/system/check_ie_sample.service"
-    owner: "root"
-    group: "root"
-    mode: "0644"
-  loop: "{{ lookup('dict', vault_check_ie_sample_hosts) }}"
-  when: ansible_hostname == item.key
-  no_log: true
-
-- name: deploy check_ie_sample Timer
-  ansible.builtin.template:
-    src: "usr/local/lib/systemd/system/check_ie_sample.timer.j2"
-    dest: "/usr/local/lib/systemd/system/check_ie_sample.timer"
-    owner: "root"
-    group: "root"
-    mode: "0644"
-  loop: "{{ lookup('dict', vault_check_ie_sample_hosts) }}"
-  when: ansible_hostname == item.key
-  no_log: true
-
-- name: enable check_ie_sample Service
-  ansible.builtin.systemd:
-    unit: "check_ie_sample.service"
-    enabled: true
-    daemon_reload: true
-  loop: "{{ lookup('dict', vault_check_ie_sample_hosts) }}"
-  when: ansible_hostname == item.key
-  no_log: true
-
-- name: enable & start check_ie_sample Timer
-  ansible.builtin.systemd:
-    unit: "check_ie_sample.timer"
-    enabled: true
-    state: restarted
-    daemon_reload: true
-  loop: "{{ lookup('dict', vault_check_ie_sample_hosts) }}"
-  when: ansible_hostname == item.key
-  no_log: true
+        - "/usr/local/lib/systemd/system/check_ie_sample.service"
+        - "/usr/local/lib/systemd/system/check_ie_sample.timer"