diff --git a/Dockerfile_webdesktop b/Dockerfile_webdesktop
index 88d4a0afa..55640c1d4 100644
--- a/Dockerfile_webdesktop
+++ b/Dockerfile_webdesktop
@@ -1,4 +1,4 @@
-FROM lscr.io/linuxserver/webtop:4.16-r0-ls72
+FROM linuxserver/webtop:latest
 LABEL NAME="OWASP WrongSecrets Web Desktop" MAINTAINER="Jeroen Willemsen"
 
 RUN \
@@ -24,6 +24,5 @@ COPY src/test/resources/alibabacreds.kdbx /var/tmp/helpers/
 COPY src/test/resources/alibabacreds.kdbx /var/tmp/wrongsecrets/
 COPY wrongsecret-desktop-resources/welcome.md /var/tmp/wrongsecrets/
 
-RUN sudo chown abc /var/tmp/wrongsecrets
 
-COPY wrongsecret-desktop-resources/startwm.sh /defaults/startwm.sh
+RUN echo -e "sudo chown abc /config/Desktop && cp -r /var/tmp/wrongsecrets /var/tmp/wrongsecrets/welcome.md /config/Desktop/\n$(cat /defaults/startwm.sh)" > /defaults/startwm.sh
diff --git a/Dockerfile_webdesktopk8s b/Dockerfile_webdesktopk8s
index dd30af9d2..594668b60 100644
--- a/Dockerfile_webdesktopk8s
+++ b/Dockerfile_webdesktopk8s
@@ -1,4 +1,4 @@
-FROM lscr.io/linuxserver/webtop:4.16-r0-ls72
+FROM linuxserver/webtop:latest
 LABEL NAME="OWASP WrongSecrets Web Desktop" MAINTAINER="Jeroen Willemsen"
 
 RUN \
@@ -31,6 +31,4 @@ COPY src/test/resources/alibabacreds.kdbx /var/tmp/wrongsecrets/
 COPY wrongsecret-desktop-resources/welcome.md /var/tmp/wrongsecrets/
 
 
-RUN sudo chown abc /var/tmp/wrongsecrets
-
-COPY wrongsecret-desktop-resources/startwm.sh /defaults/startwm.sh
+RUN echo -e "sudo chown abc /config/Desktop && cp -r /var/tmp/wrongsecrets /var/tmp/wrongsecrets/welcome.md /config/Desktop/\n$(cat /defaults/startwm.sh)" > /defaults/startwm.sh