diff --git a/apertis-ospack-basesdk.yaml b/apertis-ospack-basesdk.yaml
index ffe64a0245ce8b924f3b24385f810e0fee8a18eb..113261a6917768304a3eb443872f9b644623b862 100644
--- a/apertis-ospack-basesdk.yaml
+++ b/apertis-ospack-basesdk.yaml
@@ -474,7 +474,19 @@ actions:
       - yelp-tools
 
   - action: overlay
-    source: overlays/arch-platform
+    source: overlays/hostname
+
+  - action: overlay
+    source: overlays/default-hosts
+
+  - action: overlay
+    source: overlays/loopback-interface
+
+  - action: overlay
+    source: overlays/default-locale-c-utf8
+
+  - action: overlay
+    source: overlays/supported-locales
 
   - action: overlay
     source: {{ printf "overlays/%s-platform" $architecture }}
diff --git a/apertis-ospack-devroot.yaml b/apertis-ospack-devroot.yaml
index db04455f4ad1c7f1302a827713d07934a8f64fc6..31c357586d5be3d590d3c77445ab6687d53e2a47 100644
--- a/apertis-ospack-devroot.yaml
+++ b/apertis-ospack-devroot.yaml
@@ -374,7 +374,16 @@ actions:
   {{ end }}
 
   - action: overlay
-    source: overlays/arch-platform
+    source: overlays/hostname
+
+  - action: overlay
+    source: overlays/default-hosts
+
+  - action: overlay
+    source: overlays/loopback-interface
+
+  - action: overlay
+    source: overlays/default-locale-c-utf8
 
   - action: overlay
     source: {{ printf "overlays/arch-%s" $type }}
diff --git a/apertis-ospack-minimal.yaml b/apertis-ospack-minimal.yaml
index f8c7b9d0c98d6a0f35ff94de752dee62a38a7282..58dd370006c03f1a205a3c346d3b336d7d129c91 100644
--- a/apertis-ospack-minimal.yaml
+++ b/apertis-ospack-minimal.yaml
@@ -73,7 +73,16 @@ actions:
       - vim.tiny
 
   - action: overlay
-    source: overlays/arch-platform
+    source: overlays/hostname
+
+  - action: overlay
+    source: overlays/default-hosts
+
+  - action: overlay
+    source: overlays/loopback-interface
+
+  - action: overlay
+    source: overlays/default-locale-c-utf8
 
   - action: overlay
     source: {{ printf "overlays/arch-%s" $type }}
diff --git a/apertis-ospack-sdk.yaml b/apertis-ospack-sdk.yaml
index 124f32aee00a6458c810fdb23054f650a3ab0f41..bb8bca03f8328fb22c14f7b36a187e6afd1eb8e0 100644
--- a/apertis-ospack-sdk.yaml
+++ b/apertis-ospack-sdk.yaml
@@ -667,7 +667,19 @@ actions:
       - traprain-mock-service
 
   - action: overlay
-    source: overlays/arch-platform
+    source: overlays/hostname
+
+  - action: overlay
+    source: overlays/default-hosts
+
+  - action: overlay
+    source: overlays/loopback-interface
+
+  - action: overlay
+    source: overlays/default-locale-c-utf8
+
+  - action: overlay
+    source: overlays/supported-locales
 
   - action: overlay
     source: {{ printf "overlays/%s-platform" $architecture }}
diff --git a/apertis-ospack-sysroot.yaml b/apertis-ospack-sysroot.yaml
index 94bdcdd578f7c25f8229c45ed79eaf2970e8f81f..154fcc1f9bf47b9a028dc67b8c2b4917cb2486bd 100644
--- a/apertis-ospack-sysroot.yaml
+++ b/apertis-ospack-sysroot.yaml
@@ -374,7 +374,10 @@ actions:
   {{ end }}
 
   - action: overlay
-    source: overlays/arch-platform
+    source: overlays/hostname
+
+  - action: overlay
+    source: overlays/default-locale-c-utf8
 
   - action: overlay
     source: {{ printf "overlays/arch-%s" $type }}
diff --git a/apertis-ospack-target.yaml b/apertis-ospack-target.yaml
index efdf864affdaaf048129172e8583b6999fd820f9..0101c5b4561944239aa518ac7471496420a3f458 100644
--- a/apertis-ospack-target.yaml
+++ b/apertis-ospack-target.yaml
@@ -198,7 +198,19 @@ actions:
   {{ end }}
 
   - action: overlay
-    source: overlays/arch-platform
+    source: overlays/hostname
+
+  - action: overlay
+    source: overlays/default-hosts
+
+  - action: overlay
+    source: overlays/loopback-interface
+
+  - action: overlay
+    source: overlays/default-locale-c-utf8
+
+  - action: overlay
+    source: overlays/supported-locales
 
   - action: overlay
     source: {{ printf "overlays/arch-%s" $type }}
diff --git a/overlays/arch-platform/etc/hosts b/overlays/default-hosts/etc/hosts
similarity index 100%
rename from overlays/arch-platform/etc/hosts
rename to overlays/default-hosts/etc/hosts
diff --git a/overlays/arch-platform/etc/default/locale b/overlays/default-locale-c-utf8/etc/default/locale
similarity index 100%
rename from overlays/arch-platform/etc/default/locale
rename to overlays/default-locale-c-utf8/etc/default/locale
diff --git a/overlays/arch-platform/etc/hostname b/overlays/hostname/etc/hostname
similarity index 100%
rename from overlays/arch-platform/etc/hostname
rename to overlays/hostname/etc/hostname
diff --git a/overlays/arch-platform/etc/network/interfaces b/overlays/loopback-interface/etc/network/interfaces
similarity index 100%
rename from overlays/arch-platform/etc/network/interfaces
rename to overlays/loopback-interface/etc/network/interfaces
diff --git a/overlays/arch-platform/var/lib/locales/supported.d/local b/overlays/supported-locales/var/lib/locales/supported.d/local
similarity index 100%
rename from overlays/arch-platform/var/lib/locales/supported.d/local
rename to overlays/supported-locales/var/lib/locales/supported.d/local