diff --git a/Dockerfile b/Dockerfile
index 8cb9b26..90eea46 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -63,6 +63,9 @@ RUN set -x && \
     KEPT_PACKAGES+=(libpulse-mainloop-glib0) && \
     KEPT_PACKAGES+=(libqt5multimedia5-plugins) && \
     KEPT_PACKATES+=(libavcodec57) && \
+    # Install Chrome dependencies
+    KEPT_PACKAGES+=(dbus-x11) && \
+    KEPT_PACKAGES+=(uuid-runtime) && \
     # Install Picard plugin dependencies
     KEPT_PACKAGES+=(python3-aubio) && \
     KEPT_PACKAGES+=(python-aubio) && \
@@ -131,13 +134,13 @@ RUN set -x && \
     sed -i 's/<application type="normal">/<application type="normal" title="MusicBrainz Picard">/' /etc/xdg/openbox/rc.xml && \
     sed -i '/<decor>no<\/decor>/d' /etc/xdg/openbox/rc.xml && \
     # Update chromium-browser config
-    sed -i 's/Exec=chromium-browser/Exec=chromium-browser --no-sandbox/g' /usr/share/applications/chromium-browser.desktop && \
+    sed -i 's/Exec=chromium-browser/Exec=chromium-browser --no-sandbox --disable-dev-shm-usage --disable-gpu --disable-software-rasterizer --log-level=3/g' /usr/share/applications/chromium-browser.desktop && \
     # Clean-up
     apt-get remove -y ${TEMP_PACKAGES[@]} && \
     apt-get autoremove -y && \
     rm -rf /src/* /tmp/* /var/lib/apt/lists/*
 
-COPY startapp.sh /startapp.sh
+COPY rootfs/ /
 
 ENV APP_NAME="MusicBrainz Picard" \
     LC_ALL="en_US.UTF-8" \
diff --git a/rootfs/etc/cont-init.d/90-dbus b/rootfs/etc/cont-init.d/90-dbus
new file mode 100644
index 0000000..a2431d9
--- /dev/null
+++ b/rootfs/etc/cont-init.d/90-dbus
@@ -0,0 +1,18 @@
+#!/usr/bin/with-contenv bash
+# shellcheck shell=bash
+
+# Generate machine-id
+rm /etc/machine-id > /dev/null 2>&1 || true
+dbus-uuidgen > /var/lib/dbus/machine-id
+ln -s /var/lib/dbus/machine-id /etc/machine-id
+
+# Ensure pid file is removed
+rm /var/run/dbus/pid > /dev/null 2>&1 || true
+
+# Ensure directory structure is present
+mkdir -p /var/run/dbus
+
+# Ensure messagebus user exists
+if ! id "messagebus" &>/dev/null; then
+    useradd -r --no-create-home -U messagebus
+fi
diff --git a/rootfs/etc/services.d/dbus/run b/rootfs/etc/services.d/dbus/run
new file mode 100644
index 0000000..99d535b
--- /dev/null
+++ b/rootfs/etc/services.d/dbus/run
@@ -0,0 +1,5 @@
+#!/usr/bin/with-contenv bash
+# shellcheck shell=bash
+
+# Start dbus
+dbus-daemon --config-file=/usr/share/dbus-1/system.conf --print-address --nofork
\ No newline at end of file
diff --git a/startapp.sh b/rootfs/startapp.sh
similarity index 100%
rename from startapp.sh
rename to rootfs/startapp.sh