diff --git a/docker/Dockerfile b/docker/Dockerfile
index 7411f23..f6b73e2 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -1,5 +1,5 @@
 ########
-FROM golang:1.17.10-buster as backendbuild
+FROM golang:1.17-bullseye as backendbuild
 
 WORKDIR /go/src/github.com/analogj/scrutiny
 
@@ -11,7 +11,7 @@ RUN go mod vendor && \
     go build -ldflags '-w -extldflags "-static"' -o scrutiny-collector-metrics collector/cmd/collector-metrics/collector-metrics.go
 
 ########
-FROM ubuntu:latest as runtime
+FROM debian:bullseye-slim as runtime
 ARG TARGETARCH
 EXPOSE 8080
 WORKDIR /opt/scrutiny
diff --git a/docker/Dockerfile.collector b/docker/Dockerfile.collector
index 4c1dc8e..18d5d6f 100644
--- a/docker/Dockerfile.collector
+++ b/docker/Dockerfile.collector
@@ -1,5 +1,5 @@
 ########
-FROM golang:1.17.10-buster as backendbuild
+FROM golang:1.17-bullseye as backendbuild
 
 WORKDIR /go/src/github.com/analogj/scrutiny
 
@@ -10,7 +10,7 @@ RUN go mod vendor && \
     go build -ldflags '-w -extldflags "-static"' -o scrutiny-collector-metrics collector/cmd/collector-metrics/collector-metrics.go
 
 ########
-FROM ubuntu:latest as runtime
+FROM debian:bullseye-slim as runtime
 WORKDIR /scrutiny
 ENV PATH="/opt/scrutiny/bin:${PATH}"
 
diff --git a/docker/Dockerfile.web b/docker/Dockerfile.web
index b424f52..2ba3792 100644
--- a/docker/Dockerfile.web
+++ b/docker/Dockerfile.web
@@ -1,5 +1,5 @@
 ########
-FROM golang:1.17.10-buster as backendbuild
+FROM golang:1.17-bullseye as backendbuild
 
 WORKDIR /go/src/github.com/analogj/scrutiny
 
@@ -9,7 +9,7 @@ RUN go mod vendor && \
     go build -ldflags '-w -extldflags "-static"' -o scrutiny webapp/backend/cmd/scrutiny/scrutiny.go
 
 ########
-FROM ubuntu:latest as runtime
+FROM debian:bullseye-slim as runtime
 EXPOSE 8080
 WORKDIR /opt/scrutiny
 ENV PATH="/opt/scrutiny/bin:${PATH}"