diff --git a/.goreleaser.yaml b/.goreleaser.yaml
index 0dd8f87cd..b4812d289 100644
--- a/.goreleaser.yaml
+++ b/.goreleaser.yaml
@@ -90,6 +90,8 @@ builds:
       - amd64
       - arm64
       - arm
+    goarm:
+      - 7
     ldflags:
       - -s -w -X github.com/netbirdio/netbird/version.version={{.Version}} -X main.commit={{.Commit}} -X main.date={{.CommitDate}} -X main.builtBy=goreleaser
     mod_timestamp: "{{ .CommitTimestamp }}"
@@ -104,6 +106,8 @@ builds:
       - amd64
       - arm64
       - arm
+    goarm:
+      - 7
     ldflags:
       - -s -w -X github.com/netbirdio/netbird/version.version={{.Version}} -X main.commit={{.Commit}} -X main.date={{.CommitDate}} -X main.builtBy=goreleaser
     mod_timestamp: "{{ .CommitTimestamp }}"
@@ -124,6 +128,8 @@ builds:
       - amd64
       - arm64
       - arm
+    goarm:
+      - 7
     ldflags:
       - -s -w -X github.com/netbirdio/netbird/version.version={{.Version}} -X main.commit={{.Commit}} -X main.date={{.CommitDate}} -X main.builtBy=goreleaser
     mod_timestamp: "{{ .CommitTimestamp }}"
@@ -138,6 +144,8 @@ builds:
       - amd64
       - arm64
       - arm
+    goarm:
+      - 7
     ldflags:
       - -s -w -X github.com/netbirdio/netbird/version.version={{.Version}} -X main.commit={{.Commit}} -X main.date={{.CommitDate}} -X main.builtBy=goreleaser
     mod_timestamp: "{{ .CommitTimestamp }}"
@@ -152,6 +160,8 @@ builds:
       - amd64
       - arm64
       - arm
+    goarm:
+      - 7
     ldflags:
       - -s -w -X main.Version={{.Version}} -X main.Commit={{.Commit}} -X main.BuildDate={{.CommitDate}}
     mod_timestamp: "{{ .CommitTimestamp }}"
@@ -172,6 +182,8 @@ builds:
       - amd64
       - arm64
       - arm
+    goarm:
+      - 7
     ldflags:
       - -s -w -X github.com/netbirdio/netbird/version.version={{.Version}} -X main.commit={{.Commit}} -X main.date={{.CommitDate}} -X main.builtBy=goreleaser
     mod_timestamp: "{{ .CommitTimestamp }}"
@@ -287,7 +299,7 @@ dockers_v2:
      platforms:
        - linux/amd64
        - linux/arm64
-       - linux/arm/6
+       - linux/arm
      annotations:
        "org.opencontainers.image.created": "{{.Date}}"
        "org.opencontainers.image.title": "{{.ProjectName}}"
@@ -309,7 +321,7 @@ dockers_v2:
      platforms:
        - linux/amd64
        - linux/arm64
-       - linux/arm/6
+       - linux/arm
      annotations:
        "org.opencontainers.image.created": "{{.Date}}"
        "org.opencontainers.image.title": "{{.ProjectName}}"
@@ -331,7 +343,7 @@ dockers_v2:
      platforms:
        - linux/amd64
        - linux/arm64
-       - linux/arm/6
+       - linux/arm
      annotations:
        "org.opencontainers.image.created": "{{.Date}}"
        "org.opencontainers.image.title": "{{.ProjectName}}"
@@ -353,7 +365,7 @@ dockers_v2:
      platforms:
        - linux/amd64
        - linux/arm64
-       - linux/arm/6
+       - linux/arm
      annotations:
        "org.opencontainers.image.created": "{{.Date}}"
        "org.opencontainers.image.title": "{{.ProjectName}}"
@@ -375,7 +387,7 @@ dockers_v2:
      platforms:
        - linux/amd64
        - linux/arm64
-       - linux/arm/6
+       - linux/arm
      annotations:
        "org.opencontainers.image.created": "{{.Date}}"
        "org.opencontainers.image.title": "{{.ProjectName}}"
@@ -397,7 +409,7 @@ dockers_v2:
      platforms:
        - linux/amd64
        - linux/arm64
-       - linux/arm/6
+       - linux/arm
      annotations:
        "org.opencontainers.image.created": "{{.Date}}"
        "org.opencontainers.image.title": "{{.ProjectName}}"
diff --git a/proxy/Dockerfile b/proxy/Dockerfile
index eeee888bf..22c4cbfaa 100644
--- a/proxy/Dockerfile
+++ b/proxy/Dockerfile
@@ -6,8 +6,7 @@ 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 alpine:3.24
-RUN apk add --no-cache bash ca-certificates
+FROM gcr.io/distroless/base:debug
 ARG TARGETPLATFORM
 COPY ${TARGETPLATFORM}/netbird-proxy /go/bin/netbird-proxy
 COPY --from=builder /tmp/passwd /etc/passwd
diff --git a/relay/Dockerfile b/relay/Dockerfile
index 5d9616e94..757ee7b59 100644
--- a/relay/Dockerfile
+++ b/relay/Dockerfile
@@ -1,5 +1,4 @@
-FROM alpine:3.24
-RUN apk add --no-cache bash ca-certificates
+FROM gcr.io/distroless/base:debug
 ENTRYPOINT [ "/go/bin/netbird-relay" ]
 ENV NB_LOG_FILE=console
 ARG TARGETPLATFORM
diff --git a/signal/Dockerfile b/signal/Dockerfile
index f16843566..f6504dc74 100644
--- a/signal/Dockerfile
+++ b/signal/Dockerfile
@@ -1,5 +1,4 @@
-FROM alpine:3.24
-RUN apk add --no-cache bash ca-certificates
+FROM gcr.io/distroless/base:debug
 ENTRYPOINT [ "/go/bin/netbird-signal","run" ]
 CMD ["--log-file", "console"]
 ARG TARGETPLATFORM
diff --git a/upload-server/Dockerfile b/upload-server/Dockerfile
index 521369c97..3713d6f2a 100644
--- a/upload-server/Dockerfile
+++ b/upload-server/Dockerfile
@@ -1,5 +1,4 @@
-FROM alpine:3.24
-RUN apk add --no-cache bash ca-certificates
+FROM gcr.io/distroless/base:debug
 ENTRYPOINT [ "/go/bin/netbird-upload" ]
 ARG TARGETPLATFORM
 COPY ${TARGETPLATFORM}/netbird-upload /go/bin/netbird-upload