diff --git a/tasks/collect_config/commit/none.yml b/tasks/collect_config/commit/none.yml
index 857a4333259478f1252178442ebcfb8df6d63922..2985542d07797f5078c35504c5f5315495380853 100644
--- a/tasks/collect_config/commit/none.yml
+++ b/tasks/collect_config/commit/none.yml
@@ -1,5 +1,6 @@
 ---
 # file: roles/drupal/tasks/config_collect/commit/none.yml
 
-- set_fact:
+- name: Set facts
+  set_fact:
     dummy: yes
diff --git a/tasks/collect_config/finish/none.yml b/tasks/collect_config/finish/none.yml
index 4744e1112fca64d27a2ebafe3a829590ec6f45b7..976beabd3180d84954f7df950071571df9bf9360 100644
--- a/tasks/collect_config/finish/none.yml
+++ b/tasks/collect_config/finish/none.yml
@@ -1,5 +1,6 @@
 ---
 # file: roles/drupal/tasks/config_collect/finish/none.yml
 
-- set_fact:
+- name: Set facts
+  set_fact:
     dummy: yes
diff --git a/tasks/collect_config/main.yml b/tasks/collect_config/main.yml
index 3ac50bc21ab2f5adfbc3fa3f5eb7d7bd9033786d..908d6907c98e15e73bcc80ccaf5cb4fc3d1b4e50 100644
--- a/tasks/collect_config/main.yml
+++ b/tasks/collect_config/main.yml
@@ -3,11 +3,14 @@
 
 - block:
 
-    - set_fact:
+    - name: Set version
+      set_fact:
         version: '{{ lookup("pipe","date +%Y-%m-%d-%H-%M-%S") }}'
-    - set_fact:
+    - name: Set webroot
+      set_fact:
         webRoot: '/tmp/ansible-cae-{{ drupal.id }}-{{ version }}-gitflow'
-    - set_fact:
+    - name: Set facts
+      set_fact:
         pathConfig: '{{ webRoot }}/{{ collect_config_key|default("config") }}/default/sync'
         pathExport: '{{ export_path }}'
         pathWorking: /tmp/ansible-cae-{{ drupal.id }}-{{ version }}
diff --git a/tasks/collect_config/prepare/none.yml b/tasks/collect_config/prepare/none.yml
index 541cec08f262fe3c92792b88a2ee1ba5cd98db2e..0cba357f2b5ab489d476073b2d044d75c751ac6e 100644
--- a/tasks/collect_config/prepare/none.yml
+++ b/tasks/collect_config/prepare/none.yml
@@ -1,5 +1,6 @@
 ---
 # file: roles/drupal/tasks/config_collect/prepare/none.yml
 
-- set_fact:
+- name: Set facts
+  set_fact:
     dummy: yes
diff --git a/tasks/collect_db_dump/dump.yml b/tasks/collect_db_dump/dump.yml
index a817a3987e03e3c7ca88e10f3a3abcdfcae6349f..64bac2a397a2765e06b0230167475adcd5461592 100644
--- a/tasks/collect_db_dump/dump.yml
+++ b/tasks/collect_db_dump/dump.yml
@@ -3,10 +3,12 @@
 
 - block:
 
-    - set_fact:
+    - name: Set default facts
+      set_fact:
         drushAlias: '@{{ drupal.id }}.{{ drupal_domain.shortname|default("default") }}'
         drushAliasValidate: "'@{{ drupal.id }}.{{ drupal_domain.shortname|default('default') }}':"
-    - set_fact:
+    - name: Set facts for Drush 8
+      set_fact:
         drushAlias: '@{{ inventory_hostname }}{{ drushSubkey }}.{{ drupal_domain.shortname|default("default") }}'
         drushAliasValidate: '@{{ inventory_hostname }}{{ drushSubkey }}.{{ drupal_domain.shortname|default("default") }}'
       when: drush_version_main|default('8') == '8'
diff --git a/tasks/collect_db_dump/main.yml b/tasks/collect_db_dump/main.yml
index 68a1ca6aed1d8d0d21fab382280a182124f26979..3bee44b592ea324e40647994b2b5a93c112b9cb9 100644
--- a/tasks/collect_db_dump/main.yml
+++ b/tasks/collect_db_dump/main.yml
@@ -3,21 +3,24 @@
 
 - block:
 
