diff --git a/build/Dockerfile b/build/Dockerfile
index e90ff25..d4a10be 100644
--- a/build/Dockerfile
+++ b/build/Dockerfile
@@ -4,7 +4,7 @@ FROM debian:sid-slim AS build
 ARG version
 
 # Install dependencies
-RUN apt-get update && apt-get install -y golang build-essential libsecret-1-dev
+RUN apt-get update && apt-get install -y golang build-essential libsecret-1-dev libfido2-dev libcbor-dev
 
 # Build
 ADD https://github.com/ProtonMail/proton-bridge.git#${version} /build/
@@ -19,7 +19,7 @@ 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 \
+    && apt-get install -y --no-install-recommends socat pass libsecret-1-0 ca-certificates libfido2-1 procps tmux \
     && rm -rf /var/lib/apt/lists/*
 
 # Copy bash scripts
diff --git a/build/entrypoint.sh b/build/entrypoint.sh
index 1931087..f5fd902 100644
--- a/build/entrypoint.sh
+++ b/build/entrypoint.sh
@@ -16,7 +16,11 @@ if [[ $1 == init ]]; then
     pkill protonmail-bridge || true
 
     # Login
-    /protonmail/proton-bridge --cli $@
+    tmux new-session -d -s bridge-init "/protonmail/proton-bridge --cli $@"
+    echo "ProtonMail Bridge init running inside tmux session 'bridge-init'"
+    echo "Attach with: docker exec -it <container> tmux attach -t bridge-init"
+
+    sleep infinity
 
 else
 
@@ -26,10 +30,10 @@ else
     socat TCP-LISTEN:25,fork TCP:127.0.0.1:1025 &
     socat TCP-LISTEN:143,fork TCP:127.0.0.1:1143 &
 
-    # Start protonmail
-    # Fake a terminal, so it does not quit because of EOF...
-    rm -f faketty
-    mkfifo faketty
-    cat faketty | /protonmail/proton-bridge --cli $@
+    tmux new-session -d -s bridge "/protonmail/proton-bridge --cli $@"
+    echo "ProtonMail Bridge running inside tmux session 'bridge'"
+    echo "Attach with: docker exec -it <container> tmux attach -t bridge"
+
+    sleep infinity
 
 fi