diff --git a/Dockerfile.prod b/Dockerfile.prod
index 3bbb2f4..0ddd97b 100644
--- a/Dockerfile.prod
+++ b/Dockerfile.prod
@@ -12,23 +12,12 @@ RUN apk update && apk upgrade && \
 
 RUN hugo --minify
 
-# STEP 2: Build the static-web-server
-FROM golang:alpine AS build-webserver
-
-RUN apk update && apk upgrade && \
-    apk add --no-cache git
-
-RUN go get -u git.simplesystems.tech/simplesystems/static-web-server
-
-# STEP 3: Combine static files and binary on fresh alpine image
-FROM alpine:latest
+# STEP 2: Add static files to webserver image
+FROM docker.simplesystems.tech/simplesystems/webserver:latest
 
 WORKDIR /app
 
 # Copy over static website files
 COPY --from=build-website /src/public /app/public
 
-# Copy over static-web-server
-COPY --from=build-webserver /go/bin/static-web-server /app/
-
-ENTRYPOINT ["./static-web-server", "-rootDir", "public", "-port", "80"]
+ENTRYPOINT ["./static-web-server", "-rootDir", "public", "-port", "8080"]