diff --git a/roles/0-init/tasks/hostname.yml b/roles/0-init/tasks/hostname.yml
index 398dd0455..a2f9ea1c3 100644
--- a/roles/0-init/tasks/hostname.yml
+++ b/roles/0-init/tasks/hostname.yml
@@ -1,3 +1,16 @@
+- name: Is ubuntu-18 server
+  stat:
+    path: /etc/cloud/cloud.cfg
+  register: U18_server
+
+- name: edit cloud.cfg yaml
+  lineinfile:
+    dest: /etc/cloud/cloud.cfg
+    regexp: '^preserve_hostname*'
+    line: 'preserve_hostname: true'
+    state: present
+  when: U18_server is defined and U18_server.stat.exists
+
 - name: Turn the crank for systemd (debuntu)
   shell: hostnamectl set-hostname "{{ iiab_hostname }}.{{ iiab_domain }}"
   when: is_debuntu
diff --git a/roles/0-init/tasks/main.yml b/roles/0-init/tasks/main.yml
index c731a6a6a..be0b3f540 100644
--- a/roles/0-init/tasks/main.yml
+++ b/roles/0-init/tasks/main.yml
@@ -161,6 +161,10 @@
     FQDN_changed: True
   when: iiab_fqdn != ansible_fqdn
 
+- name: Setting hostname
+  include_tasks: hostname.yml
+  when: FQDN_changed
+
 - name: Add version section
   ini_file:
     dest: "{{ iiab_config_file }}"