diff --git a/apertis-ospack-basesdk.yaml b/apertis-ospack-basesdk.yaml
index 113261a6917768304a3eb443872f9b644623b862..8eef87471949639590f8ea1bb07f1849325da1b7 100644
--- a/apertis-ospack-basesdk.yaml
+++ b/apertis-ospack-basesdk.yaml
@@ -489,7 +489,10 @@ actions:
source: overlays/supported-locales
- action: overlay
- source: {{ printf "overlays/%s-platform" $architecture }}
+ source: overlays/initramfs-modules-amd64
+
+ - action: overlay
+ source: overlays/sdk-vboxvideo-workaround
- action: overlay
source: overlays/sdk-lightdm-autologin
diff --git a/apertis-ospack-devroot.yaml b/apertis-ospack-devroot.yaml
index 31c357586d5be3d590d3c77445ab6687d53e2a47..7b23a7fcdff747da236d86b5b27d3989ed3a18a2 100644
--- a/apertis-ospack-devroot.yaml
+++ b/apertis-ospack-devroot.yaml
@@ -385,15 +385,6 @@ actions:
- action: overlay
source: overlays/default-locale-c-utf8
- - action: overlay
- source: {{ printf "overlays/arch-%s" $type }}
-
- - action: overlay
- source: {{ printf "overlays/%s-platform" $architecture }}
-
- - action: overlay
- source: {{ printf "overlays/%s-%s" $architecture $type }}
-
- action: run
chroot: true
script: scripts/add-xdg-user-metadata.sh
diff --git a/apertis-ospack-minimal.yaml b/apertis-ospack-minimal.yaml
index 58dd370006c03f1a205a3c346d3b336d7d129c91..6954500320813dad03d9a8290900faeed2f2a946 100644
--- a/apertis-ospack-minimal.yaml
+++ b/apertis-ospack-minimal.yaml
@@ -84,14 +84,21 @@ actions:
- action: overlay
source: overlays/default-locale-c-utf8
+{{ if eq $architecture "amd64" }}
- action: overlay
- source: {{ printf "overlays/arch-%s" $type }}
+ source: overlays/initramfs-modules-amd64
+{{ end }}
+{{ if eq $architecture "armhf" }}
- action: overlay
- source: {{ printf "overlays/%s-platform" $architecture }}
+ source: overlays/initramfs-modules-imx6
+{{ end }}
- action: overlay
- source: {{ printf "overlays/%s-%s" $architecture $type }}
+ source: overlays/minimal-dpkg-exclusions
+
+ - action: overlay
+ source: overlays/minimal-ribchester-polkit-rules
- action: run
chroot: true
diff --git a/apertis-ospack-sdk.yaml b/apertis-ospack-sdk.yaml
index bb8bca03f8328fb22c14f7b36a187e6afd1eb8e0..45c88afe3fda83157bf8053568baef5fd91a2298 100644
--- a/apertis-ospack-sdk.yaml
+++ b/apertis-ospack-sdk.yaml
@@ -682,7 +682,10 @@ actions:
source: overlays/supported-locales
- action: overlay
- source: {{ printf "overlays/%s-platform" $architecture }}
+ source: overlays/initramfs-modules-amd64
+
+ - action: overlay
+ source: overlays/sdk-vboxvideo-workaround
- action: overlay
source: overlays/sdk-lightdm-autologin
diff --git a/apertis-ospack-sysroot.yaml b/apertis-ospack-sysroot.yaml
index 154fcc1f9bf47b9a028dc67b8c2b4917cb2486bd..96e64f26a4dd4122e7613d253aa2132baf9ee3f8 100644
--- a/apertis-ospack-sysroot.yaml
+++ b/apertis-ospack-sysroot.yaml
@@ -379,15 +379,6 @@ actions:
- action: overlay
source: overlays/default-locale-c-utf8
- - action: overlay
- source: {{ printf "overlays/arch-%s" $type }}
-
- - action: overlay
- source: {{ printf "overlays/%s-platform" $architecture }}
-
- - action: overlay
- source: {{ printf "overlays/%s-%s" $architecture $type }}
-
- action: run
chroot: true
script: scripts/add-xdg-user-metadata.sh
diff --git a/apertis-ospack-target.yaml b/apertis-ospack-target.yaml
index 0101c5b4561944239aa518ac7471496420a3f458..af396f205f84176514c5ed168cee8b04e9d51b42 100644
--- a/apertis-ospack-target.yaml
+++ b/apertis-ospack-target.yaml
@@ -212,14 +212,18 @@ actions:
- action: overlay
source: overlays/supported-locales
+{{ if eq $architecture "amd64" }}
- action: overlay
- source: {{ printf "overlays/arch-%s" $type }}
+ source: overlays/initramfs-modules-amd64
+{{ end }}
+{{ if eq $architecture "armhf" }}
- action: overlay
- source: {{ printf "overlays/%s-platform" $architecture }}
+ source: overlays/initramfs-modules-imx6
- action: overlay
- source: {{ printf "overlays/%s-%s" $architecture $type }}
+ source: overlays/pulseaudio-alternate-sample-rate-imx6
+{{ end }}
- action: run
chroot: true
diff --git a/overlays/amd64-devroot/.gitignore b/overlays/amd64-devroot/.gitignore
deleted file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000
diff --git a/overlays/amd64-minimal/.gitignore b/overlays/amd64-minimal/.gitignore
deleted file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000
diff --git a/overlays/amd64-sysroot/.gitignore b/overlays/amd64-sysroot/.gitignore
deleted file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000
diff --git a/overlays/amd64-target/.gitignore b/overlays/amd64-target/.gitignore
deleted file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000
diff --git a/overlays/arch-devroot/.gitignore b/overlays/arch-devroot/.gitignore
deleted file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000
diff --git a/overlays/arch-sysroot/.gitignore b/overlays/arch-sysroot/.gitignore
deleted file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000
diff --git a/overlays/arch-target/.gitignore b/overlays/arch-target/.gitignore
deleted file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000
diff --git a/overlays/arm64-devroot/.gitignore b/overlays/arm64-devroot/.gitignore
deleted file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000
diff --git a/overlays/arm64-minimal/.gitignore b/overlays/arm64-minimal/.gitignore
deleted file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000
diff --git a/overlays/arm64-platform/.gitignore b/overlays/arm64-platform/.gitignore
deleted file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000
diff --git a/overlays/arm64-sysroot/.gitignore b/overlays/arm64-sysroot/.gitignore
deleted file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000
diff --git a/overlays/arm64-target/.gitignore b/overlays/arm64-target/.gitignore
deleted file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000
diff --git a/overlays/armhf-devroot/.gitignore b/overlays/armhf-devroot/.gitignore
deleted file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000
diff --git a/overlays/armhf-minimal/.gitignore b/overlays/armhf-minimal/.gitignore
deleted file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000
diff --git a/overlays/armhf-sysroot/.gitignore b/overlays/armhf-sysroot/.gitignore
deleted file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000
diff --git a/overlays/armhf-target/.gitignore b/overlays/armhf-target/.gitignore
deleted file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000
diff --git a/overlays/amd64-platform/usr/share/initramfs-tools/modules.d/i915 b/overlays/initramfs-modules-amd64/usr/share/initramfs-tools/modules.d/i915
similarity index 100%
rename from overlays/amd64-platform/usr/share/initramfs-tools/modules.d/i915
rename to overlays/initramfs-modules-amd64/usr/share/initramfs-tools/modules.d/i915
diff --git a/overlays/amd64-platform/usr/share/initramfs-tools/modules.d/uvcvideo b/overlays/initramfs-modules-amd64/usr/share/initramfs-tools/modules.d/uvcvideo
similarity index 100%
rename from overlays/amd64-platform/usr/share/initramfs-tools/modules.d/uvcvideo
rename to overlays/initramfs-modules-amd64/usr/share/initramfs-tools/modules.d/uvcvideo
diff --git a/overlays/armhf-platform/etc/initramfs-tools/conf.d/modules b/overlays/initramfs-modules-imx6/etc/initramfs-tools/conf.d/modules
similarity index 100%
rename from overlays/armhf-platform/etc/initramfs-tools/conf.d/modules
rename to overlays/initramfs-modules-imx6/etc/initramfs-tools/conf.d/modules
diff --git a/overlays/armhf-platform/usr/share/initramfs-tools/modules.d/fs b/overlays/initramfs-modules-imx6/usr/share/initramfs-tools/modules.d/fs
similarity index 100%
rename from overlays/armhf-platform/usr/share/initramfs-tools/modules.d/fs
rename to overlays/initramfs-modules-imx6/usr/share/initramfs-tools/modules.d/fs
diff --git a/overlays/armhf-platform/usr/share/initramfs-tools/modules.d/sdhci b/overlays/initramfs-modules-imx6/usr/share/initramfs-tools/modules.d/sdhci
similarity index 100%
rename from overlays/armhf-platform/usr/share/initramfs-tools/modules.d/sdhci
rename to overlays/initramfs-modules-imx6/usr/share/initramfs-tools/modules.d/sdhci
diff --git a/overlays/arch-minimal/etc/dpkg/dpkg.cfg.d/apertis-minimal-exclusions b/overlays/minimal-dpkg-exclusions/etc/dpkg/dpkg.cfg.d/apertis-minimal-exclusions
similarity index 100%
rename from overlays/arch-minimal/etc/dpkg/dpkg.cfg.d/apertis-minimal-exclusions
rename to overlays/minimal-dpkg-exclusions/etc/dpkg/dpkg.cfg.d/apertis-minimal-exclusions
diff --git a/overlays/arch-minimal/etc/polkit-1/rules.d/60-apertis-minimal-user.rules b/overlays/minimal-ribchester-polkit-rules/etc/polkit-1/rules.d/60-apertis-minimal-user.rules
similarity index 100%
rename from overlays/arch-minimal/etc/polkit-1/rules.d/60-apertis-minimal-user.rules
rename to overlays/minimal-ribchester-polkit-rules/etc/polkit-1/rules.d/60-apertis-minimal-user.rules
diff --git a/overlays/armhf-target/etc/pulse/daemon.conf.d/fix-alternate-sample-rate.conf b/overlays/pulseaudio-alternate-sample-rate-imx6/etc/pulse/daemon.conf.d/fix-alternate-sample-rate.conf
similarity index 100%
rename from overlays/armhf-target/etc/pulse/daemon.conf.d/fix-alternate-sample-rate.conf
rename to overlays/pulseaudio-alternate-sample-rate-imx6/etc/pulse/daemon.conf.d/fix-alternate-sample-rate.conf
diff --git a/overlays/amd64-platform/etc/modprobe.d/apertis-blacklist-vboxvideo.conf b/overlays/sdk-vboxvideo-workaround/etc/modprobe.d/apertis-blacklist-vboxvideo.conf
similarity index 100%
rename from overlays/amd64-platform/etc/modprobe.d/apertis-blacklist-vboxvideo.conf
rename to overlays/sdk-vboxvideo-workaround/etc/modprobe.d/apertis-blacklist-vboxvideo.conf
diff --git a/overlays/amd64-platform/lib/systemd/system/graphical.target.wants/vboxvideo.service b/overlays/sdk-vboxvideo-workaround/lib/systemd/system/graphical.target.wants/vboxvideo.service
similarity index 100%
rename from overlays/amd64-platform/lib/systemd/system/graphical.target.wants/vboxvideo.service
rename to overlays/sdk-vboxvideo-workaround/lib/systemd/system/graphical.target.wants/vboxvideo.service
diff --git a/overlays/amd64-platform/lib/systemd/system/vboxvideo.service b/overlays/sdk-vboxvideo-workaround/lib/systemd/system/vboxvideo.service
similarity index 100%
rename from overlays/amd64-platform/lib/systemd/system/vboxvideo.service
rename to overlays/sdk-vboxvideo-workaround/lib/systemd/system/vboxvideo.service