diff --git a/quadlets/joplin/joplin-db.container b/quadlets/joplin/joplin-db.container
new file mode 100644
index 0000000..425a731
--- /dev/null
+++ b/quadlets/joplin/joplin-db.container
@@ -0,0 +1,21 @@
+[Unit]
+Description=Joplin DB Quadlet
+WantedBy=joplin.service
+
+[Service]
+Restart=always
+TimeoutStartSec=900
+
+[Install]
+WantedBy=default.target
+
+[Container]
+Image=docker.io/library/postgres:15
+ContainerName=joplin-db
+HostName=joplin-db
+
+Volume=joplindb-data:/var/lib/postgresql/data
+
+Environment=POSTGRES_PASSWORD=xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
+Environment=POSTGRES_USER=postgres
+Environment=POSTGRES_DB=joplin
diff --git a/quadlets/joplin/joplin.container b/quadlets/joplin/joplin.container
new file mode 100644
index 0000000..963afc4
--- /dev/null
+++ b/quadlets/joplin/joplin.container
@@ -0,0 +1,25 @@
+[Unit]
+Description=Joplin Server Quadlet
+
+[Service]
+Restart=always
+TimeoutStartSec=900
+
+[Install]
+WantedBy=default.target
+
+[Container]
+Image=docker.io/etechonomy/joplin-server:latest
+ContainerName=joplin-server
+HostName=joplin-server
+
+PublishPort=22300:22300
+
+Environment=APP_BASE_URL=https://xxxxx.xxx
+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
diff --git a/quadlets/joplin/joplindb-data.volume b/quadlets/joplin/joplindb-data.volume
new file mode 100644
index 0000000..5f30a12
--- /dev/null
+++ b/quadlets/joplin/joplindb-data.volume
@@ -0,0 +1,2 @@
+[Volume]
+VolumeName=joplindb-data
\ No newline at end of file