diff --git a/images/almalinux.yaml b/images/almalinux.yaml
index 7e9dd0ea..cc5a182d 100644
--- a/images/almalinux.yaml
+++ b/images/almalinux.yaml
@@ -373,6 +373,13 @@ packages:
     - aaarch64
 
 actions:
+- trigger: post-unpack
+  action: |-
+    #!/bin/sh
+    # Make sure we have our template targets
+    touch /etc/hosts
+    touch /etc/hostname
+
 - trigger: post-unpack
   action: |-
     #!/bin/sh
diff --git a/images/amazonlinux.yaml b/images/amazonlinux.yaml
index f6ff457d..e9efe430 100644
--- a/images/amazonlinux.yaml
+++ b/images/amazonlinux.yaml
@@ -75,6 +75,13 @@ packages:
     action: install
 
 actions:
+- trigger: post-unpack
+  action: |-
+    #!/bin/sh
+    # Make sure we have our template targets
+    touch /etc/hosts
+    touch /etc/hostname
+
 - trigger: post-packages
   action: |-
     #!/bin/sh
diff --git a/images/centos.yaml b/images/centos.yaml
index 76ff9524..449d4563 100644
--- a/images/centos.yaml
+++ b/images/centos.yaml
@@ -643,6 +643,13 @@ packages:
     - aaarch64
 
 actions:
+- trigger: post-unpack
+  action: |-
+    #!/bin/sh
+    # Make sure we have our template targets
+    touch /etc/hosts
+    touch /etc/hostname
+
 - trigger: post-unpack
   action: |-
     #!/bin/sh
diff --git a/images/openeuler.yaml b/images/openeuler.yaml
index 4d92d32c..89d2fa72 100644
--- a/images/openeuler.yaml
+++ b/images/openeuler.yaml
@@ -308,6 +308,13 @@ packages:
     - aarch64
 
 actions:
+- trigger: post-unpack
+  action: |-
+    #!/bin/sh
+    # Make sure we have our template targets
+    touch /etc/hosts
+    touch /etc/hostname
+
 - trigger: post-unpack
   action: |-
     #!/bin/sh
diff --git a/images/oracle.yaml b/images/oracle.yaml
index 253d91a8..684b84b0 100644
--- a/images/oracle.yaml
+++ b/images/oracle.yaml
@@ -229,6 +229,13 @@ packages:
     - cloud
 
 actions:
+- trigger: post-unpack
+  action: |-
+    #!/bin/sh
+    # Make sure we have our template targets
+    touch /etc/hosts
+    touch /etc/hostname
+
 - trigger: post-packages
   action: |-
     #!/bin/sh
diff --git a/images/rockylinux.yaml b/images/rockylinux.yaml
index e8b71ae6..8734c475 100644
--- a/images/rockylinux.yaml
+++ b/images/rockylinux.yaml
@@ -329,6 +329,13 @@ packages:
     - aaarch64
 
 actions:
+- trigger: post-unpack
+  action: |-
+    #!/bin/sh
+    # Make sure we have our template targets
+    touch /etc/hosts
+    touch /etc/hostname
+
 - trigger: post-unpack
   action: |-
     #!/bin/sh
diff --git a/images/springdalelinux.yaml b/images/springdalelinux.yaml
index da0cdae8..c5525a1f 100644
--- a/images/springdalelinux.yaml
+++ b/images/springdalelinux.yaml
@@ -369,6 +369,13 @@ packages:
     - x86_64
 
 actions:
+- trigger: post-unpack
+  action: |-
+    #!/bin/sh
+    # Make sure we have our template targets
+    touch /etc/hosts
+    touch /etc/hostname
+
 - trigger: post-unpack
   action: |-
     #!/bin/sh