diff --git a/tasks/app.yml b/tasks/app.yml
index cea8f7435caf2844ca49427b4cef9277c8d6374a..a6b174f3f3837db43ae29fac6b8cd8bca280b23f 100644
--- a/tasks/app.yml
+++ b/tasks/app.yml
@@ -33,14 +33,23 @@
     owner: "{{ item.owner }}"
     group: "{{ item.group }}"
     mode: "{{ item.mode }}"
-  loop: "{{ ynh_app.post_install }}"
+  loop: "{{ ynh_app.post_install|default([]) }}"
+  when: ynh_app.post_install
 
 - name: Execute script if file type is a script then remove it
-  ansible.builtin.shell: 
-    "{{ pst_install.dest }} && rm -f {{ pst_install.dest }}"
+  ansible.builtin.command: "{{ ynh_app_post_install.dest }}"
   args:
     chdir: /tmp/
-  loop: "{{ ynh_app.post_install }}"
+  loop: "{{ ynh_app.post_install|default([]) }}"
   loop_control:
-    loop_var: pst_install
-  when: pst_install.type == "script"
+    loop_var: ynh_app_post_install
+  when: ynh_app_post_install.type == "script"
+
+- name: Remove script after execution
+  ansible.builtin.file:
+    path: "{{ ynh_app_post_install.dest }}"
+    state: absent
+  loop: "{{ ynh_app.post_install|default([]) }}"
+  loop_control:
+    loop_var: ynh_app_post_install
+  when: ynh_app_post_install.type == "script"