diff --git a/Dockerfile b/Dockerfile
index 5c346063..0e5df22f 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM ghcr.io/linuxserver/baseimage-rdesktop:ubuntunoble
+FROM ghcr.io/linuxserver/baseimage-rdesktop:debianbookworm
 
 # set version label
 ARG BUILD_DATE
@@ -6,17 +6,14 @@ ARG VERSION
 LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}"
 LABEL maintainer="thelamer"
 
-# prevent Ubuntu's firefox stub from being installed
-COPY /root/etc/apt/preferences.d/firefox-no-snap /etc/apt/preferences.d/firefox-no-snap
-
 RUN \
   echo "**** install packages ****" && \
-  add-apt-repository -y ppa:mozillateam/ppa && \
   apt-get update && \
   DEBIAN_FRONTEND=noninteractive \
-  apt-get install --no-install-recommends -y \
+  apt-get install -y --no-install-recommends \
+    chromium \
+    chromium-l10n \
     dolphin \
-    firefox \
     gwenview \
     kde-config-gtk-style \
     kdialog \
@@ -33,6 +30,10 @@ RUN \
     plasma-workspace \
     qml-module-qt-labs-platform \
     systemsettings && \
+  echo "**** application tweaks ****" && \
+  sed -i \
+    's#^Exec=.*#Exec=/usr/local/bin/wrapped-chromium#g' \
+    /usr/share/applications/chromium.desktop && \
   echo "**** kde tweaks ****" && \
   sed -i \
     's/applications:org.kde.discover.desktop,/applications:org.kde.konsole.desktop,/g' \
diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64
index 4c146d27..4eb65569 100644
--- a/Dockerfile.aarch64
+++ b/Dockerfile.aarch64
@@ -1,4 +1,4 @@
-FROM ghcr.io/linuxserver/baseimage-rdesktop:arm64v8-ubuntunoble
+FROM ghcr.io/linuxserver/baseimage-rdesktop:arm64v8-debianbookworm
 
 # set version label
 ARG BUILD_DATE
@@ -6,17 +6,14 @@ ARG VERSION
 LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}"
 LABEL maintainer="thelamer"
 
-# prevent Ubuntu's firefox stub from being installed
-COPY /root/etc/apt/preferences.d/firefox-no-snap /etc/apt/preferences.d/firefox-no-snap
-
 RUN \
   echo "**** install packages ****" && \
-  add-apt-repository -y ppa:mozillateam/ppa && \
   apt-get update && \
   DEBIAN_FRONTEND=noninteractive \
-  apt-get install --no-install-recommends -y \
+  apt-get install -y --no-install-recommends \
+    chromium \
+    chromium-l10n \
     dolphin \
-    firefox \
     gwenview \
     kde-config-gtk-style \
     kdialog \
@@ -33,6 +30,10 @@ RUN \
     plasma-workspace \
     qml-module-qt-labs-platform \
     systemsettings && \
+  echo "**** application tweaks ****" && \
+  sed -i \
+    's#^Exec=.*#Exec=/usr/local/bin/wrapped-chromium#g' \
+    /usr/share/applications/chromium.desktop && \
   echo "**** kde tweaks ****" && \
   sed -i \
     's/applications:org.kde.discover.desktop,/applications:org.kde.konsole.desktop,/g' \
diff --git a/root/etc/apt/preferences.d/firefox-no-snap b/root/etc/apt/preferences.d/firefox-no-snap
deleted file mode 100644
index 9406bcc0..00000000
--- a/root/etc/apt/preferences.d/firefox-no-snap
+++ /dev/null
@@ -1,3 +0,0 @@
-Package: firefox*
-Pin: release o=Ubuntu*
-Pin-Priority: -1
diff --git a/root/usr/local/bin/wrapped-chromium b/root/usr/local/bin/wrapped-chromium
new file mode 100755
index 00000000..bfad4dad
--- /dev/null
+++ b/root/usr/local/bin/wrapped-chromium
@@ -0,0 +1,15 @@
+#! /bin/bash
+
+BIN=/usr/bin/chromium
+
+# 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} --password-store=basic "$@"
+else
+  ${BIN} --password-store=basic --no-sandbox --test-type "$@"
+fi