diff --git a/docker/serve.Dockerfile b/docker/serve.Dockerfile
index 1ddf0b9..26ec326 100644
--- a/docker/serve.Dockerfile
+++ b/docker/serve.Dockerfile
@@ -1,4 +1,4 @@
-FROM git.hswro.org/fleg/serve_base:latest
+FROM git.hswro.org/fleg/serve_base:caddy
 
 # Copy the static website
 # Use the .dockerignore file to control what ends up inside the image!
diff --git a/docker/serve_base.Dockerfile b/docker/serve_base.Dockerfile
index 976db93..b1977d5 100644
--- a/docker/serve_base.Dockerfile
+++ b/docker/serve_base.Dockerfile
@@ -1,9 +1,7 @@
-FROM busybox:stable
+FROM caddy:2.9
 
-# Create a non-root user to own the files and run our server
-RUN adduser -D static
-USER static
-WORKDIR /home/static
-
-# Run BusyBox httpd
-CMD ["busybox", "httpd", "-f", "-v", "-p", "3000"]
+RUN echo -e ":3000 {\n\
+    root * /var/www\n\
+    file_server\n\
+}" > /etc/caddy/Caddyfile
+WORKDIR /var/www