diff --git a/Dockerfile b/Dockerfile
index b82678f..dc7451a 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM ghcr.io/linuxserver/baseimage-arch:3d4daa98-ls73 as buildstage
+FROM ghcr.io/linuxserver/baseimage-arch:latest as buildstage
 
 RUN \
   echo "**** install build deps ****" && \
@@ -33,7 +33,7 @@ RUN \
 FROM ghcr.io/linuxserver/docker-compose:amd64-latest as compose
 
 # runtime stage
-FROM ghcr.io/linuxserver/baseimage-arch:3d4daa98-ls73
+FROM ghcr.io/linuxserver/baseimage-arch:latest
 
 # set version label
 ARG BUILD_DATE
diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64
index d6d5be5..afc86a0 100644
--- a/Dockerfile.aarch64
+++ b/Dockerfile.aarch64
@@ -1,4 +1,4 @@
-FROM ghcr.io/linuxserver/baseimage-arch:arm64v8-3d4daa98-ls73 as buildstage
+FROM ghcr.io/linuxserver/baseimage-arch:arm64v8-latest as buildstage
 
 RUN \
   echo "**** install build deps ****" && \
@@ -33,7 +33,7 @@ RUN \
 FROM ghcr.io/linuxserver/docker-compose:amd64-latest as compose
 
 # runtime stage
-FROM ghcr.io/linuxserver/baseimage-arch:arm64v8-3d4daa98-ls73
+FROM ghcr.io/linuxserver/baseimage-arch:arm64v8-latest
 
 # set version label
 ARG BUILD_DATE
diff --git a/Dockerfile.armhf b/Dockerfile.armhf
index c0352f2..0193e2f 100644
--- a/Dockerfile.armhf
+++ b/Dockerfile.armhf
@@ -1,4 +1,4 @@
-FROM ghcr.io/linuxserver/baseimage-arch:arm32v7-3d4daa98-ls73 as buildstage
+FROM ghcr.io/linuxserver/baseimage-arch:arm32v7-latest as buildstage
 
 RUN \
   echo "**** install build deps ****" && \
@@ -33,7 +33,7 @@ RUN \
 FROM ghcr.io/linuxserver/docker-compose:amd64-latest as compose
 
 # runtime stage
-FROM ghcr.io/linuxserver/baseimage-arch:arm32v7-3d4daa98-ls73
+FROM ghcr.io/linuxserver/baseimage-arch:arm32v7-latest
 
 # set version label
 ARG BUILD_DATE
