diff --git a/split-host-job-launch-webhook-files.yml b/split-host-job-launch-webhook-files.yml
index 704e42e..6682446 100644
--- a/split-host-job-launch-webhook-files.yml
+++ b/split-host-job-launch-webhook-files.yml
@@ -1,5 +1,5 @@
 ---
-- name: Create inventory based on extra_vars
+- name: Create inventory based on Webook commit
   hosts: all
   gather_facts: no
   become: no
@@ -9,27 +9,38 @@
     - vars/defaults.yml
 
 
-  vars:
-    provision_host: "{{ tower_provision_host | default(ansible_play_hosts | join(',')) }}"
-
-
   tasks:
-    - name: Set provision_host to Gitlab commit files if defined
+    - name: Set provision_host to tower_provision_host or default
       set_fact:
-        provision_host: "{{ tower_webhook_payload.commits[0].added    | split('/') | last +
-                            tower_webhook_payload.commits[0].modified | split('/') | last }}"
-      when:
-        - tower_webhook_payload.commits[0].added    is defined or
-          tower_webhook_payload.commits[0].modified is defined
+        provision_host: "{{ tower_provision_host | default(ansible_play_hosts | join(',')) }}"
+      when: tower_webhook_payload is not defined
 
 
-    - name: "Create in-memory inventory"
+    - name: Set provision_host to Webhook files
+      set_fact:
+        provision_host: "{{ [item | split('/') | last] + provision_host | default([]) }}"
+      loop: "{{ tower_webhook_payload.commits[0].added + tower_webhook_payload.commits[0].modified }}"
+      when: tower_webhook_payload is defined
+
+
+    - name: "Create in-memory inventory for tower_provision_host"
       add_host:
         name: "{{ item }}"
         groups:
           - remdiation
       delegate_to: localhost
       loop: "{{ provision_host.split(',') }}"
+      when: tower_webhook_payload is not defined
+
+
+    - name: "Create in-memory inventory for Webhook"
+      add_host:
+        name: "{{ item }}"
+        groups:
+          - remdiation
+      delegate_to: localhost
+      loop: "{{ provision_host }}"
+      when: tower_webhook_payload is defined
 
 
 # =========================================================================== #
diff --git a/split-host-job-launch-webhook-vars.yml b/split-host-job-launch-webhook-vars.yml
index 59c0431..3023cfd 100644
--- a/split-host-job-launch-webhook-vars.yml
+++ b/split-host-job-launch-webhook-vars.yml
@@ -1,5 +1,5 @@
 ---
-- name: Create inventory based on extra_vars
+- name: Create inventory based on Webook commit
   hosts: all
   gather_facts: no
   become: no