diff --git a/linkwarden/data/app/.gitkeep b/linkwarden/data/app/.gitkeep
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/linkwarden/data/db/.gitkeep b/linkwarden/data/db/.gitkeep
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/linkwarden/docker-compose.yml b/linkwarden/docker-compose.yml
new file mode 100644
index 0000000000..3ff779f42b
--- /dev/null
+++ b/linkwarden/docker-compose.yml
@@ -0,0 +1,35 @@
+version: "3.7"
+
+services:
+  app_proxy:
+    environment:
+      APP_HOST: linkwarden_app_1
+      APP_PORT: 3000
+      PROXY_AUTH_ADD: "false"
+  
+  postgres:
+    image: postgres:16-alpine@sha256:0366402213df5db03c47ff80bcc697e92c8be0c213d03c941df1fc42d1ba9560
+    user: "1000:1000"
+    environment:
+      - POSTGRES_PASSWORD=linkwarden
+    restart: on-failure
+    volumes:
+      - ${APP_DATA_DIR}/data/db:/var/lib/postgresql/data
+    healthcheck:
+      test: ["CMD-SHELL", "pg_isready -U postgres"]
+      interval: 10s
+      timeout: 5s
+      retries: 5
+  app:
+    image: ghcr.io/linkwarden/linkwarden:v2.8.3@sha256:7f80a03d688c3e5d9ec6b34f5b65cd861ff8c9eb08d12932dc8fc7482991f238
+    user: "1000:1000"
+    environment:
+      - DATABASE_URL=postgresql://postgres:linkwarden@postgres:5432/postgres
+      - NEXTAUTH_URL=http://${DEVICE_DOMAIN_NAME}:8233/api/v1/auth
+      - NEXTAUTH_SECRET=linkwarden
+    restart: on-failure
+    volumes:
+      - ${APP_DATA_DIR}/data/app:/data/data
+    depends_on:
+      postgres:
+        condition: service_healthy
diff --git a/linkwarden/umbrel-app.yml b/linkwarden/umbrel-app.yml
new file mode 100644
index 0000000000..92f0c84646
--- /dev/null
+++ b/linkwarden/umbrel-app.yml
@@ -0,0 +1,27 @@
+manifestVersion: 1
+id: linkwarden
+name: Linkwarden
+tagline: Bookmark Preservation for Individuals and Teams
+category: social
+version: "2.8.3"
+port: 8233
+description: >-
+  📚 Linkwarden is a self-hosted, open-source collaborative bookmark manager to collect, organize and archive webpages.
+
+
+  🛜 The objective is to organize useful webpages and articles you find across the web in one place, and since useful webpages can go away (see the inevitability of Link Rot), Linkwarden also saves a copy of each webpage as a Screenshot and PDF, ensuring accessibility even if the original content is no longer available.
+
+
+  👥 Additionally, Linkwarden is designed with collaboration in mind, sharing links with the public and/or allowing multiple users to work together seamlessly.
+developer: Linkwarden
+website: https://linkwarden.app
+submitter: al-lac
+submission: https://github.com/getumbrel/umbrel-apps/pull/1817
+repo: https://github.com/linkwarden/linkwarden
+support: https://discord.gg/CtuYV47nuJ
+gallery: []
+defaultUsername: ""
+defaultPassword: ""
+dependencies: []
+releaseNotes: ""
+path: ""