-  - set_fact:
+  - name: Set facts without jail
+    set_fact:
       webRoot: /var/www{{ drupal.webRoot|default("") }}
       cronUser: root
       apacheUser: www-data
       apacheLogDir: /var/log/apache2
       drushSubkey: '{{ drupal.drush_subkey|default("") }}'
     when: drupal.jail is not defined
-  - set_fact:
+  - name: Set facts with jail
+    set_fact:
       webRoot: '{{ jailroot }}/{{ drupal.jail.name }}/var/www{{ drupal.webRoot|default("") }}'
       cronUser: '{{ drupal.jail.name }}'
       apacheUser: '{{ drupal.jail.name }}'
       apacheLogDir: '{{ jailroot }}/{{ drupal.jail.name }}/var/log/apache2'
       drushSubkey: .{{ drupal.jail.name }}
     when: drupal.jail is defined
-  - set_fact:
+  - name: Set other facts
+    set_fact:
       installSource: '{{ drupal.src|default([]) }}'
       relativeRoot: '{{ drupal.relativeRoot|default(drupal_links_relative_root) }}'
       drupalRoot: '{{ webRoot }}{{ drupal.root|default("") }}'
diff --git a/tasks/deploy/d6.yml b/tasks/deploy/d6.yml
index 3b3f81bc971ddbebf387e75cbbbfa91be8d95570..94caa6ef5f2a054b54a8290044c2fa63142b5a9e 100644
--- a/tasks/deploy/d6.yml
+++ b/tasks/deploy/d6.yml
@@ -1,5 +1,6 @@
 ---
 # file: roles/drupal/tasks/deploy/d6.yml
 
-- set_fact:
+- name: Set facts
+  set_fact:
     dummy: yes
diff --git a/tasks/deploy/d7.yml b/tasks/deploy/d7.yml
index c8414facac30313739d1128064431a7a1a7d74e7..55e9fabc0970b679818139c55197885f925e51a7 100644
--- a/tasks/deploy/d7.yml
+++ b/tasks/deploy/d7.yml
@@ -1,7 +1,8 @@
 ---
 # file: roles/drupal/tasks/deploy/d7.yml
 
-- set_fact:
+- name: Set facts
+  set_fact:
     dummy: yes
 
 # TODO: Let's see how we can generalize this and whether we need that for D6 as well.
diff --git a/tasks/deploy/drush.yml b/tasks/deploy/drush.yml
index ae5bd10e1ec6f7d9b5c2e9f816d7a3a81dcb9edf..d4a414f1dec49c6c4a9a3c7ef3f4041ea21105a6 100644
--- a/tasks/deploy/drush.yml
+++ b/tasks/deploy/drush.yml
@@ -1,5 +1,6 @@
 ---
 # file: roles/drupal/tasks/deploy/drush.yml
 
-- set_fact:
+- name: Set facts
+  set_fact:
     dummy: yes
diff --git a/tasks/deploy/finalize_d6.yml b/tasks/deploy/finalize_d6.yml
index 689f9fb829bbd9df2a602e5031aa19f1205245d8..364296fb90d097cc513450bac187e700b0b845a3 100644
--- a/tasks/deploy/finalize_d6.yml
+++ b/tasks/deploy/finalize_d6.yml
@@ -1,5 +1,6 @@
 ---
 # file: roles/drupal/tasks/deploy/finalize_d6.yml
 
-- set_fact:
+- name: Set facts
+  set_fact:
     dummy: yes
diff --git a/tasks/deploy/finalize_d7.yml b/tasks/deploy/finalize_d7.yml
index b015cb67794aa8c9e4a67f3e975350a1e5ad0022..bb46fa8b52d4092f3c66ac3e713b674827ff6983 100644
--- a/tasks/deploy/finalize_d7.yml
+++ b/tasks/deploy/finalize_d7.yml
@@ -1,5 +1,6 @@
 ---
 # file: roles/drupal/tasks/deploy/finalize_d7.yml
 
-- set_fact:
+- name: Set facts
+  set_fact:
     dummy: yes
diff --git a/tasks/deploy/gitcomposer.yml b/tasks/deploy/gitcomposer.yml
index 3f00e288022b2ec47c76cbbef0f51ef467bf2e93..eaf33bc0dbcee512286768e09268fd8b2d915693 100644
--- a/tasks/deploy/gitcomposer.yml
+++ b/tasks/deploy/gitcomposer.yml
@@ -54,7 +54,8 @@
       chdir: '{{ webRoot }}'
     register: git_tag_info
 
