diff --git a/roles/backup/molecule/default/converge.yml b/roles/backup/molecule/default/converge.yml
index ed8fe429883e872585a74322f8a021a03d24487f..7d352e716a5eef05172ff945ec8f966335f397b8 100644
--- a/roles/backup/molecule/default/converge.yml
+++ b/roles/backup/molecule/default/converge.yml
@@ -1,6 +1,7 @@
 ---
 
-- hosts: parameters-mandatory,parameters-optional
+- name: Converge
+  hosts: parameters-mandatory,parameters-optional
   become: true
   roles:
     - backup
diff --git a/roles/backup_client/molecule/default/converge.yml b/roles/backup_client/molecule/default/converge.yml
index 3d266035f2eb64f6c63afac31c16fc257c99a37d..fe337508153b1db6ad31197e8bf927ed1393853b 100644
--- a/roles/backup_client/molecule/default/converge.yml
+++ b/roles/backup_client/molecule/default/converge.yml
@@ -1,12 +1,14 @@
 ---
 
-- hosts: parameters-mandatory,parameters-optional
+- name: Converge
+  hosts: parameters-mandatory,parameters-optional
   become: true
   roles:
     - backup_client
 
 # Deploy a dummy pre-backup script for testing purposes.
-- hosts: parameters-mandatory,parameters-optional
+- name: Converge, test fixtures
+  hosts: parameters-mandatory,parameters-optional
   become: true
   tasks:
 
diff --git a/roles/backup_server/molecule/default/converge.yml b/roles/backup_server/molecule/default/converge.yml
index 1ed9e0ca8f68e8755adaf280f89e1adcf0cbc7d9..377bf62d65a790006bb52a929ba2dc681c5602ac 100644
--- a/roles/backup_server/molecule/default/converge.yml
+++ b/roles/backup_server/molecule/default/converge.yml
@@ -1,6 +1,7 @@
 ---
 
-- hosts: parameters-mandatory,parameters-optional
+- name: Converge
+  hosts: parameters-mandatory,parameters-optional
   become: true
   roles:
     - backup_server
diff --git a/roles/bootstrap/molecule/default/converge.yml b/roles/bootstrap/molecule/default/converge.yml
index f8d6d4e039d85a69e67f18e046d8b489262e826b..0415e850229058b2d0a58a3136a2ed2033de3ef9 100644
--- a/roles/bootstrap/molecule/default/converge.yml
+++ b/roles/bootstrap/molecule/default/converge.yml
@@ -1,6 +1,7 @@
 ---
 
-- hosts: parameters-mandatory,parameters-optional
+- name: Converge
+  hosts: parameters-mandatory,parameters-optional
   become: true
   roles:
     - bootstrap
diff --git a/roles/common/molecule/default/converge.yml b/roles/common/molecule/default/converge.yml
index f5717e7309012549c92b471c713dd321dd22ce0d..e0bfdad39269d60ee6914dd7464e28e08846aaa3 100644
--- a/roles/common/molecule/default/converge.yml
+++ b/roles/common/molecule/default/converge.yml
@@ -1,11 +1,13 @@
 ---
 
-- hosts: parameters-mandatory,parameters-optional
+- name: Converge
+  hosts: parameters-mandatory,parameters-optional
   become: true
   roles:
     - common
 
-- hosts: parameters-mandatory,parameters-optional
+- name: Converge, test fixtures
+  hosts: parameters-mandatory,parameters-optional
   become: true
   tasks:
 
diff --git a/roles/database/molecule/default/converge.yml b/roles/database/molecule/default/converge.yml
index 43e8d21aa7cbedd496c2001996bfaf2cca93be8c..7f84ffa151938e63d4ea2ffb501cbadad2688d73 100644
--- a/roles/database/molecule/default/converge.yml
+++ b/roles/database/molecule/default/converge.yml
@@ -1,7 +1,8 @@
 ---
 
 
-- hosts: parameters-mandatory,parameters-optional
+- name: Converge
+  hosts: parameters-mandatory,parameters-optional
   become: true
   roles:
     - database
diff --git a/roles/database_server/molecule/default/converge.yml b/roles/database_server/molecule/default/converge.yml
index 0edd6fa0a1291668f9561a6c58199687a89bd06f..63497ee45c0ef64aa85837ad7895d03d67d4745d 100644
--- a/roles/database_server/molecule/default/converge.yml
+++ b/roles/database_server/molecule/default/converge.yml
@@ -1,6 +1,7 @@
 ---
 
-- hosts: parameters-mandatory
+- name: Converge
+  hosts: parameters-mandatory
   become: true
   roles:
     - database_server
diff --git a/roles/ldap_client/molecule/default/converge.yml b/roles/ldap_client/molecule/default/converge.yml
index 384c7fa6f0e871cfc657b2ff9bbed420e61f5e7f..e2cb0ae9102f9c7e8cf015ecf8fc2ad49b09e2b7 100644
--- a/roles/ldap_client/molecule/default/converge.yml
+++ b/roles/ldap_client/molecule/default/converge.yml
@@ -1,6 +1,7 @@
 ---
 
-- hosts: parameters-mandatory,parameters-optional
+- name: Converge
+  hosts: parameters-mandatory,parameters-optional
   become: true
   roles:
     - ldap_client
