diff --git a/apertis-ospack-basesdk.yaml b/apertis-ospack-basesdk.yaml
index 8bb507227e424e5ce603abe1980236d74b916b74..ffe64a0245ce8b924f3b24385f810e0fee8a18eb 100644
--- a/apertis-ospack-basesdk.yaml
+++ b/apertis-ospack-basesdk.yaml
@@ -477,13 +477,19 @@ actions:
source: overlays/arch-platform
- action: overlay
- source: {{ printf "overlays/arch-%s" $type }}
+ source: {{ printf "overlays/%s-platform" $architecture }}
- action: overlay
- source: {{ printf "overlays/%s-platform" $architecture }}
+ source: overlays/sdk-lightdm-autologin
+
+ - action: overlay
+ source: overlays/sdk-mount-opt-sysroot
+
+ - action: overlay
+ source: overlays/sdk-xfce-theme
- action: overlay
- source: {{ printf "overlays/%s-%s" $architecture $type }}
+ source: overlays/sdk-desktop-icon-devhelp/
- action: run
chroot: true
diff --git a/apertis-ospack-sdk.yaml b/apertis-ospack-sdk.yaml
index 02c7cf2df9678cd19b7db493073e7ed71183c8c5..124f32aee00a6458c810fdb23054f650a3ab0f41 100644
--- a/apertis-ospack-sdk.yaml
+++ b/apertis-ospack-sdk.yaml
@@ -670,13 +670,22 @@ actions:
source: overlays/arch-platform
- action: overlay
- source: {{ printf "overlays/arch-%s" $type }}
+ source: {{ printf "overlays/%s-platform" $architecture }}
- action: overlay
- source: {{ printf "overlays/%s-platform" $architecture }}
+ source: overlays/sdk-lightdm-autologin
+
+ - action: overlay
+ source: overlays/sdk-mount-opt-sysroot
+
+ - action: overlay
+ source: overlays/sdk-xfce-theme
+
+ - action: overlay
+ source: overlays/sdk-desktop-icon-devhelp/
- action: overlay
- source: {{ printf "overlays/%s-%s" $architecture $type }}
+ source: overlays/sdk-desktop-icon-eclipse
- action: run
chroot: true
diff --git a/overlays/amd64-basesdk/.gitignore b/overlays/amd64-basesdk/.gitignore
deleted file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000
diff --git a/overlays/amd64-sdk/.gitignore b/overlays/amd64-sdk/.gitignore
deleted file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000
diff --git a/overlays/arch-basesdk b/overlays/arch-basesdk
deleted file mode 120000
index 73894bdef6474509b36532bf6490b748b9f750f7..0000000000000000000000000000000000000000
--- a/overlays/arch-basesdk
+++ /dev/null
@@ -1 +0,0 @@
-arch-sdk
\ No newline at end of file
diff --git a/overlays/arch-sdk/etc/lightdm/lightdm.conf.d/autologin.conf b/overlays/sdk-desktop-icon-devhelp/etc/lightdm/lightdm.conf.d/autologin.conf
similarity index 100%
rename from overlays/arch-sdk/etc/lightdm/lightdm.conf.d/autologin.conf
rename to overlays/sdk-desktop-icon-devhelp/etc/lightdm/lightdm.conf.d/autologin.conf
diff --git a/overlays/arch-sdk/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-desktop.xml b/overlays/sdk-desktop-icon-devhelp/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-desktop.xml
similarity index 100%
rename from overlays/arch-sdk/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-desktop.xml
rename to overlays/sdk-desktop-icon-devhelp/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-desktop.xml
diff --git a/overlays/arch-sdk/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xsettings.xml b/overlays/sdk-desktop-icon-devhelp/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xsettings.xml
similarity index 100%
rename from overlays/arch-sdk/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xsettings.xml
rename to overlays/sdk-desktop-icon-devhelp/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xsettings.xml
diff --git a/overlays/arch-sdk/etc/skel/Desktop/devhelp.desktop b/overlays/sdk-desktop-icon-devhelp/etc/skel/Desktop/devhelp.desktop
similarity index 100%
rename from overlays/arch-sdk/etc/skel/Desktop/devhelp.desktop
rename to overlays/sdk-desktop-icon-devhelp/etc/skel/Desktop/devhelp.desktop
diff --git a/overlays/arch-sdk/etc/skel/Desktop/eclipse.desktop b/overlays/sdk-desktop-icon-devhelp/etc/skel/Desktop/eclipse.desktop
similarity index 100%
rename from overlays/arch-sdk/etc/skel/Desktop/eclipse.desktop
rename to overlays/sdk-desktop-icon-devhelp/etc/skel/Desktop/eclipse.desktop
diff --git a/overlays/arch-sdk/lib/systemd/system/opt-sysroot.mount b/overlays/sdk-desktop-icon-devhelp/lib/systemd/system/opt-sysroot.mount
similarity index 100%
rename from overlays/arch-sdk/lib/systemd/system/opt-sysroot.mount
rename to overlays/sdk-desktop-icon-devhelp/lib/systemd/system/opt-sysroot.mount
diff --git a/overlays/arch-sdk/usr/share/sac-sdk/wallpapers/apertis-desktop.png b/overlays/sdk-desktop-icon-devhelp/usr/share/sac-sdk/wallpapers/apertis-desktop.png
similarity index 100%
rename from overlays/arch-sdk/usr/share/sac-sdk/wallpapers/apertis-desktop.png
rename to overlays/sdk-desktop-icon-devhelp/usr/share/sac-sdk/wallpapers/apertis-desktop.png
diff --git a/overlays/sdk-desktop-icon-eclipse/etc/skel/Desktop/eclipse.desktop b/overlays/sdk-desktop-icon-eclipse/etc/skel/Desktop/eclipse.desktop
new file mode 100755
index 0000000000000000000000000000000000000000..f63d9ec9f5006d675b52fae73afa4794d6df44de
--- /dev/null
+++ b/overlays/sdk-desktop-icon-eclipse/etc/skel/Desktop/eclipse.desktop
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Type=Application
+Name=Eclipse
+Comment=Eclipse Integrated Development Environment
+Icon=eclipse
+Exec=eclipse
+Terminal=false
+Categories=Development;IDE;Java;
diff --git a/overlays/sdk-lightdm-autologin/etc/lightdm/lightdm.conf.d/autologin.conf b/overlays/sdk-lightdm-autologin/etc/lightdm/lightdm.conf.d/autologin.conf
new file mode 100644
index 0000000000000000000000000000000000000000..dfce8dd47f8fe1c0a292b23199c3132ea84bf686
--- /dev/null
+++ b/overlays/sdk-lightdm-autologin/etc/lightdm/lightdm.conf.d/autologin.conf
@@ -0,0 +1,4 @@
+[Seat:*]
+user-session=xfce
+autologin-user=user
+autologin-user-timeout=0
diff --git a/overlays/sdk-mount-opt-sysroot/lib/systemd/system/opt-sysroot.mount b/overlays/sdk-mount-opt-sysroot/lib/systemd/system/opt-sysroot.mount
new file mode 100644
index 0000000000000000000000000000000000000000..80d3d44247457583157999d4862f6c5b20a05de0
--- /dev/null
+++ b/overlays/sdk-mount-opt-sysroot/lib/systemd/system/opt-sysroot.mount
@@ -0,0 +1,12 @@
+[Unit]
+Description=Mount points for sysroots
+Before=local-fs.target
+
+[Mount]
+What=/home/sysroot
+Where=/opt/sysroot
+Type=none
+Options=rbind
+
+[Install]
+WantedBy=default.target
diff --git a/overlays/sdk-xfce-theme/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-desktop.xml b/overlays/sdk-xfce-theme/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-desktop.xml
new file mode 100644
index 0000000000000000000000000000000000000000..1f177b04de513ee1244d7846d6d7236d2c883fd0
--- /dev/null
+++ b/overlays/sdk-xfce-theme/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-desktop.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<channel name="xfce4-desktop" version="1.0">
+ <property name="backdrop" type="empty">
+ <property name="screen0" type="empty">
+ <property name="monitor0" type="empty">
+ <property name="image-path" type="empty"/>
+ <property name="image-show" type="empty"/>
+ <property name="color1" type="empty"/>
+ <property name="workspace0" type="empty">
+ <property name="color-style" type="int" value="0"/>
+ <property name="color1" type="array">
+ <value type="uint" value="58136"/>
+ <value type="uint" value="58136"/>
+ <value type="uint" value="58136"/>
+ <value type="uint" value="65535"/>
+ </property>
+ <property name="image-style" type="int" value="5"/>
+ <property name="last-image" type="string" value="/usr/share/sac-sdk/wallpapers/apertis-desktop.png"/>
+ </property>
+ </property>
+ </property>
+ </property>
+</channel>
+
diff --git a/overlays/sdk-xfce-theme/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xsettings.xml b/overlays/sdk-xfce-theme/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xsettings.xml
new file mode 100644
index 0000000000000000000000000000000000000000..68bd55ff230eb05661d6ae568db03bfe1d186df4
--- /dev/null
+++ b/overlays/sdk-xfce-theme/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xsettings.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<channel name="xsettings" version="1.0">
+ <property name="Net" type="empty">
+ <property name="ThemeName" type="string" value="Xfce-4.6"/>
+ </property>
+</channel>
diff --git a/overlays/sdk-xfce-theme/usr/share/sac-sdk/wallpapers/apertis-desktop.png b/overlays/sdk-xfce-theme/usr/share/sac-sdk/wallpapers/apertis-desktop.png
new file mode 100644
index 0000000000000000000000000000000000000000..4f52db0475a62a9a213de88c2d02df96789c6ab0
Binary files /dev/null and b/overlays/sdk-xfce-theme/usr/share/sac-sdk/wallpapers/apertis-desktop.png differ