diff --git a/Dockerfile b/Dockerfile
index 291afdc8d..5d1da2ec3 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -17,13 +17,13 @@ RUN \
     https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/webtop-logo.png && \
   echo "**** install packages ****" && \
   apk add --no-cache \
+    chromium \
     dolphin \
     konsole \
     kwrite \
     breeze \
     breeze-gtk \
     breeze-icons \
-    firefox \
     kde-gtk-config \
     kmenuedit \
     plasma-browser-integration \
@@ -36,6 +36,9 @@ RUN \
   sed -i \
     's/applications:org.kde.discover.desktop,/applications:org.kde.konsole.desktop,/g' \
     /usr/share/plasma/plasmoids/org.kde.plasma.taskmanager/contents/config/main.xml && \
+  sed -i \
+    's:/usr/bin/chromium-browser:/usr/bin/chromium:g' \
+    /usr/share/applications/chromium.desktop && \
   echo "**** cleanup ****" && \
   rm -rf \
     /config/.cache \
diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64
index 1d25b4fe0..ab36da71f 100644
--- a/Dockerfile.aarch64
+++ b/Dockerfile.aarch64
@@ -17,13 +17,13 @@ RUN \
     https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/webtop-logo.png && \
   echo "**** install packages ****" && \
   apk add --no-cache \
+    chromium \
     dolphin \
     konsole \
     kwrite \
     breeze \
     breeze-gtk \
     breeze-icons \
-    firefox \
     kde-gtk-config \
     kmenuedit \
     plasma-browser-integration \
@@ -36,6 +36,9 @@ RUN \
   sed -i \
     's/applications:org.kde.discover.desktop,/applications:org.kde.konsole.desktop,/g' \
     /usr/share/plasma/plasmoids/org.kde.plasma.taskmanager/contents/config/main.xml && \
+  sed -i \
+    's:/usr/bin/chromium-browser:/usr/bin/chromium:g' \
+    /usr/share/applications/chromium.desktop && \
   echo "**** cleanup ****" && \
   rm -rf \
     /config/.cache \
diff --git a/root/usr/bin/chromium b/root/usr/bin/chromium
new file mode 100755
index 000000000..f4adcab85
--- /dev/null
+++ b/root/usr/bin/chromium
@@ -0,0 +1,15 @@
+#! /bin/bash
+
+BIN=/usr/bin/chromium-browser
+
+# Cleanup
+if ! pgrep chromium > /dev/null;then
+  rm -f $HOME/.config/chromium/Singleton*
+fi
+
+# Run normally on privved containers or modified un non priv
+if grep -q 'Seccomp:.0' /proc/1/status; then
+  ${BIN} --no-first-run --password-store=basic "$@"
+else
+  ${BIN} --no-first-run --password-store=basic --no-sandbox --test-type "$@"
+fi