diff --git a/hostname.yml b/hostname.yml
new file mode 100644
index 0000000..cf3667c
--- /dev/null
+++ b/hostname.yml
@@ -0,0 +1,5 @@
+- hosts: all
+  tasks:
+  - name: ensure hostname is set
+    hostname:
+      name={{ preferred_hostname|d(inventory_hostname) }}