diff --git a/mate/usr/bin/exo-open b/mate/usr/bin/exo-open
new file mode 100755
index 0000000..e40c636
--- /dev/null
+++ b/mate/usr/bin/exo-open
@@ -0,0 +1,7 @@
+#!/bin/bash
+
+if [ "${2}" == "WebBrowser" ]; then
+  /usr/bin/dex-autostart /usr/share/applications/chromium-browser.desktop
+else 
+  /usr/bin/exo-open-real "$@"
+fi
diff --git a/mate/usr/local/bin/wrapped-chromium b/mate/usr/local/bin/wrapped-chromium
new file mode 100755
index 0000000..58b953c
--- /dev/null
+++ b/mate/usr/local/bin/wrapped-chromium
@@ -0,0 +1,10 @@
+#!/bin/bash
+
+BIN=/usr/bin/chromium-browser
+
+# 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
diff --git a/xfce/usr/bin/exo-open b/xfce/usr/bin/exo-open
new file mode 100755
index 0000000..e40c636
--- /dev/null
+++ b/xfce/usr/bin/exo-open
@@ -0,0 +1,7 @@
+#!/bin/bash
+
+if [ "${2}" == "WebBrowser" ]; then
+  /usr/bin/dex-autostart /usr/share/applications/chromium-browser.desktop
+else 
+  /usr/bin/exo-open-real "$@"
+fi
diff --git a/xfce/usr/local/bin/wrapped-chromium b/xfce/usr/local/bin/wrapped-chromium
new file mode 100755
index 0000000..58b953c
--- /dev/null
+++ b/xfce/usr/local/bin/wrapped-chromium
@@ -0,0 +1,10 @@
+#!/bin/bash
+
+BIN=/usr/bin/chromium-browser
+
+# 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