diff --git a/root/etc/s6-overlay/s6-rc.d/init-config/dependencies.d/init-rdesktop-end b/root/etc/s6-overlay/s6-rc.d/init-config/dependencies.d/init-rdesktop-end
new file mode 100644
index 0000000..e69de29
diff --git a/root/etc/s6-overlay/s6-rc.d/init-keygen/dependencies.d/init-os-end b/root/etc/s6-overlay/s6-rc.d/init-keygen/dependencies.d/init-os-end
new file mode 100644
index 0000000..e69de29
diff --git a/root/etc/cont-init.d/13-keygen b/root/etc/s6-overlay/s6-rc.d/init-keygen/run
similarity index 100%
rename from root/etc/cont-init.d/13-keygen
rename to root/etc/s6-overlay/s6-rc.d/init-keygen/run
diff --git a/root/etc/s6-overlay/s6-rc.d/init-keygen/type b/root/etc/s6-overlay/s6-rc.d/init-keygen/type
new file mode 100644
index 0000000..bdd22a1
--- /dev/null
+++ b/root/etc/s6-overlay/s6-rc.d/init-keygen/type
@@ -0,0 +1 @@
+oneshot
diff --git a/root/etc/s6-overlay/s6-rc.d/init-keygen/up b/root/etc/s6-overlay/s6-rc.d/init-keygen/up
new file mode 100644
index 0000000..cacd3ec
--- /dev/null
+++ b/root/etc/s6-overlay/s6-rc.d/init-keygen/up
@@ -0,0 +1 @@
+/etc/s6-overlay/s6-rc.d/init-keygen/run
diff --git a/root/etc/s6-overlay/s6-rc.d/init-rdesktop-end/dependencies.d/init-video b/root/etc/s6-overlay/s6-rc.d/init-rdesktop-end/dependencies.d/init-video
new file mode 100644
index 0000000..e69de29
diff --git a/root/etc/s6-overlay/s6-rc.d/init-rdesktop-end/type b/root/etc/s6-overlay/s6-rc.d/init-rdesktop-end/type
new file mode 100644
index 0000000..3d92b15
--- /dev/null
+++ b/root/etc/s6-overlay/s6-rc.d/init-rdesktop-end/type
@@ -0,0 +1 @@
+oneshot
\ No newline at end of file
diff --git a/root/etc/s6-overlay/s6-rc.d/init-rdesktop-end/up b/root/etc/s6-overlay/s6-rc.d/init-rdesktop-end/up
new file mode 100644
index 0000000..35a5520
--- /dev/null
+++ b/root/etc/s6-overlay/s6-rc.d/init-rdesktop-end/up
@@ -0,0 +1 @@
+# This file doesn't do anything, it's just the end of the rdesktop base init process
diff --git a/root/etc/s6-overlay/s6-rc.d/init-rdesktop/dependencies.d/init-keygen b/root/etc/s6-overlay/s6-rc.d/init-rdesktop/dependencies.d/init-keygen
new file mode 100644
index 0000000..e69de29
diff --git a/root/etc/cont-init.d/30-config b/root/etc/s6-overlay/s6-rc.d/init-rdesktop/run
old mode 100644
new mode 100755
similarity index 59%
rename from root/etc/cont-init.d/30-config
rename to root/etc/s6-overlay/s6-rc.d/init-rdesktop/run
index 1a2f4d6..be4f13b
--- a/root/etc/cont-init.d/30-config
+++ b/root/etc/s6-overlay/s6-rc.d/init-rdesktop/run
@@ -1,6 +1,6 @@
 #!/usr/bin/with-contenv bash
 
-if [ ! -e /lock.file ]; then
+if [[ ! -e /lock.file ]]; then
   # give abc a sudo shell
   chsh abc -s /bin/bash
   sed -e 's/%sudo	ALL=(ALL:ALL) ALL/%sudo ALL=(ALL:ALL) NOPASSWD: ALL/g' \
@@ -12,12 +12,14 @@ fi
 touch /lock.file
 
 # default file copies first run
-[[ ! -d /config/.config ]] && \
-	mkdir -p /config/.config && \
-        cp /defaults/bashrc /config/.bashrc && \
-	cp /defaults/startwm.sh /config/startwm.sh
+if [[ ! -d /config/.config ]]; then
+    mkdir -p /config/.config
+    cp /defaults/bashrc /config/.bashrc
+    cp /defaults/startwm.sh /config/startwm.sh
+fi
 
 # permissions
 PERM=$(stat -c '%U' /config/.config)
