diff --git a/Images/protonmail-bridge.png b/Images/protonmail-bridge.png
new file mode 100644
index 0000000..17f4a1e
Binary files /dev/null and b/Images/protonmail-bridge.png differ
diff --git a/Template/template.json b/Template/template.json
index c4eb9c8..49b49b8 100644
--- a/Template/template.json
+++ b/Template/template.json
@@ -2525,6 +2525,34 @@
       }
     ]
   },
+  {
+    "type": 1,
+    "title": "ProtonMail Bridge",
+    "name": "protonmail-bridge",
+    "description": "This is an unofficial Docker container of the ProtonMail Bridge. Some of the scripts are based on Hendrik Meyer's work.",
+    "note": "Please refer to the documentation <a href='https://hub.docker.com/r/shenxn/protonmail-bridge'/>here</a> to set this up.",
+    "logo": "https://raw.githubusercontent.com/SelfhostedPro/selfhosted_templates/master/Images/protonmail-bridge.png",
+    "image": "shenxn/protonmail-bridge:latest",
+    "categories": [
+      "Email",
+      "Productivity",
+      "Tools",
+      "Other"
+    ],
+    "platform": "linux",
+    "restart_policy": "unless-stopped",
+    "interactive" : "true",
+    "ports": [
+      "143/tcp",
+      "25/tcp"
+    ],
+    "volumes": [
+      {
+        "container": "/root",
+        "bind": "/portainer/Files/AppData/ProtonMail-Bridge"
+      }
+    ]
+  },
   {
     "type": 1,
     "title": "Pydio",