diff --git a/Dockerfile.distroless b/Dockerfile.distroless
index f98d449..2e5a0ca 100644
--- a/Dockerfile.distroless
+++ b/Dockerfile.distroless
@@ -15,7 +15,7 @@ RUN ./azure-scheduledevents-manager --help
 #############################################
 # FINAL IMAGE
 #############################################
-FROM gcr.io/distroless/base
+FROM gcr.io/distroless/static
 ENV LOG_JSON=1
 COPY --from=build /go/src/github.com/webdevops/azure-scheduledevents-manager/azure-scheduledevents-manager /
 USER 1000
diff --git a/Dockerfile.kubernetes b/Dockerfile.kubernetes
index 4731634..701306c 100644
--- a/Dockerfile.kubernetes
+++ b/Dockerfile.kubernetes
@@ -24,7 +24,7 @@ RUN /kubectl version --client=true
 #############################################
 # FINAL IMAGE
 #############################################
-FROM gcr.io/distroless/base
+FROM gcr.io/distroless/static
 ENV LOG_JSON=1 \
     DRAIN_MODE=kubernetes
 COPY --from=kubectl /kubectl /
diff --git a/Dockerfile.ubuntu b/Dockerfile.ubuntu
deleted file mode 100644
index ee228d6..0000000
--- a/Dockerfile.ubuntu
+++ /dev/null
@@ -1,22 +0,0 @@
-FROM golang:1.18-alpine as build
-
-RUN apk upgrade --no-cache --force
-RUN apk add --update build-base make git
-
-WORKDIR /go/src/github.com/webdevops/azure-scheduledevents-manager
-
-# Compile
-COPY ./ /go/src/github.com/webdevops/azure-scheduledevents-manager
-RUN make dependencies
-RUN make test
-RUN make build
-RUN ./azure-scheduledevents-manager --help
-
-#############################################
-# FINAL IMAGE
-#############################################
-FROM ubuntu:20.04
-ENV LOG_JSON=1
-COPY --from=build /go/src/github.com/webdevops/azure-scheduledevents-manager/azure-scheduledevents-manager /
-USER 1000
-ENTRYPOINT ["/azure-scheduledevents-manager"]