-  - set_fact:
+  - name: Set facts
+    set_fact:
       drupalDeployInfoBranch: '{{ drupal.src.git.branch|default(omit) }}'
       drupalDeployInfoTag: '{{ git_tag_info.stdout }}'
 
diff --git a/tasks/deploy/none.yml b/tasks/deploy/none.yml
index 97aa4c48c9e74e49efc25fb52d82ea33d62b9c5d..596f90de8e08d5301015c902ec54823ec58ba072 100644
--- a/tasks/deploy/none.yml
+++ b/tasks/deploy/none.yml
@@ -1,5 +1,6 @@
 ---
 # file: roles/drupal/tasks/deploy/none.yml
 
-- set_fact:
+- name: Set facts
+  set_fact:
     dummy: yes
diff --git a/tasks/deploy/post-tasks.yml b/tasks/deploy/post-tasks.yml
index 605f95e150f1db0b9b7895ea2b32cad63bbaaefa..a8bf888c59cfcf4ee31fc80467f82c0e15b2a34e 100644
--- a/tasks/deploy/post-tasks.yml
+++ b/tasks/deploy/post-tasks.yml
@@ -3,10 +3,12 @@
 
 - block:
 
-    - set_fact:
+    - name: Set default facts
+      set_fact:
         drushAlias: '@{{ drupal.id }}.{{ drupal_domain.shortname|default("default") }}'
         drushAliasValidate: "'@{{ drupal.id }}.{{ drupal_domain.shortname|default('default') }}':"
-    - set_fact:
+    - name: Set facts for Drush 8
+      set_fact:
         drushAlias: '@{{ inventory_hostname }}{{ drushSubkey }}.{{ drupal_domain.shortname|default("default") }}'
         drushAliasValidate: '@{{ inventory_hostname }}{{ drushSubkey }}.{{ drupal_domain.shortname|default("default") }}'
       when: drush_version_main|default('8') == '8'
diff --git a/tasks/deploy/svn.yml b/tasks/deploy/svn.yml
index bfe8bec2c6178febd402e5e5ef016fb5dc1f6681..f03b0384d7c58900ff1cfb418c3ca6c47eb8f08c 100644
--- a/tasks/deploy/svn.yml
+++ b/tasks/deploy/svn.yml
@@ -1,5 +1,6 @@
 ---
 # file: roles/drupal/tasks/deploy/svn.yml
 
-- set_fact:
+- name: Set facts
+  set_fact:
     dummy: yes
diff --git a/tasks/files.yml b/tasks/files.yml
index 9e600bbf09f749bde312dee7773dd59668332162..36c39cff42748ab16ca28184635bf5dc373c30d3 100644
--- a/tasks/files.yml
+++ b/tasks/files.yml
@@ -3,7 +3,8 @@
 
 - block:
 
-    - set_fact:
+    - name: Set facts
+      set_fact:
         dir: '{{ webRoot }}/files/{{ drupal_domain.0.shortname|default("default") }}/{{ drupal_domain.1 }}'
         src: '{{ relativeRoot }}/files/{{ drupal_domain.0.shortname|default("default") }}/{{ drupal_domain.1 }}'
         dest: '{{ drupalRoot }}/sites/{{ drupal_domain.0.shortname|default("default") }}/{{ drupal_domain.1 }}'
diff --git a/tasks/install.yml b/tasks/install.yml
index 399761ba556d785037e964db7f2dcafb59a77b25..c56ba0e8bfa66fe2a90a503cbc8475f09d87f1db 100644
--- a/tasks/install.yml
+++ b/tasks/install.yml
@@ -2,21 +2,24 @@
 # file: roles/drupal/tasks/install.yml
 
 - block:
-    - set_fact:
+    - name: Set facts without jails
+      set_fact:
         webRoot: /var/www{{ drupal.webRoot|default("") }}
         cronUser: root
         apacheUser: www-data
         apacheLogDir: /var/log/apache2
         drushSubkey: '{{ drupal.drush_subkey|default("") }}'
       when: drupal.jail is not defined
