diff --git a/Dockerfile b/Dockerfile
index 8ab727a..b86073d 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,7 +2,7 @@
 # Licensed under GNU Affero GPL v3 or later
 
 # NOTE Keep default tag in sync with docker-compose.yml
-ARG CADDY_TAG=2.7.6-alpine
+ARG CADDY_TAG=2.8.4-alpine
 FROM caddy:${CADDY_TAG}
 
 # Install system upgrades
diff --git a/docker-compose.yml b/docker-compose.yml
index e8b385a..f6341eb 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -13,7 +13,7 @@ services:
       context: .
       args:
         # NOTE Keep default tag in sync with Dockerfile
-        CADDY_TAG: ${CADDY_TAG:-2.7.6-alpine}
+        CADDY_TAG: ${CADDY_TAG:-2.8.4-alpine}
     ports:
       - 80:80
       - 443:443