diff --git a/client/Dockerfile b/client/Dockerfile
index 159ae0b1d..478b2d0e2 100644
--- a/client/Dockerfile
+++ b/client/Dockerfile
@@ -4,7 +4,7 @@
 #   sudo podman build -t localhost/netbird:latest -f client/Dockerfile --ignorefile .dockerignore-client .
 #   sudo podman run --rm -it --cap-add={BPF,NET_ADMIN,NET_RAW} localhost/netbird:latest
 
-FROM alpine:3.23.3
+FROM alpine:3.24
 # iproute2: busybox doesn't display ip rules properly
 RUN apk add --no-cache \
     bash \
diff --git a/client/Dockerfile-rootless b/client/Dockerfile-rootless
index b6a49401f..8141af6ed 100644
--- a/client/Dockerfile-rootless
+++ b/client/Dockerfile-rootless
@@ -4,7 +4,7 @@
 #   podman build -t localhost/netbird:latest -f client/Dockerfile --ignorefile .dockerignore-client .
 #   podman run --rm -it --cap-add={BPF,NET_ADMIN,NET_RAW} localhost/netbird:latest
 
-FROM alpine:3.22.0
+FROM alpine:3.24
 
 RUN apk add --no-cache \
       bash \
diff --git a/proxy/Dockerfile b/proxy/Dockerfile
index 22c4cbfaa..eeee888bf 100644
--- a/proxy/Dockerfile
+++ b/proxy/Dockerfile
@@ -6,7 +6,8 @@ RUN echo "netbird:x:1000:1000:netbird:/var/lib/netbird:/sbin/nologin" > /tmp/pas
     mkdir -p /tmp/var/lib/netbird && \
     mkdir -p /tmp/certs
 
-FROM gcr.io/distroless/base:debug
+FROM alpine:3.24
+RUN apk add --no-cache bash ca-certificates
 ARG TARGETPLATFORM
 COPY ${TARGETPLATFORM}/netbird-proxy /go/bin/netbird-proxy
 COPY --from=builder /tmp/passwd /etc/passwd
diff --git a/proxy/Dockerfile.multistage b/proxy/Dockerfile.multistage
index 01e342c0e..2496cf8b7 100644
--- a/proxy/Dockerfile.multistage
+++ b/proxy/Dockerfile.multistage
@@ -24,7 +24,8 @@ RUN echo "netbird:x:1000:1000:netbird:/var/lib/netbird:/sbin/nologin" > /tmp/pas
     mkdir -p /tmp/var/lib/netbird && \
     mkdir -p /tmp/certs
 
-FROM gcr.io/distroless/base:debug
+FROM alpine:3.24
+RUN apk add --no-cache bash ca-certificates
 COPY --from=builder /app/netbird-proxy /usr/bin/netbird-proxy
 COPY --from=builder /tmp/passwd /etc/passwd
 COPY --from=builder /tmp/group /etc/group
diff --git a/relay/Dockerfile b/relay/Dockerfile
index 757ee7b59..5d9616e94 100644
--- a/relay/Dockerfile
+++ b/relay/Dockerfile
@@ -1,4 +1,5 @@
-FROM gcr.io/distroless/base:debug
+FROM alpine:3.24
+RUN apk add --no-cache bash ca-certificates
 ENTRYPOINT [ "/go/bin/netbird-relay" ]
 ENV NB_LOG_FILE=console
 ARG TARGETPLATFORM
diff --git a/signal/Dockerfile b/signal/Dockerfile
index f6504dc74..f16843566 100644
--- a/signal/Dockerfile
+++ b/signal/Dockerfile
@@ -1,4 +1,5 @@
-FROM gcr.io/distroless/base:debug
+FROM alpine:3.24
+RUN apk add --no-cache bash ca-certificates
 ENTRYPOINT [ "/go/bin/netbird-signal","run" ]
 CMD ["--log-file", "console"]
 ARG TARGETPLATFORM
diff --git a/upload-server/Dockerfile b/upload-server/Dockerfile
index 3713d6f2a..521369c97 100644
--- a/upload-server/Dockerfile
+++ b/upload-server/Dockerfile
@@ -1,4 +1,5 @@
-FROM gcr.io/distroless/base:debug
+FROM alpine:3.24
+RUN apk add --no-cache bash ca-certificates
 ENTRYPOINT [ "/go/bin/netbird-upload" ]
 ARG TARGETPLATFORM
 COPY ${TARGETPLATFORM}/netbird-upload /go/bin/netbird-upload