diff --git a/hooks/post_folder_creation.yml b/hooks/post_folder_creation.yml
index b24f473f7..c781327f1 100644
--- a/hooks/post_folder_creation.yml
+++ b/hooks/post_folder_creation.yml
@@ -1,6 +1,6 @@
 ---
 - name: hook | Create web/uploads folder.
-  file: state=directory path={{symfony_shared_dir}}/web/uploads
+  file: state=directory path="{{symfony_shared_dir}}/web/uploads"
 
 - name: hook | Symlink to release.
   file: state=link src="{{symfony_shared_dir}}/web/uploads" path="{{symfony_current_release_dir}}/web/uploads"
diff --git a/tasks/00-facts.yml b/tasks/00-facts.yml
index 83df7ac35..096fc16c3 100644
--- a/tasks/00-facts.yml
+++ b/tasks/00-facts.yml
@@ -2,7 +2,7 @@
 # simplify folder and command vars
 
 - name: Check/define release name.
-  set_fact: symfony_project_release={{ lookup('pipe', 'date +%Y%m%d%H%M%S') }}
+  set_fact: symfony_project_release="{{ lookup('pipe', 'date +%Y%m%d%H%M%S') }}"
   when: symfony_project_release == None
 
 - name: Set symfony_current_release.
@@ -15,4 +15,4 @@
   set_fact: symfony_shared_dir={{symfony_project_root}}/shared
 
 - name: Set symfony_console.
-  set_fact: symfony_console={{symfony_current_release_dir}}/app/console
\ No newline at end of file
+  set_fact: symfony_console={{symfony_current_release_dir}}/app/console
diff --git a/tasks/empty.yml b/tasks/empty.yml
deleted file mode 100644
index 73b314ff7..000000000
--- a/tasks/empty.yml
+++ /dev/null
@@ -1 +0,0 @@
----
\ No newline at end of file
diff --git a/tasks/main.yml b/tasks/main.yml
index 8e4f4a62b..95e478beb 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -22,7 +22,9 @@
   shell: cat {{symfony_current_release_dir}}/composer.json
   register: composer_content
 
-- include: "{{ symfony_project_post_folder_creation_tasks | default('empty.yml') }}"
+- name: Include creation tasks.
+  include: "{{ symfony_project_post_folder_creation_tasks }}"
+  when: symfony_project_post_folder_creation_tasks | exists
 
 - name: Create symlinks to shared directories.
   file: state=link src="{{symfony_shared_dir}}{{item.src}}" path="{{symfony_current_release_dir}}{{item.path}}"
@@ -33,7 +35,9 @@
 
 - include: 20-composer.yml
 
-- include: "{{ symfony_project_pre_cache_warmup_tasks | default('empty.yml') }}"
+- name: Include pre cache warmup tasks.
+  include: "{{ symfony_project_pre_cache_warmup_tasks }}"
+  when: symfony_project_pre_cache_warmup_tasks | exists
 
 - include: 30-cache.yml
 
@@ -44,11 +48,15 @@
 - name: create release file
   copy: content="{{symfony_current_release}}" dest="{{symfony_current_release_dir}}/RELEASE" mode=644
 
-- include: "{{ symfony_project_pre_live_switch_tasks | default('empty.yml') }}"
+- name: Include pre live switch tasks.
+  include: "{{ symfony_project_pre_live_switch_tasks }}"
+  when: symfony_project_pre_live_switch_tasks | exists
 
 - name: Create symlink for release.
   file: state=link src="{{symfony_current_release_dir}}" path="{{symfony_project_root}}/current"
 
-- include: "{{ symfony_project_post_live_switch_tasks | default('empty.yml') }}"
+- name: Include post live switch tasks.
+  include: "{{ symfony_project_post_live_switch_tasks }}"
+  when: symfony_project_post_live_switch_tasks | exists
 
-- include: 60-clean_releases.yml
\ No newline at end of file
+- include: 60-clean_releases.yml