-    - set_fact:
+    - name: Set facts with jails
+      set_fact:
         webRoot: '{{ jailroot }}/{{ drupal.jail.name }}/var/www{{ drupal.webRoot|default("") }}'
         cronUser: '{{ drupal.jail.name }}'
         apacheUser: '{{ drupal.jail.name }}'
         apacheLogDir: '{{ jailroot }}/{{ drupal.jail.name }}/var/log/apache2'
         drushSubkey: .{{ drupal.jail.name }}
       when: drupal.jail is defined
-    - set_fact:
+    - name: Set other facts
+      set_fact:
         drupalDeployInfoBranch: unknown
         drupalDeployInfoTag: unknown
         installSource: '{{ drupal.src|default([]) }}'
diff --git a/tasks/install/d6.yml b/tasks/install/d6.yml
index 8bb21ebed486e85a59a18cd5d64f316b2c2067e0..fd35cd1d812b602f8a1b77a6a2280ab0e396f46b 100644
--- a/tasks/install/d6.yml
+++ b/tasks/install/d6.yml
@@ -1,5 +1,6 @@
 ---
 # file: roles/drupal/tasks/install/d6.yml
 
-- set_fact:
+- name: Set facts
+  set_fact:
     dummy: yes
diff --git a/tasks/install/d7.yml b/tasks/install/d7.yml
index 7dc7de65aa45c7cf53e5386dd710c53901066a20..6829b3a12b02f9bf6e73e18e20607d31b11746ab 100644
--- a/tasks/install/d7.yml
+++ b/tasks/install/d7.yml
@@ -1,5 +1,6 @@
 ---
 # file: roles/drupal/tasks/install/d7.yml
 
-- set_fact:
+- name: Set facts
+  set_fact:
     dummy: yes
diff --git a/tasks/install/none.yml b/tasks/install/none.yml
index b48f596a8e9c480fae56dc0fc13837dcb85347d9..ec8fabd70000919a641829868b2a466ff335f115 100644
--- a/tasks/install/none.yml
+++ b/tasks/install/none.yml
@@ -1,5 +1,6 @@
 ---
 # file: roles/drupal/tasks/install/none.yml
 
-- set_fact:
+- name: Set facts
+  set_fact:
     dummy: yes
diff --git a/tasks/mysql.yml b/tasks/mysql.yml
index dbdb9ad49505778930d23ac04edede821afb6098..0946c193ad2bb31f2b942424317c0764436001ba 100644
--- a/tasks/mysql.yml
+++ b/tasks/mysql.yml
@@ -3,7 +3,8 @@
 
 - block:
 
-    - set_fact:
+    - name: Set facts
+      set_fact:
         db: '{{ drupal_domain.db }}'
         extra: '{{ drupal_domain.db.extra|default([]) }}'
         external: '{{ drupal_domain.db.external|default([]) }}'
diff --git a/tasks/users/drush.yml b/tasks/users/drush.yml
index 6b92ccdbe8bc970bafcd9817fdfcb908eca383e7..2c8d7e778d0cf22bebb313afdb4d1690a6d33239 100644
--- a/tasks/users/drush.yml
+++ b/tasks/users/drush.yml
@@ -1,5 +1,6 @@
 ---
 # file: roles/drupal/tasks/users/drush.yml
 
-- set_fact:
+- name: Set facts
+  set_fact:
     dummy: yes
diff --git a/tasks/users/none.yml b/tasks/users/none.yml
index e71b820aa126c62ee444b45ebad2056e4aa8b1f0..d0de0f1e43ea238708ead469316fc1118e363ab8 100644
--- a/tasks/users/none.yml
+++ b/tasks/users/none.yml
@@ -1,5 +1,6 @@
 ---
 # file: roles/drupal/tasks/users/none.yml
 
-- set_fact:
+- name: Set facts
+  set_fact:
     dummy: yes
diff --git a/tasks/users/svn.yml b/tasks/users/svn.yml
index d46f39f23fc5a35e17fa989160481ad7757e4be7..671f216fd29804bb1f3e48ba8dba9d403cff63bd 100644
--- a/tasks/users/svn.yml
+++ b/tasks/users/svn.yml
@@ -1,5 +1,6 @@
 ---
 # file: roles/drupal/tasks/users/svn.yml
 
-- set_fact:
+- name: Set facts
+  set_fact:
     dummy: yes