diff --git a/roles/podman_link/tasks/main.yml b/roles/podman_link/tasks/main.yml
index e13bd2e..b1419fe 100644
--- a/roles/podman_link/tasks/main.yml
+++ b/roles/podman_link/tasks/main.yml
@@ -163,6 +163,16 @@
     state: "directory"
   become: true
 
+# ProtonMail Bridge runs with UID/GID 19994 inside the container
+- name: Podman CDR Link | PATCH | Create data directory for ProtonMail Bridge
+  ansible.builtin.file:
+    path: "/home/{{ podman_link_podman_rootless_user }}/protonmail-data"
+    owner: "{{ (_podman_link_user_subuid_start | int) + 19993 }}"
+    group: "{{ (_podman_link_user_subgid_start | int) + 19993 }}"
+    mode: "0700"
+    state: "directory"
+  become: true
+
 - name: Podman CDR Link | PATCH | Ensure a project is created for Signal and WhatsApp containers
   ansible.builtin.lineinfile:
     path: /etc/projid
@@ -227,6 +237,7 @@
     - bridge-worker.container
     - bridge-postgresql.container
     - bridge-whatsapp.container
+    - protonmail-bridge.container
     - signal-cli-rest-api.container
     - zammad-init.container
     - zammad-nginx.container
diff --git a/roles/podman_link/templates/home/config/containers/systemd/protonmail-bridge.container b/roles/podman_link/templates/home/config/containers/systemd/protonmail-bridge.container
new file mode 100644
index 0000000..45a9f6b
--- /dev/null
+++ b/roles/podman_link/templates/home/config/containers/systemd/protonmail-bridge.container
@@ -0,0 +1,12 @@
+[Unit]
+PartOf=link.target
+
+[Container]
+ContainerName=protonmail-bridge
+Image=guardianproject.dev/sr2/protonmail-bridge-docker:latest
+Volume=/home/{{ podman_link_podman_rootless_user }}/protonmail-data:/data:rw,Z
+Network=zammad.network
+
+[Service]
+Restart=always
+Slice=link.slice
diff --git a/roles/podman_link/templates/home/config/systemd/user/link.target b/roles/podman_link/templates/home/config/systemd/user/link.target
index 9dbd684..5fc20b1 100644
--- a/roles/podman_link/templates/home/config/systemd/user/link.target
+++ b/roles/podman_link/templates/home/config/systemd/user/link.target
@@ -4,6 +4,7 @@ Wants=zammad-nginx.service
 After=zammad-nginx.service
 Wants=nginx.service
 After=nginx.service
+Wants=protonmail-bridge.service
 
 [Install]
 WantedBy=default.target