diff --git a/passky-server/data/passky/.gitkeep b/passky-server/data/passky/.gitkeep
new file mode 100644
index 00000000..e69de29b
diff --git a/passky-server/docker-compose.yml b/passky-server/docker-compose.yml
new file mode 100644
index 00000000..fdada283
--- /dev/null
+++ b/passky-server/docker-compose.yml
@@ -0,0 +1,63 @@
+version: "3.7"
+
+services:
+  app_proxy:
+    environment:
+      APP_HOST: passky-server_server_1
+      APP_PORT: 80
+      PROXY_AUTH_ADD: "false"
+
+  server:
+    image: rabbitcompany/passky-server:8.1.2@sha256:abc356e4f998c5e7ec23c040decd928d953fa56bc08d19e5353e096ef790cd32
+    restart: on-failure
+    stop_grace_period: 1m
+    environment:
+      SERVER_LOCATION: "US"
+      SERVER_CORES: 1
+      ADMIN_USERNAME: "admin"
+      ADMIN_PASSWORD: "${APP_PASSWORD}"
+      CF_TURNSTILE_SITE_KEY: "1x00000000000000000000AA"
+      CF_TURNSTILE_SECRET_KEY: "1x0000000000000000000000000000000AA"
+      DATABASE_ENGINE: sqlite
+      DATABASE_FILE: passky
+      MYSQL_HOST: ""
+      MYSQL_PORT: 3306
+      MYSQL_DATABASE: "passky"
+      MYSQL_USER: "passky"
+      MYSQL_PASSWORD: ""
+      MYSQL_SSL: "false"
+      MYSQL_SSL_CA: "/etc/ssl/certs/ca-certificates.crt"
+      MYSQL_CACHE_MODE: 0
+      REDIS_HOST: "127.0.0.1"
+      REDIS_PORT: 6379
+      REDIS_PASSWORD: ""
+      REDIS_LOCAL_HOST: "127.0.0.1"
+      REDIS_LOCAL_PORT: 6379
+      REDIS_LOCAL_PASSWORD: ""
+      MAIL_ENABLED: "false"
+      ACCOUNT_MAX: 100
+      ACCOUNT_MAX_PASSWORDS: 1000
+      ACCOUNT_PREMIUM: -1
+      YUBI_CLOUD: "https://api.yubico.com/wsapi/2.0/verify"
+      YUBI_ID: 67857
+      LIMITER_ENABLED: "true"
+      LIMITER_GET_INFO: -1
+      LIMITER_GET_STATS: -1
+      LIMITER_GET_TOKEN: 3
+      LIMITER_GET_PASSWORDS: 2
+      LIMITER_SAVE_PASSWORD: 2
+      LIMITER_EDIT_PASSWORD: 2
+      LIMITER_DELETE_PASSWORD: 2
+      LIMITER_DELETE_PASSWORDS: 10
+      LIMITER_CREATE_ACCOUNT: 10
+      LIMITER_DELETE_ACCOUNT: 10
+      LIMITER_IMPORT_PASSWORDS: 10
+      LIMITER_FORGOT_USERNAME: 60
+      LIMITER_ENABLE_2FA: 10
+      LIMITER_DISABLE_2FA: 10
+      LIMITER_ADD_YUBIKEY: 10
+      LIMITER_REMOVE_YUBIKEY: 10
+      LIMITER_UPGRADE_ACCOUNT: 10
+      LIMITER_GET_REPORT: -1
+    volumes:
+      - ${APP_DATA_DIR}/data/passky:/var/www/html/databases
diff --git a/passky-server/umbrel-app.yml b/passky-server/umbrel-app.yml
new file mode 100644
index 00000000..28e4ec91
--- /dev/null
+++ b/passky-server/umbrel-app.yml
@@ -0,0 +1,32 @@
+manifestVersion: 1
+id: passky-server
+category: Password Managers
+name: Passky Server
+version: "8.1.2"
+tagline: Simple, modern, lightweight, open source and secure password manager
+description: >-
+  With Passky, you can easily and securely store all of your passwords in one place.
+  
+  
+  Say goodbye to the hassle of remembering multiple complex passwords - with Passky, all you need is one master password to access all of your accounts.
+  
+  
+  Passky uses advanced encryption technology to keep your passwords safe and secure, so you can have peace of mind knowing that your sensitive information is protected.
+  
+  
+  Plus, Passky is easy to use and available on all of your devices, so you can access your passwords wherever you go. Try Passky today and take control of your online security!
+developer: Rabbit Company LLC
+website: https://passky.org
+dependencies: []
+repo: https://github.com/Rabbit-Company/Passky-Server
+support: https://passky.org/contact
+port: 5050
+gallery:
+  - 1.jpg
+  - 2.jpg
+  - 3.jpg
+path: ""
+defaultUsername: admin
+deterministicPassword: true
+submitter: Rabbit Company LLC
+submission: https://github.com/getumbrel/umbrel-apps/pull/384
\ No newline at end of file