diff --git a/id.tjo.space/containers/authentik-server.container b/id.tjo.space/containers/authentik-server.container
index 0dc0582..7f37051 100644
--- a/id.tjo.space/containers/authentik-server.container
+++ b/id.tjo.space/containers/authentik-server.container
@@ -10,6 +10,7 @@ Volume=/srv/authentik/media:/media
 Volume=/srv/authentik/custom-templates:/custom-templates
 Network=main.network
 User=1200
+AutoUpdate=registry
 
 [Service]
 Restart=always
diff --git a/id.tjo.space/containers/authentik-worker.container b/id.tjo.space/containers/authentik-worker.container
index 9a2559b..f36d679 100644
--- a/id.tjo.space/containers/authentik-worker.container
+++ b/id.tjo.space/containers/authentik-worker.container
@@ -11,6 +11,7 @@ Volume=/srv/authentik/certs:/certs
 Volume=/srv/authentik/custom-templates:/custom-templates
 Network=main.network
 User=1200
+AutoUpdate=registry
 
 [Service]
 Restart=always
diff --git a/id.tjo.space/containers/caddy.container b/id.tjo.space/containers/caddy.container
index 12752fd..5ff79dd 100644
--- a/id.tjo.space/containers/caddy.container
+++ b/id.tjo.space/containers/caddy.container
@@ -2,13 +2,14 @@
 Description=A Caddy Container
 
 [Container]
-Image=docker.io/caddy:2.9
+Image=docker.io/caddy:2
 PublishPort=[::]:443:443
 PublishPort=0.0.0.0:443:443
 PublishPort=[::]:80:80
 PublishPort=0.0.0.0:80:80
 Volume=/etc/caddy:/etc/caddy:ro
 Network=main.network
+AutoUpdate=registry
 
 [Service]
 Restart=always
diff --git a/id.tjo.space/containers/postgresql.container b/id.tjo.space/containers/postgresql.container
index 6003275..02afc99 100644
--- a/id.tjo.space/containers/postgresql.container
+++ b/id.tjo.space/containers/postgresql.container
@@ -8,6 +8,9 @@ EnvironmentFile=/etc/postgresql/secrets.env
 Environment=POSTGRES_USER=id.tjo.space
 Environment=POSTGRES_DB=id.tjo.space
 Network=main.network
+AutoUpdate=registry
+HealthCmd=pg_isready -d $${POSTGRES_DB} -U $${POSTGRES_USER}
+HealthStartPeriod=20s
 
 [Service]
 Restart=always
diff --git a/id.tjo.space/containers/valkey.container b/id.tjo.space/containers/valkey.container
index 23185e5..02e3291 100644
--- a/id.tjo.space/containers/valkey.container
+++ b/id.tjo.space/containers/valkey.container
@@ -4,6 +4,10 @@ Description=A Valkey Container
 [Container]
 Image=docker.io/valkey/valkey:8
 Network=main.network
+AutoUpdate=registry
+HealthCmd=valkey-cli ping | grep PONG
+HealthStartPeriod=20s
+HealthTimeout=3s
 
 [Service]
 Restart=always