diff --git a/quadlets/adguard/adguard.container b/quadlets/adguard/adguard.container
deleted file mode 100644
index a45bb77..0000000
--- a/quadlets/adguard/adguard.container
+++ /dev/null
@@ -1,28 +0,0 @@
-[Unit]
-Description=Adguard Quadlet
-
-[Service]
-Restart=always
-TimeoutStartSec=900
-
-[Install]
-WantedBy=default.target
-
-[Container]
-Image=docker.io/adguard/adguardhome:latest
-ContainerName=adguard
-HostName=adguard
-
-# Optionally run this on network mode host, if you want real client ips to show in the logs
-# Network=host
-PublishPort=53:53/tcp
-PublishPort=53:53/udp
-PublishPort=784:784/udp
-PublishPort=853:853/tcp
-PublishPort=3000:3000/tcp
-PublishPort=8844:80/tcp
-PublishPort=8443:443/tcp
-
-Volume=adguard-config:/opt/adguardhome/work:z
-Volume=adguard-work:/opt/adguardhome/conf:z
-Volume=/var/log/AdGuardHome.log:/var/log/AdGuardHome.log:z
\ No newline at end of file
diff --git a/quadlets/adguard/adguard.volume b/quadlets/adguard/adguard.volume
deleted file mode 100644
index 33ddc98..0000000
--- a/quadlets/adguard/adguard.volume
+++ /dev/null
@@ -1,3 +0,0 @@
-[Volume]
-VolumeName=adguard-config
-VolumeName=adguard-work
\ No newline at end of file
diff --git a/quadlets/audiobookshelf/audiobookshelf.container b/quadlets/audiobookshelf/audiobookshelf.container
deleted file mode 100644
index 32d1ddf..0000000
--- a/quadlets/audiobookshelf/audiobookshelf.container
+++ /dev/null
@@ -1,23 +0,0 @@
-[Unit]
-Description=Audiobookshelf Quadlet
-
-[Service]
-Restart=always
-TimeoutStartSec=900
-
-[Install]
-WantedBy=default.target
-
-[Container]
-Image=docker.io/advplyr/audiobookshelf:latest
-ContainerName=audiobookshelf
-HostName=audiobookshelf
-
-PublishPort=13378:80
-
-Volume=audiobookshelf-config:/metadata:z
-Volume=audiobookshelf-metadata:/config:z
-Volume=audiobookshelf-audiobooks:/audiobooks:z
-
-Environment=AUDIOBOOKSHELF_UID=USER_UID_HERE
-Environment=AUDIOBOOKSHELF_GID=USER_GID_HERE
\ No newline at end of file
diff --git a/quadlets/audiobookshelf/audiobookshelf.volume b/quadlets/audiobookshelf/audiobookshelf.volume
deleted file mode 100644
index 5c541fb..0000000
--- a/quadlets/audiobookshelf/audiobookshelf.volume
+++ /dev/null
@@ -1,4 +0,0 @@
-[Volume]
-VolumeName=audiobookshelf-config
-VolumeName=audiobookshelf-metadata
-VolumeName=audiobookshelf-audiobooks
\ No newline at end of file
diff --git a/quadlets/freshrss/fivefilters.container b/quadlets/freshrss/fivefilters.container
deleted file mode 100644
index d34fce8..0000000
--- a/quadlets/freshrss/fivefilters.container
+++ /dev/null
@@ -1,18 +0,0 @@
-[Unit]
-Description=Five Filters Quadlet
-
-[Service]
-Restart=always
-TimeoutStartSec=900
-
-[Install]
-WantedBy=default.target
-
-[Container]
-Image=docker.io/heussd/fivefilters-full-text-rss:latest
-ContainerName=fivefilters
-HostName=fivefilters
-
-PublishPort=5000:80
-
-Environment=FTR_ADMIN_PASSWORD=XXXXXXXX
\ No newline at end of file
diff --git a/quadlets/freshrss/freshrss.container b/quadlets/freshrss/freshrss.container
deleted file mode 100644
index 0b6b7cf..0000000
--- a/quadlets/freshrss/freshrss.container
+++ /dev/null
@@ -1,23 +0,0 @@
-[Unit]
-Description=FreshRSS Quadlet
-After=fivefilters.service
-
-[Service]
-Restart=always
-TimeoutStartSec=900
-
-[Install]
-WantedBy=default.target
-
-[Container]
-Image=docker.io/linuxserver/freshrss:latest
-ContainerName=freshrss
-HostName=freshrss
-
-PublishPort=4422:80
-
-Volume=freshrss-config:/config:z
-
-Environment=PUID=1001
-Environment=PGID=1001
-Environment=TZ=Europe/London
\ No newline at end of file
diff --git a/quadlets/freshrss/freshrss.volume b/quadlets/freshrss/freshrss.volume
deleted file mode 100644
index 1bf9b88..0000000
--- a/quadlets/freshrss/freshrss.volume
+++ /dev/null
@@ -1,2 +0,0 @@
-[Volume]
-VolumeName=freshrss-config
\ No newline at end of file
diff --git a/quadlets/it-tools/it-tools.container b/quadlets/it-tools/it-tools.container
deleted file mode 100644
index b191b46..0000000
--- a/quadlets/it-tools/it-tools.container
+++ /dev/null
@@ -1,16 +0,0 @@
-[Unit]
-Description=IT Tools Quadlet
-
-[Service]
-Restart=always
-TimeoutStartSec=900
-
-[Install]
-WantedBy=default.target
-
-[Container]
-Image=docker.io/corentinth/it-tools:latest
-ContainerName=it-tools
-HostName=it-tools
-
-PublishPort=8088:80
\ No newline at end of file
diff --git a/quadlets/matrix/matrix-db.container b/quadlets/matrix/matrix-db.container
new file mode 100644
index 0000000..6dfe973
--- /dev/null
+++ b/quadlets/matrix/matrix-db.container
@@ -0,0 +1,24 @@
+[Unit]
+Description=Matrix Synapse Quadlet
+
+[Service]
+Restart=always
+TimeoutStartSec=900
+
+[Install]
+WantedBy=default.target
+
+[Container]
+Image=docker.io/matrixdotorg/synapse:latest
+ContainerName=matrix_synapse
+HostName=matrix_synapse
+
+PublishPort=8008:8008
+
+Volume=matrix-data:/data
+
+Environment=VIRTUAL_HOST=matrix.example.com
+Environment=VIRTUAL_PORT=8008
+Environment=LETSENCRYPT_HOST=matrix.example.com
+Environment=SYNAPSE_SERVER_NAME=matrix.example.com
+Environment=SYNAPSE_REPORT_STATS=no
\ No newline at end of file
diff --git a/quadlets/matrix/matrix-db.volume b/quadlets/matrix/matrix-db.volume
new file mode 100644
index 0000000..020734b
--- /dev/null
+++ b/quadlets/matrix/matrix-db.volume
@@ -0,0 +1,2 @@
+[Volume]
+VolumeName=matrix-db-data
\ No newline at end of file
diff --git a/quadlets/matrix/matrix.container b/quadlets/matrix/matrix.container
new file mode 100644
index 0000000..427d59e
--- /dev/null
+++ b/quadlets/matrix/matrix.container
@@ -0,0 +1,27 @@
+[Unit]
+Description=Matrix Synapse DB Quadlet
+WantedBy=matrix.service
+
+[Service]
+Restart=always
+TimeoutStartSec=900
+
+[Install]
+WantedBy=default.target
+
+[Container]
+Image=docker.io/library/postgres:15
+ContainerName=matrix_synapse_db
+HostName=matrix_synapse_db
+
+PublishPort=5432:5432
+
+Volume=matrix-db-data:/var/lib/postgresql/data:z
+
+Environment=POSTGRES_PASSWORD=xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
+Environment=POSTGRES_USER=synapse_user
+Environment=POSTGRES_DB=synapse
+Environment=LANG=C
+Environment=LC_COLLATE=C
+Environment=LC_CTYPE=C
+Environment=POSTGRES_INITDB_ARGS=--encoding=UTF-8 --lc-collate=C --lc-ctype=C
\ No newline at end of file
diff --git a/quadlets/matrix/matrix.volume b/quadlets/matrix/matrix.volume
new file mode 100644
index 0000000..18cc26b
--- /dev/null
+++ b/quadlets/matrix/matrix.volume
@@ -0,0 +1,2 @@
+[Volume]
+VolumeName=matrix-data
\ No newline at end of file
diff --git a/quadlets/netboot-xyz/netboot-xyz.container b/quadlets/netboot-xyz/netboot-xyz.container
deleted file mode 100644
index 4e2284c..0000000
--- a/quadlets/netboot-xyz/netboot-xyz.container
+++ /dev/null
@@ -1,30 +0,0 @@
-[Unit]
-Description=Netbook.xyz Quadlet
-
-[Service]
-Restart=always
-TimeoutStartSec=900
-
-[Install]
-WantedBy=default.target
-
-[Container]
-Image=lscr.io/linuxserver/netbootxyz:latest
-ContainerName=netboot-xyz
-HostName=netboot-xyz
-
-Volume=netboot-xyz-config:/config
-Volume=netboot-xyz-assets:/assets:z
-
-PublishPort=3000:3000
-PublishPort=8082:80
-PublishPort=69:69/udp
-
-Environment=PUID=
-Environment=PGID=
-Environment=TZ=
-Environment=PORT_RANGE=30000:30010
-Environment=SUBFOLDER=/
-Environment=WEB_APP_PORT=3000
-
-
diff --git a/quadlets/netboot-xyz/netboot-xyz.volume b/quadlets/netboot-xyz/netboot-xyz.volume
deleted file mode 100644
index 151c426..0000000
--- a/quadlets/netboot-xyz/netboot-xyz.volume
+++ /dev/null
@@ -1,3 +0,0 @@
-[Volume]
-VolumeName=netboot-xyz-config
-VolumeName=netboot-xyz-assets
\ No newline at end of file