diff --git a/docker/serve.Dockerfile b/docker/serve.Dockerfile
index c24ee9c..1ddf0b9 100644
--- a/docker/serve.Dockerfile
+++ b/docker/serve.Dockerfile
@@ -1,13 +1,5 @@
-FROM busybox:stable
-
-# Create a non-root user to own the files and run our server
-RUN adduser -D static
-USER static
-WORKDIR /home/static
+FROM git.hswro.org/fleg/serve_base:latest
 
 # Copy the static website
 # Use the .dockerignore file to control what ends up inside the image!
 COPY . .
-
-# Run BusyBox httpd
-CMD ["busybox", "httpd", "-f", "-v", "-p", "3000"]
diff --git a/docker/serve_base.Dockerfile b/docker/serve_base.Dockerfile
new file mode 100644
index 0000000..976db93
--- /dev/null
+++ b/docker/serve_base.Dockerfile
@@ -0,0 +1,9 @@
+FROM busybox:stable
+
+# 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"]