diff --git a/templates/hosts.alpine.tmpl b/templates/hosts.alpine.tmpl
index 98ae55e698e..9177b363ec6 100644
--- a/templates/hosts.alpine.tmpl
+++ b/templates/hosts.alpine.tmpl
@@ -13,13 +13,12 @@ you need to add the following to config:
 #     /etc/cloud/cloud.cfg or cloud-config from user-data
 #
 # The following lines are desirable for IPv4 capable hosts
-127.0.1.1 {{hostname}} {{fqdn}}
-127.0.0.1 localhost localhost.localdomain
-127.0.0.1 localhost4 localhost4.localdomain4
+127.0.0.1 localhost.localdomain localhost
+127.0.0.1 localhost4.localdomain4 localhost4
+127.0.1.1 {{fqdn}} {{hostname}}
 
 # The following lines are desirable for IPv6 capable hosts
-::1 {{hostname}} {{fqdn}}
-::1 localhost6 localhost6.localdomain6
+::1 localhost6.localdomain6 localhost6
 
 ff02::1 ip6-allnodes
 ff02::2 ip6-allrouters
diff --git a/templates/hosts.mariner.tmpl b/templates/hosts.mariner.tmpl
index 7787c367780..e223939c1fd 100644
--- a/templates/hosts.mariner.tmpl
+++ b/templates/hosts.mariner.tmpl
@@ -1,22 +1,22 @@
-+## template:jinja
-+{#
-+This file /etc/cloud/templates/hosts.mariner.tmpl is only utilized
-+if enabled in cloud-config.  Specifically, in order to enable it
-+you need to add the following to config:
-+  manage_etc_hosts: True
-+-#}
-+# Your system has configured 'manage_etc_hosts' as True.
-+# As a result, if you wish for changes to this file to persist
-+# then you will need to either
-+# a.) make changes to the master file in /etc/cloud/templates/hosts.mariner.tmpl
-+# b.) change or remove the value of 'manage_etc_hosts' in
-+#     /etc/cloud/cloud.cfg or cloud-config from user-data
-+#
-+# The following lines are desirable for IPv4 capable hosts
-+127.0.0.1 {{fqdn}} {{hostname}}
-+127.0.0.1 localhost.localdomain localhost
-+127.0.0.1 localhost4.localdomain4 localhost4
-+
-+# The following lines are desirable for IPv6 capable hosts
-+::1 {{fqdn}} {{hostname}}
-+::1 localhost6.localdomain6 localhost6
+## template:jinja
+{#
+This file /etc/cloud/templates/hosts.mariner.tmpl is only utilized
+if enabled in cloud-config.  Specifically, in order to enable it
+you need to add the following to config:
+  manage_etc_hosts: True
+-#}
+# Your system has configured 'manage_etc_hosts' as True.
+# As a result, if you wish for changes to this file to persist
+# then you will need to either
+# a.) make changes to the master file in /etc/cloud/templates/hosts.mariner.tmpl
+# b.) change or remove the value of 'manage_etc_hosts' in
+#     /etc/cloud/cloud.cfg or cloud-config from user-data
+#
+# The following lines are desirable for IPv4 capable hosts
+127.0.0.1 {{fqdn}} {{hostname}}
+127.0.0.1 localhost.localdomain localhost
+127.0.0.1 localhost4.localdomain4 localhost4
+
+# The following lines are desirable for IPv6 capable hosts
+::1 {{fqdn}} {{hostname}}
+::1 localhost6.localdomain6 localhost6