diff --git a/build/Dockerfile b/build/Dockerfile
index 97c808e..78d4c15 100644
--- a/build/Dockerfile
+++ b/build/Dockerfile
@@ -23,6 +23,8 @@ LABEL maintainer="Xiaonan Shen <s@sxn.dev>"
 EXPOSE 1025/tcp
 EXPOSE 1143/tcp
 
+RUN mkdir -p /root/.gnupg && chmod 700 /root/.gnupg
+
 # Install dependencies and protonmail bridge
 RUN apt-get update \
     && apt-get install -y --no-install-recommends \
@@ -32,9 +34,9 @@ RUN apt-get update \
 
 # Copy bash scripts
 COPY gpgparams entrypoint.sh /protonmail/
+WORKDIR /protonmail/
 
 # Copy protonmail
-WORKDIR /usr/bin/
 COPY --from=build /build/proton-bridge/bridge /usr/bin/
 COPY --from=build /build/proton-bridge/proton-bridge /usr/bin/
 COPY --from=build /build/proton-bridge/vault-editor /usr/bin/