-[[ "${PERM}" != "abc" ]] && \
-        chown -R abc:abc /config
+if [[ "${PERM}" != "abc" ]]; then
+    chown -R abc:abc /config
+fi
diff --git a/root/etc/s6-overlay/s6-rc.d/init-rdesktop/type b/root/etc/s6-overlay/s6-rc.d/init-rdesktop/type
new file mode 100644
index 0000000..bdd22a1
--- /dev/null
+++ b/root/etc/s6-overlay/s6-rc.d/init-rdesktop/type
@@ -0,0 +1 @@
+oneshot
diff --git a/root/etc/s6-overlay/s6-rc.d/init-rdesktop/up b/root/etc/s6-overlay/s6-rc.d/init-rdesktop/up
new file mode 100644
index 0000000..68d5137
--- /dev/null
+++ b/root/etc/s6-overlay/s6-rc.d/init-rdesktop/up
@@ -0,0 +1 @@
+/etc/s6-overlay/s6-rc.d/init-rdesktop/run
diff --git a/root/etc/s6-overlay/s6-rc.d/init-video/dependencies.d/init-rdesktop b/root/etc/s6-overlay/s6-rc.d/init-video/dependencies.d/init-rdesktop
new file mode 100644
index 0000000..e69de29
diff --git a/root/etc/cont-init.d/50-gid-video b/root/etc/s6-overlay/s6-rc.d/init-video/run
old mode 100644
new mode 100755
similarity index 100%
rename from root/etc/cont-init.d/50-gid-video
rename to root/etc/s6-overlay/s6-rc.d/init-video/run
diff --git a/root/etc/s6-overlay/s6-rc.d/init-video/type b/root/etc/s6-overlay/s6-rc.d/init-video/type
new file mode 100644
index 0000000..bdd22a1
--- /dev/null
+++ b/root/etc/s6-overlay/s6-rc.d/init-video/type
@@ -0,0 +1 @@
+oneshot
diff --git a/root/etc/s6-overlay/s6-rc.d/init-video/up b/root/etc/s6-overlay/s6-rc.d/init-video/up
new file mode 100644
index 0000000..01141b1
--- /dev/null
+++ b/root/etc/s6-overlay/s6-rc.d/init-video/up
@@ -0,0 +1 @@
+/etc/s6-overlay/s6-rc.d/init-video/run
diff --git a/root/etc/s6-overlay/s6-rc.d/svc-xrdp-sesman/dependencies.d/init-services b/root/etc/s6-overlay/s6-rc.d/svc-xrdp-sesman/dependencies.d/init-services
new file mode 100644
index 0000000..e69de29
diff --git a/root/etc/s6-overlay/s6-rc.d/svc-xrdp-sesman/notification-fd b/root/etc/s6-overlay/s6-rc.d/svc-xrdp-sesman/notification-fd
new file mode 100644
index 0000000..b8626c4
--- /dev/null
+++ b/root/etc/s6-overlay/s6-rc.d/svc-xrdp-sesman/notification-fd
@@ -0,0 +1 @@
+4
diff --git a/root/etc/services.d/xrdp-sesman/run b/root/etc/s6-overlay/s6-rc.d/svc-xrdp-sesman/run
similarity index 67%
rename from root/etc/services.d/xrdp-sesman/run
rename to root/etc/s6-overlay/s6-rc.d/svc-xrdp-sesman/run
index 44b91d0..ec37dee 100755
--- a/root/etc/services.d/xrdp-sesman/run
+++ b/root/etc/s6-overlay/s6-rc.d/svc-xrdp-sesman/run
@@ -4,6 +4,6 @@
 fdmove -c 2 1
 
 # Notify service manager when xrdp is up
-s6-notifyoncheck -w 500 -c "true &>/dev/null </dev/tcp/127.0.0.1/3350"
+s6-notifyoncheck -w 500 -c "nc -z localhost 3350"
 
 /usr/sbin/xrdp-sesman --nodaemon
