diff --git a/build/Dockerfile b/build/Dockerfile
index b2bc667..cb29500 100644
--- a/build/Dockerfile
+++ b/build/Dockerfile
@@ -25,7 +25,9 @@ EXPOSE 143/tcp
 
 # Install dependencies and protonmail bridge
 RUN apt-get update \
-    && apt-get install -y --no-install-recommends socat pass libsecret-1-0 ca-certificates libfido2-1 dbus \
+    && apt-get install -y --no-install-recommends \
+        socat pass libsecret-1-0 ca-certificates libfido2-1 \
+        dbus dbus-x11 gnupg2 \
     && rm -rf /var/lib/apt/lists/*
 
 # Copy bash scripts
diff --git a/build/entrypoint.sh b/build/entrypoint.sh
index bfd36f5..cc1b9f7 100644
--- a/build/entrypoint.sh
+++ b/build/entrypoint.sh
@@ -19,7 +19,8 @@ if [[ $1 == init ]]; then
     /protonmail/proton-bridge --cli $@
 
 else
-    eval "$(dbus-launch --sh-syntax --exit-with-session)"
+    export $(dbus-launch --sh-syntax --exit-with-session)
+    dbus-daemon --session --fork --print-address  # keep it alive
 
     # socat will make the conn appear to come from 127.0.0.1
     # ProtonMail Bridge currently expects that.