diff --git a/roles/ldap_server/molecule/default/converge.yml b/roles/ldap_server/molecule/default/converge.yml
index de7f80f63f00a32fc3b05f340dc035ef083bc220..350dfa64d74ee321e856fcf8a5a9f1dfdeb457c1 100644
--- a/roles/ldap_server/molecule/default/converge.yml
+++ b/roles/ldap_server/molecule/default/converge.yml
@@ -1,6 +1,7 @@
 ---
 
-- hosts: parameters-mandatory,parameters-optional
+- name: Converge
+  hosts: parameters-mandatory,parameters-optional
   become: true
   roles:
     - ldap_server
diff --git a/roles/mail_forwarder/molecule/default/converge.yml b/roles/mail_forwarder/molecule/default/converge.yml
index 60ff856f3fa8872ff79627c723791b8435653e45..377c06fcd1621708e2b5b84139cb54cd6ecd0cfb 100644
--- a/roles/mail_forwarder/molecule/default/converge.yml
+++ b/roles/mail_forwarder/molecule/default/converge.yml
@@ -1,6 +1,7 @@
 ---
 
-- hosts: parameters-mandatory,parameters-optional,parameters-no-incoming
+- name: Converge
+  hosts: parameters-mandatory,parameters-optional,parameters-no-incoming
   become: true
   roles:
     - mail_forwarder
diff --git a/roles/mail_server/molecule/default/converge.yml b/roles/mail_server/molecule/default/converge.yml
index a8b851a6e3a61d489d48ab72b8171509da1c0c66..b21cafffd8d17fc6d05309dac179d6058b007ee3 100644
--- a/roles/mail_server/molecule/default/converge.yml
+++ b/roles/mail_server/molecule/default/converge.yml
@@ -1,6 +1,7 @@
 ---
 
-- hosts: parameters-mandatory,parameters-optional
+- name: Converge
+  hosts: parameters-mandatory,parameters-optional
   become: true
   roles:
     - mail_server
diff --git a/roles/php_website/molecule/default/converge.yml b/roles/php_website/molecule/default/converge.yml
index 9e628e02fad63b87c15e014ca273952bce9081bd..237294d609fb4b30448d8d0dec30bbca8c3706c9 100644
--- a/roles/php_website/molecule/default/converge.yml
+++ b/roles/php_website/molecule/default/converge.yml
@@ -1,6 +1,7 @@
 ---
 
-- hosts: all
+- name: Converge
+  hosts: all
   become: true
   vars:
     # common
@@ -50,7 +51,8 @@
       uid: 5001
       website_mail_recipients: user
 
-- hosts: all
+- name: Converge, application
+  hosts: all
   become: true
   tasks:
     # parameters-mandatory application
diff --git a/roles/preseed/molecule/default/converge.yml b/roles/preseed/molecule/default/converge.yml
index 2c22a1f59ada6422fcbe90612b0d29a36feb5b39..55a935225837ef09df9d407e99729ac05c4d546d 100644
--- a/roles/preseed/molecule/default/converge.yml
+++ b/roles/preseed/molecule/default/converge.yml
@@ -1,5 +1,6 @@
 ---
 
-- hosts: parameters-mandatory,parameters-optional,parameters-optional-with-overrides
+- name: Converge
+  hosts: parameters-mandatory,parameters-optional,parameters-optional-with-overrides
   roles:
     - preseed
diff --git a/roles/web_server/molecule/default/converge.yml b/roles/web_server/molecule/default/converge.yml
index 23f369a216dd1f2fe122f8b7745723f3d0945fe9..9596bc951870f28fc16039c3c7d269c6ce753be4 100644
--- a/roles/web_server/molecule/default/converge.yml
+++ b/roles/web_server/molecule/default/converge.yml
@@ -1,6 +1,7 @@
 ---
 
-- hosts: parameters-mandatory,parameters-optional
+- name: Converge
+  hosts: parameters-mandatory,parameters-optional
   become: true
   roles:
     - web_server
diff --git a/roles/wsgi_website/molecule/default/converge.yml b/roles/wsgi_website/molecule/default/converge.yml
index 6d6f16968493609523642b0d85b098b13bd1a6a0..dde593bf8abab9b6cecfe1b999ed0ff1eb5618e6 100644
--- a/roles/wsgi_website/molecule/default/converge.yml
+++ b/roles/wsgi_website/molecule/default/converge.yml
@@ -1,6 +1,7 @@
 ---
 
-- hosts: wsgi-website
+- name: Converge
+  hosts: wsgi-website
   become: true
   vars:
     # common
@@ -90,7 +91,8 @@
       https_tls_certificate: "{{ lookup('file', 'tests/data/x509/server/parameters-paste-req_https.cert.pem') }}"
       https_tls_key: "{{ lookup('file', 'tests/data/x509/server/parameters-paste-req_https.key.pem') }}"
 
-- hosts: wsgi-website
+- name: Converge, application
+  hosts: wsgi-website
   become: true
   tasks:
     # parameters-mandatory application
diff --git a/roles/xmpp_server/molecule/default/converge.yml b/roles/xmpp_server/molecule/default/converge.yml
index 28027f6e59874d5ac59044ec106661d2b9e80c76..3b411a2ec164032ea9bb0deadf20e12e2f13c03f 100644
--- a/roles/xmpp_server/molecule/default/converge.yml
+++ b/roles/xmpp_server/molecule/default/converge.yml
@@ -1,6 +1,7 @@
 ---
 
-- hosts: parameters-mandatory,parameters-optional
+- name: Converge
+  hosts: parameters-mandatory,parameters-optional
   become: true
   roles:
     - xmpp_server