diff --git a/roles/os_base/tasks/main.yml b/roles/os_base/tasks/main.yml
index d3599ea..fd381df 100644
--- a/roles/os_base/tasks/main.yml
+++ b/roles/os_base/tasks/main.yml
@@ -28,13 +28,13 @@
   ansible.builtin.lineinfile:
     path: /etc/hosts
     regexp: '^127\.0\.1\.1 '
-    line: '127.0.1.1 {{ system_fqdn }} {{ system_hostname }}'
+    line: '127.0.1.1  {{ system_fqdn }} {{ system_hostname }}'
     state: present
   register: machine_name_changed
 
 - name: "Apply system hostname (changed={{ machine_name_changed.changed }})"
   ansible.builtin.shell:
-    cmd: "test '{{ ansible_check_mode|lower }}' == true || hostnamectl set-hostname {{ system_fqdn }}"
+    cmd: "test '{{ ansible_check_mode|lower }}' == true || hostnamectl set-hostname {{ system_hostname }}"
   when: machine_name_changed.changed
   changed_when: true
   check_mode: false