diff --git a/Dockerfile b/Dockerfile
index 3318a36e..9cc8441a 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -11,11 +11,18 @@ LABEL maintainer="thelamer"
 RUN \
   echo "**** install packages ****" && \
   apk add --no-cache \
-    firefox \
-    font-noto \
+    chromium \
     i3status \
     i3wm \
-    xterm && \
+    st \
+    util-linux-misc && \
+  echo "**** application tweaks ****" && \
+  mv \
+    /usr/bin/chromium-browser \
+    /usr/bin/chromium-real && \
+  ln -s \
+    /usr/bin/st \
+    /usr/bin/x-terminal-emulator && \
   echo "**** cleanup ****" && \
   rm -rf \
     /tmp/*
diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64
index 7ae51dfe..29c2e909 100644
--- a/Dockerfile.aarch64
+++ b/Dockerfile.aarch64
@@ -11,11 +11,18 @@ LABEL maintainer="thelamer"
 RUN \
   echo "**** install packages ****" && \
   apk add --no-cache \
-    firefox \
-    font-noto \
+    chromium \
     i3status \
     i3wm \
-    xterm && \
+    st \
+    util-linux-misc && \
+  echo "**** application tweaks ****" && \
+  mv \
+    /usr/bin/chromium-browser \
+    /usr/bin/chromium-real && \
+  ln -s \
+    /usr/bin/st \
+    /usr/bin/x-terminal-emulator && \
   echo "**** cleanup ****" && \
   rm -rf \
     /tmp/*
diff --git a/root/usr/bin/chromium-browser b/root/usr/bin/chromium-browser
new file mode 100755
index 00000000..4c9655a0
--- /dev/null
+++ b/root/usr/bin/chromium-browser
@@ -0,0 +1,10 @@
+#!/bin/bash
+
+BIN=/usr/bin/chromium-real
+
+# 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