diff --git a/roles/0-init/tasks/hostname.yml b/roles/0-init/tasks/hostname.yml
index 024e6244b..e8455472c 100644
--- a/roles/0-init/tasks/hostname.yml
+++ b/roles/0-init/tasks/hostname.yml
@@ -11,8 +11,10 @@
     state: present
   when: cloudcfg_test.stat.exists
 
-- name: 'Turn the crank for systemd: hostnamectl set-hostname "{{ iiab_hostname }}.{{ iiab_domain }}"'
-  command: hostnamectl set-hostname "{{ iiab_hostname }}.{{ iiab_domain }}"
+- name: 'Set /etc/hostname by running: hostnamectl set-hostname "{{ iiab_hostname }}"'
+  command: hostnamectl set-hostname "{{ iiab_hostname }}"
+  # 2021-08-31: Periods in /etc/hostname fail with some WiFi routers (#2904)
+  # command: hostnamectl set-hostname "{{ iiab_hostname }}.{{ iiab_domain }}"
 
 #- name: Install /etc/sysconfig/network from template (redhat)
 #  template: