diff --git a/stacks/productivity/docker-compose.yml b/stacks/productivity/docker-compose.yml
index 7a31338..722a26e 100644
--- a/stacks/productivity/docker-compose.yml
+++ b/stacks/productivity/docker-compose.yml
@@ -58,3 +58,29 @@ services:
       - 8054:80
     volumes:
       - /mnt/user/appdata/freshrss:/config
+
+  linkwarden:
+    image: ghcr.io/linkwarden/linkwarden:latest
+    container_name: linkwarden
+    restart: unless-stopped
+    ports:
+      - 3000:3000
+    environment:
+      - DATABASE_URL=postgresql://linkwarden:${LINKWARDEN_DB_PASSWORD}@linkwarden-db:5432/linkwarden
+      - NEXTAUTH_SECRET=${LINKWARDEN_NEXTAUTH_SECRET}
+      - NEXTAUTH_URL=${LINKWARDEN_URL:-http://localhost:3000}
+    volumes:
+      - /mnt/user/appdata/linkwarden/data:/data/data
+    depends_on:
+      - linkwarden-db
+
+  linkwarden-db:
+    image: postgres:16-alpine
+    container_name: linkwarden-db
+    restart: unless-stopped
+    environment:
+      - POSTGRES_USER=linkwarden
+      - POSTGRES_PASSWORD=${LINKWARDEN_DB_PASSWORD}
+      - POSTGRES_DB=linkwarden
+    volumes:
+      - /mnt/user/appdata/linkwarden/pgdata:/var/lib/postgresql/data
diff --git a/stacks/productivity/stack.env b/stacks/productivity/stack.env
index 5f28b46..8cb7c57 100644
--- a/stacks/productivity/stack.env
+++ b/stacks/productivity/stack.env
@@ -1 +1,4 @@
 VAULTWARDEN_ADMIN_TOKEN=emNPS8DJtzKaLDG3i+braZik2xuPYWHIZeyfoI6dRmP++0JyE7NtC3L5dv0w2yM4
+LINKWARDEN_DB_PASSWORD=PDes9IBNSdVI2MZoSE2AWQ
+LINKWARDEN_NEXTAUTH_SECRET=xDPOfmHbBP4uR12AzGn8nog8cMzExn4q830b9wfAD88=
+LINKWARDEN_URL=https://bookmarks.rishighan.com