diff --git a/productivity.yaml b/productivity.yaml
index 755304d..b95cd30 100644
--- a/productivity.yaml
+++ b/productivity.yaml
@@ -2,7 +2,7 @@ version: "3.5"
 services:
   lw-postgres:
     image: postgres
-    restart: always
+    restart: unless-stopped
     volumes:
       - /portainer/linkwarden/pgdata:/var/lib/postgresql/data
     networks:
@@ -13,9 +13,7 @@ services:
       - NEXTAUTH_URL=${NEXTAUTH_URL}
       - POSTGRES_PASSWORD=${POSTGRES_PASSWORD}
   linkwarden:
-    environment:
-      - DATABASE_URL=postgresql://postgres:${POSTGRES_PASSWORD}@lw-postgres:5432/postgres
-    restart: always
+    restart: unless-stopped
     image: ghcr.io/linkwarden/linkwarden:latest
     ports:
       - 3002:3000
@@ -27,6 +25,7 @@ services:
       - nginx
     hostname: linkwarden
     environment:
+      - DATABASE_URL=postgresql://postgres:${POSTGRES_PASSWORD}@lw-postgres:5432/postgres
       - NEXTAUTH_SECRET=${NEXTAUTH_SECRET}
       - NEXTAUTH_URL=${NEXTAUTH_URL}
       - POSTGRES_PASSWORD=${POSTGRES_PASSWORD}