diff --git a/bhyve.yml b/bhyve.yml
index 8b351e9..58099a9 100644
--- a/bhyve.yml
+++ b/bhyve.yml
@@ -1,19 +1,18 @@
 ---
-- hosts:
-  - localhost
-  
-  become: yes
+- name: Install py-netaddr
+  hosts:
+    - localhost
+  become: true
   tasks:
     - name: Install py-netaddr package
-      package:
+      ansible.builtin.package:
         name: net/py-netaddr
         state: present
 
-- hosts:
+- name: Deploy bhyve to virtual machine hosts
+  hosts:
     - emma
-
-  become: yes
+  become: true
   tags: bhyve
-
   roles:
     - bhyve
diff --git a/debian.yml b/debian.yml
index a80ff5f..357aefd 100644
--- a/debian.yml
+++ b/debian.yml
@@ -1,5 +1,6 @@
 ---
-- hosts: debian
-  become: yes
+- name: Prepare debian hosts
+  hosts: debian
+  become: true
   roles:
     - debian
diff --git a/dns.yml b/dns.yml
index 643ef12..c2baac9 100644
--- a/dns.yml
+++ b/dns.yml
@@ -1,9 +1,8 @@
 ---
-- hosts:
+- name: Deploy DNS servers
+  hosts:
     - mail
-
-  become: yes
-
+  become: true
   roles:
     - nsd
     - unbound
diff --git a/gitea.yml b/gitea.yml
index 9568c18..ea40448 100644
--- a/gitea.yml
+++ b/gitea.yml
@@ -1,6 +1,7 @@
 ---
-- hosts: gitea
-  become: yes
+- name: Deploy Forgejo
+  hosts: gitea
+  become: true
   roles:
     - gitea
     - gitea-ccchb
diff --git a/haproxy.yml b/haproxy.yml
index ec2039f..dcadf81 100644
--- a/haproxy.yml
+++ b/haproxy.yml
@@ -1,8 +1,7 @@
 ---
-- hosts:
+- name: Deploy haproxy
+  hosts:
     - emma
-
-  become: yes
-
+  become: true
   roles:
     - haproxy
diff --git a/jabber.yml b/jabber.yml
index 7ecba0d..74cc4b6 100644
--- a/jabber.yml
+++ b/jabber.yml
@@ -1,7 +1,8 @@
 ---
-- hosts:
+- name: Deploy XMPP server
+  hosts:
     - jabber
-  become: yes
+  become: true
   tags: [jabber]
   roles:
     - certbot
diff --git a/mail.yml b/mail.yml
index b03606c..b6ff43c 100644
--- a/mail.yml
+++ b/mail.yml
@@ -1,20 +1,18 @@
 ---
-- hosts:
+- name: Install passlib
+  hosts:
     - localhost
-
-  become: yes
-
+  become: true
   tasks:
     - name: Install passlib
-      package:
+      ansible.builtin.package:
         name: py39-passlib
         state: present
 
-- hosts:
+- name: Deploy mail servers
+  hosts:
     - mail
-
-  become: yes
-
+  become: true
   roles:
     - dovecot
     - rspamd
diff --git a/nextcloud.yml b/nextcloud.yml
index a363adf..e0c978d 100644
--- a/nextcloud.yml
+++ b/nextcloud.yml
@@ -1,5 +1,6 @@
 ---
-- hosts: nextcloud
-  become: yes
+- name: Deploy NextCloud
+  hosts: nextcloud
+  become: true
   roles:
     - nextcloud
diff --git a/ntp.yml b/ntp.yml
index 9c8b356..3c6afce 100644
--- a/ntp.yml
+++ b/ntp.yml
@@ -1,8 +1,7 @@
 ---
-- hosts:
+- name: Deploy local NTP server
+  hosts:
     - mail
-
-  become: yes
-
+  become: true
   roles:
     - openntpd
diff --git a/restic.yml b/restic.yml
index 2a9358d..10b5802 100644
--- a/restic.yml
+++ b/restic.yml
@@ -1,8 +1,7 @@
 ---
-- hosts:
+- name: Deploy restic
+  hosts:
     - mail
-
-  become: yes
-
+  become: true
   roles:
     - restic
diff --git a/s6.yml b/s6.yml
index 8b773d6..f24b005 100644
--- a/s6.yml
+++ b/s6.yml
@@ -1,8 +1,7 @@
 ---
-- hosts:
+- name: Deploy s6 on FreeBSD
+  hosts:
     - emma
-
-  become: yes
-
+  become: true
   roles:
     - s6-rc
diff --git a/users.yml b/users.yml
index ea6b615..41abe04 100644
--- a/users.yml
+++ b/users.yml
@@ -1,6 +1,7 @@
 ---
-- hosts: debian frab
-  become: yes
+- name: Perform user management
+  hosts: debian frab
+  become: true
   tags: [user_mgmt]
   roles:
     - user_mgmt
diff --git a/wiki.yml b/wiki.yml
index a42dc86..107c6c2 100644
--- a/wiki.yml
+++ b/wiki.yml
@@ -1,7 +1,8 @@
 ---
-- hosts:
+- name: Deploy MediaWiki
+  hosts:
     - wiki
-  become: yes
+  become: true
   roles:
     - mediawiki
     - certbot