diff --git a/root/etc/s6-overlay/s6-rc.d/svc-xrdp-sesman/type b/root/etc/s6-overlay/s6-rc.d/svc-xrdp-sesman/type
new file mode 100644
index 0000000..5883cff
--- /dev/null
+++ b/root/etc/s6-overlay/s6-rc.d/svc-xrdp-sesman/type
@@ -0,0 +1 @@
+longrun
diff --git a/root/etc/s6-overlay/s6-rc.d/svc-xrdp/dependencies.d/init-services b/root/etc/s6-overlay/s6-rc.d/svc-xrdp/dependencies.d/init-services
new file mode 100644
index 0000000..e69de29
diff --git a/root/etc/s6-overlay/s6-rc.d/svc-xrdp/dependencies.d/svc-xrdp-sesman b/root/etc/s6-overlay/s6-rc.d/svc-xrdp/dependencies.d/svc-xrdp-sesman
new file mode 100644
index 0000000..e69de29
diff --git a/root/etc/services.d/xrdp-sesman/notification-fd b/root/etc/s6-overlay/s6-rc.d/svc-xrdp/notification-fd
similarity index 100%
rename from root/etc/services.d/xrdp-sesman/notification-fd
rename to root/etc/s6-overlay/s6-rc.d/svc-xrdp/notification-fd
diff --git a/root/etc/services.d/xrdp/run b/root/etc/s6-overlay/s6-rc.d/svc-xrdp/run
similarity index 51%
rename from root/etc/services.d/xrdp/run
rename to root/etc/s6-overlay/s6-rc.d/svc-xrdp/run
index 994f1cc..6d6e0ae 100755
--- a/root/etc/services.d/xrdp/run
+++ b/root/etc/s6-overlay/s6-rc.d/svc-xrdp/run
@@ -4,10 +4,7 @@
 fdmove -c 2 1
 
 # Notify service manager when xrdp is up
-s6-notifyoncheck -w 500 -c "true &>/dev/null </dev/tcp/127.0.0.1/3389"
-
-# Wait until other services are running
-if { s6-svwait -t 10000 -U /var/run/s6/services/xrdp-sesman/ }
+s6-notifyoncheck -w 500 -c "nc -z localhost 3389"
 
 # set env
 s6-env DISPLAY=:1
diff --git a/root/etc/s6-overlay/s6-rc.d/svc-xrdp/type b/root/etc/s6-overlay/s6-rc.d/svc-xrdp/type
new file mode 100644
index 0000000..5883cff
--- /dev/null
+++ b/root/etc/s6-overlay/s6-rc.d/svc-xrdp/type
@@ -0,0 +1 @@
+longrun
diff --git a/root/etc/s6-overlay/s6-rc.d/user/contents.d/init-keygen b/root/etc/s6-overlay/s6-rc.d/user/contents.d/init-keygen
new file mode 100644
index 0000000..e69de29
diff --git a/root/etc/s6-overlay/s6-rc.d/user/contents.d/init-rdesktop b/root/etc/s6-overlay/s6-rc.d/user/contents.d/init-rdesktop
new file mode 100644
index 0000000..e69de29
diff --git a/root/etc/s6-overlay/s6-rc.d/user/contents.d/init-rdesktop-end b/root/etc/s6-overlay/s6-rc.d/user/contents.d/init-rdesktop-end
new file mode 100644
index 0000000..e69de29
diff --git a/root/etc/s6-overlay/s6-rc.d/user/contents.d/init-video b/root/etc/s6-overlay/s6-rc.d/user/contents.d/init-video
new file mode 100644
index 0000000..e69de29
diff --git a/root/etc/s6-overlay/s6-rc.d/user/contents.d/svc-xrdp b/root/etc/s6-overlay/s6-rc.d/user/contents.d/svc-xrdp
new file mode 100644
index 0000000..e69de29
diff --git a/root/etc/s6-overlay/s6-rc.d/user/contents.d/svc-xrdp-sesman b/root/etc/s6-overlay/s6-rc.d/user/contents.d/svc-xrdp-sesman
new file mode 100644
index 0000000..e69de29
diff --git a/root/etc/services.d/xrdp/notification-fd b/root/etc/services.d/xrdp/notification-fd
deleted file mode 100644
index 00750ed..0000000
--- a/root/etc/services.d/xrdp/notification-fd
+++ /dev/null
@@ -1 +0,0 @@
-3
diff --git a/root/startpulse.sh b/root/startpulse.sh
index 7221162..a7bd885 100755
--- a/root/startpulse.sh
+++ b/root/startpulse.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 while :
 do
-    if [[ ! `/usr/bin/pulseaudio --check` ]]; then
+    if [[ ! $(/usr/bin/pulseaudio --check) ]]; then
         /usr/bin/pulseaudio --start
     fi
     sleep 10