diff --git a/Dockerfile b/Dockerfile
index b09d500ef..7f92d7fa5 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 \
     obconf-qt \
     st \
     util-linux-misc && \
@@ -25,6 +25,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 c9e59fc62..246f8057c 100644
--- a/Dockerfile.aarch64
+++ b/Dockerfile.aarch64
@@ -17,6 +17,7 @@ RUN \
     https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/webtop-logo.png && \
   echo "**** install packages ****" && \
   apk add --no-cache \
+    chromium \
     firefox \
     obconf-qt \
     st \
@@ -25,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/defaults/menu.xml b/root/defaults/menu.xml
index ee0698b8f..625265466 100644
--- a/root/defaults/menu.xml
+++ b/root/defaults/menu.xml
@@ -2,7 +2,7 @@
 <openbox_menu xmlns="http://openbox.org/3.4/menu">
 <menu id="root-menu" label="MENU">
 <item label="Terminal" icon="/usr/share/pixmaps/xterm-color_48x48.xpm"><action name="Execute"><command>/usr/bin/st</command></action></item>
-<item label="Firefox" icon="/usr/share/icons/hicolor/48x48/apps/firefox.png"><action name="Execute"><command>/usr/bin/firefox</command></action></item>
+<item label="Chromium" icon="/usr/share/icons/hicolor/48x48/apps/chromium.png"><action name="Execute"><command>/usr/bin/chromium</command></action></item>
 <item label="OBConf" icon="/usr/share/icons/hicolor/48x48/apps/obconf-qt.png"><action name="Execute"><command>/usr/bin/obconf-qt</command></action></item>
 </menu>
 </openbox_menu>
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