diff --git a/Dockerfile b/Dockerfile
index 2611379f..d6445af0 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -20,7 +20,10 @@ RUN \
     chromium \
     i3status \
     i3wm \
+    libcap-setcap \
     st \
+    sway \
+    swaybg \
     util-linux-misc && \
   echo "**** application tweaks ****" && \
   ln -s \
@@ -29,6 +32,8 @@ RUN \
   sed -i \
     's:/usr/bin/chromium-browser:/usr/bin/chromium:g' \
     /usr/share/applications/chromium.desktop && \
+  setcap -r \
+    /usr/bin/sway && \
   echo "**** cleanup ****" && \
   rm -rf \
     /config/.cache \
diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64
index 8725aca7..50012ee0 100644
--- a/Dockerfile.aarch64
+++ b/Dockerfile.aarch64
@@ -20,7 +20,10 @@ RUN \
     chromium \
     i3status \
     i3wm \
+    libcap-setcap \
     st \
+    sway \
+    swaybg \
     util-linux-misc && \
   echo "**** application tweaks ****" && \
   ln -s \
@@ -29,6 +32,8 @@ RUN \
   sed -i \
     's:/usr/bin/chromium-browser:/usr/bin/chromium:g' \
     /usr/share/applications/chromium.desktop && \
+  setcap -r \
+    /usr/bin/sway && \
   echo "**** cleanup ****" && \
   rm -rf \
     /config/.cache \
diff --git a/root/defaults/startwm_wayland.sh b/root/defaults/startwm_wayland.sh
index e20bbfbb..6de92a67 100755
--- a/root/defaults/startwm_wayland.sh
+++ b/root/defaults/startwm_wayland.sh
@@ -5,6 +5,4 @@ setterm blank 0
 setterm powerdown 0
 
 # Start DE
-WAYLAND_DISPLAY=wayland-1 Xwayland :1 &
-sleep 2
-exec dbus-launch --exit-with-session /usr/bin/i3 > /dev/null 2>&1
+WAYLAND_DISPLAY=wayland-1 exec dbus-launch --exit-with-session /usr/bin/sway > /dev/null 2>&1