diff --git a/Dockerfile b/Dockerfile
index 4b40d92d..51e45665 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -17,7 +17,7 @@ RUN \
     https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/webtop-logo.png && \
   echo "**** install packages ****" && \
   apk add --no-cache \
-    firefox \
+    chromium \
     i3status \
     i3wm \
     st \
@@ -26,6 +26,9 @@ RUN \
   ln -s \
     /usr/bin/st \
     /usr/bin/x-terminal-emulator && \
+  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 57b65b02..e36075f1 100644
--- a/Dockerfile.aarch64
+++ b/Dockerfile.aarch64
@@ -17,7 +17,7 @@ RUN \
     https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/webtop-logo.png && \
   echo "**** install packages ****" && \
   apk add --no-cache \
-    firefox \
+    chromium \
     i3status \
     i3wm \
     st \
@@ -26,6 +26,9 @@ RUN \
   ln -s \
     /usr/bin/st \
     /usr/bin/x-terminal-emulator && \
+  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 00000000..f4adcab8
--- /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