diff --git a/quadlets/joplin/joplin-db.container b/quadlets/joplin/joplin-db.container
index 425a731..8870799 100644
--- a/quadlets/joplin/joplin-db.container
+++ b/quadlets/joplin/joplin-db.container
@@ -16,6 +16,7 @@ HostName=joplin-db
 
 Volume=joplindb-data:/var/lib/postgresql/data
 
-Environment=POSTGRES_PASSWORD=xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
 Environment=POSTGRES_USER=postgres
 Environment=POSTGRES_DB=joplin
+
+Secret=joplin-db-pw,type=env,target=POSTGRES_PASSWORD
diff --git a/quadlets/joplin/joplin.container b/quadlets/joplin/joplin.container
index 963afc4..6581334 100644
--- a/quadlets/joplin/joplin.container
+++ b/quadlets/joplin/joplin.container
@@ -1,5 +1,5 @@
 [Unit]
-Description=Joplin Server Quadlet
+Description=Joplin server
 
 [Service]
 Restart=always
@@ -9,17 +9,18 @@ TimeoutStartSec=900
 WantedBy=default.target
 
 [Container]
-Image=docker.io/etechonomy/joplin-server:latest
+Image=docker.io/joplin/server:latest
 ContainerName=joplin-server
 HostName=joplin-server
 
 PublishPort=22300:22300
 
-Environment=APP_BASE_URL=https://xxxxx.xxx
+Environment=APP_BASE_URL=https://joplin.example.com
 Environment=APP_PORT=22300
 Environment=DB_CLIENT=pg
-Environment=POSTGRES_PASSWORD=xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
 Environment=POSTGRES_DATABASE=joplin
 Environment=POSTGRES_USER=postgres
 Environment=POSTGRES_PORT=5432
-Environment=POSTGRES_HOST=joplin-db
\ No newline at end of file
+Environment=POSTGRES_HOST=joplin-db
+
+Secret=joplin-db-pw,type=env,target=POSTGRES_PASSWORD