diff --git a/container-config/borgmatic/config.yaml b/container-config/borgmatic/config.yaml
index b279f3c..2d30e68 100644
--- a/container-config/borgmatic/config.yaml
+++ b/container-config/borgmatic/config.yaml
@@ -5,8 +5,6 @@ source_directories:
   - /run/host/var/lib/containers/storage/secrets
   - /run/host/var/lib/containers/storage/volumes/systemd-*
   - /run/host/var/roothome
-exclude_patterns:
-  - /run/host/var/lib/containers/storage/volumes/systemd-monero
 repositories:
   - label: remote
     path: ${BORG_REMOTE}
@@ -15,4 +13,9 @@ keep_daily: 7
 keep_weekly: 4
 keep_monthly: 3
 read_special: true
+loki:
+  url: https://metrics.strypsteen.com/loki/api/v1/push
+  labels:
+    host: __hostname
+    job: borgmatic
 <<: !include /etc/borgmatic/local.yaml
diff --git a/container-config/borgmatic/home.yaml b/container-config/borgmatic/home.yaml
index cae7ba2..311bc17 100644
--- a/container-config/borgmatic/home.yaml
+++ b/container-config/borgmatic/home.yaml
@@ -1,3 +1,5 @@
+exclude_patterns:
+  - /run/host/var/lib/containers/storage/volumes/systemd-monero
 postgresql_databases:
   - name: all
     hostname: systemd-postgresql
diff --git a/container-config/borgmatic/infra.yaml b/container-config/borgmatic/infra.yaml
index 83394b7..bbf850e 100644
--- a/container-config/borgmatic/infra.yaml
+++ b/container-config/borgmatic/infra.yaml
@@ -1,3 +1,5 @@
+exclude_patterns:
+  - /run/host/var/lib/containers/storage/volumes/systemd-forgejo/_data/data/packages
 postgresql_databases:
   - name: all
     hostname: systemd-postgresql
diff --git a/home/etc/containers/systemd/borgmatic.container.d/override.conf b/home/etc/containers/systemd/borgmatic.container.d/override.conf
index 8f92d1e..0f28bb7 100644
--- a/home/etc/containers/systemd/borgmatic.container.d/override.conf
+++ b/home/etc/containers/systemd/borgmatic.container.d/override.conf
@@ -1,4 +1,4 @@
 [Container]
 Network=immich.network
-Network=postgresql.network
+Network=synapse.network
 Secret=POSTGRES_PASSWORD,type=env
diff --git a/home/etc/containers/systemd/postgresql.container b/home/etc/containers/systemd/postgresql.container
index 3d722ed..328dedd 100644
--- a/home/etc/containers/systemd/postgresql.container
+++ b/home/etc/containers/systemd/postgresql.container
@@ -1,5 +1,5 @@
 [Container]
-Image=docker.io/postgres:16-alpine
+Image=docker.io/postgres:17-alpine
 Network=nextcloud.network
 Network=synapse.network
 Volume=postgresql.volume:/var/lib/postgresql/data:U,Z
diff --git a/infra/etc/containers/systemd/postgresql.container b/infra/etc/containers/systemd/postgresql.container
index 905bf44..d601df5 100644
--- a/infra/etc/containers/systemd/postgresql.container
+++ b/infra/etc/containers/systemd/postgresql.container
@@ -1,5 +1,5 @@
 [Container]
-Image=docker.io/postgres:16-alpine
+Image=docker.io/postgres:17-alpine
 Network=postgresql.network
 Volume=postgresql.volume:/var/lib/postgresql/data:U,Z
 Secret=POSTGRES_PASSWORD,type=env
diff --git a/server/etc/containers/systemd/borgmatic.container b/server/etc/containers/systemd/borgmatic.container
index e42d67a..2de4163 100644
--- a/server/etc/containers/systemd/borgmatic.container
+++ b/server/etc/containers/systemd/borgmatic.container
@@ -2,7 +2,7 @@
 Image=ghcr.io/borgmatic-collective/borgmatic
 SecurityLabelDisable=true
 UserNS=host
-HostName=borgmatic
+HostName=%H
 Volume=/var/lib/system-config/container-config/borgmatic/config.yaml:/etc/borgmatic/config.yaml:z,ro
 Volume=/var/lib/system-config/container-config/borgmatic/%H.yaml:/etc/borgmatic/local.yaml:z,ro
 Volume=/:/run/host:ro