diff --git a/Images/passky-icon.png b/Images/passky-icon.png
new file mode 100644
index 0000000..d4514e6
Binary files /dev/null and b/Images/passky-icon.png differ
diff --git a/README.md b/README.md
index b2cfac2..8e80da4 100644
--- a/README.md
+++ b/README.md
@@ -99,6 +99,8 @@ All templates are already configured to bind mount to various places on your dri
   - Organizr-v2 
   - Overseerr 
   - Owncloud 
+  - Passky Client 
+  - Passky Server 
   - Petio 
   - Photoshow 
   - Pihole 
diff --git a/Template/template.json b/Template/template.json
index a1f5686..e5276a0 100644
--- a/Template/template.json
+++ b/Template/template.json
@@ -2217,6 +2217,48 @@
       "title": "Owncloud",
       "type": 3
     },
+    {
+      "categories": ["Other", "Tools"],
+      "description": "Passky is a simple, modern, lightweight, open-source and secure password manager.",
+      "image": "rabbitcompany/passky-client:latest",
+      "logo": "https://raw.githubusercontent.com/Qballjos/portainer_templates/master/Images/passky-icon.png",
+      "name": "passky-client",
+      "platform": "linux",
+      "ports": ["8081:80/tcp"],
+      "restart_policy": "unless-stopped",
+      "title": "Passky Client",
+      "type": 1
+    },
+    {
+      "categories": ["Other", "Tools"],
+      "description": "Passky is a simple, modern, lightweight, open-source and secure password manager.",
+      "env": [
+        {
+          "default": "admin",
+          "label": "ADMIN_USERNAME",
+          "name": "ADMIN_USERNAME"
+        },
+        {
+          "label": "ADMIN_PASSWORD",
+          "name": "ADMIN_PASSWORD"
+        }
+      ],
+      "image": "rabbitcompany/passky-server:latest",
+      "logo": "https://raw.githubusercontent.com/Qballjos/portainer_templates/master/Images/passky-icon.png",
+      "name": "passky-server",
+      "note": "Do not forget to perform regular backups, especially before each update.",
+      "platform": "linux",
+      "ports": ["8080:80/tcp"],
+      "restart_policy": "unless-stopped",
+      "title": "Passky Server",
+      "type": 1,
+      "volumes": [
+        {
+          "bind": "/portainer/Files/AppData/Passky-Server",
+          "container": "/var/www/html/databases"
+        }
+      ]
+    },
     {
       "categories": ["Other", "Tools"],
       "description": "Petio is a third party companion app available to Plex server owners to allow their users to request, review and discover content.",