diff --git a/src/Admin/Dockerfile b/src/Admin/Dockerfile
index 4ce844c8ec..e5277817bc 100644
--- a/src/Admin/Dockerfile
+++ b/src/Admin/Dockerfile
@@ -59,8 +59,8 @@ ENV SSL_CERT_DIR=/etc/bitwarden/ca-certificates
 ENV DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=false
 EXPOSE 5000
 
-RUN apk add gosu \
-    curl \
+RUN apk add gosu curl \
+    && apk add --no-cache --repository=http://dl-cdn.alpinelinux.org/alpine/edge/community gosu \
     && rm -rf /var/cache/apk/*
 
 # Copy app from the build stage
diff --git a/src/Billing/Dockerfile b/src/Billing/Dockerfile
index 14a9346a60..96d325ec28 100644
--- a/src/Billing/Dockerfile
+++ b/src/Billing/Dockerfile
@@ -50,8 +50,8 @@ ENV SSL_CERT_DIR=/etc/bitwarden/ca-certificates
 ENV DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=false
 EXPOSE 5000
 
-RUN apk add gosu \
-    curl \
+RUN apk add curl \
+    && apk add --no-cache --repository=http://dl-cdn.alpinelinux.org/alpine/edge/community gosu \
     && rm -rf /var/cache/apk/*
 
 # Copy app from the build stage
diff --git a/src/Events/Dockerfile b/src/Events/Dockerfile
index b45211106b..ed611ba1ff 100644
--- a/src/Events/Dockerfile
+++ b/src/Events/Dockerfile
@@ -50,8 +50,8 @@ ENV SSL_CERT_DIR=/etc/bitwarden/ca-certificates
 ENV DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=false
 EXPOSE 5000
 
-RUN apk add gosu \
-    curl \
+RUN apk add curl \
+    && apk add --no-cache --repository=http://dl-cdn.alpinelinux.org/alpine/edge/community gosu \
     && rm -rf /var/cache/apk/*
 
 # Copy app from the build stage
diff --git a/src/EventsProcessor/Dockerfile b/src/EventsProcessor/Dockerfile
index 971cc11372..f3ca04dd51 100644
--- a/src/EventsProcessor/Dockerfile
+++ b/src/EventsProcessor/Dockerfile
@@ -50,8 +50,8 @@ ENV SSL_CERT_DIR=/etc/bitwarden/ca-certificates
 ENV DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=false
 EXPOSE 5000
 
-RUN apk add gosu \
-    curl \
+RUN apk add curl \
+    && apk add --no-cache --repository=http://dl-cdn.alpinelinux.org/alpine/edge/community gosu \
     && rm -rf /var/cache/apk/*
 
 # Copy app from the build stage
diff --git a/src/Icons/Dockerfile b/src/Icons/Dockerfile
index 1689666f69..ed3c18eac0 100644
--- a/src/Icons/Dockerfile
+++ b/src/Icons/Dockerfile
@@ -49,8 +49,8 @@ ENV SSL_CERT_DIR=/etc/bitwarden/ca-certificates
 ENV DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=false
 EXPOSE 5000
 
-RUN apk add gosu \
-    curl \
+RUN apk add curl \
+    && apk add --no-cache --repository=http://dl-cdn.alpinelinux.org/alpine/edge/community gosu \
     && rm -rf /var/cache/apk/*
 
 # Copy app from the build stage
diff --git a/src/Identity/Dockerfile b/src/Identity/Dockerfile
index d14d8ace69..93e6001100 100644
--- a/src/Identity/Dockerfile
+++ b/src/Identity/Dockerfile
@@ -50,8 +50,8 @@ ENV SSL_CERT_DIR=/etc/bitwarden/ca-certificates
 ENV DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=false
 EXPOSE 5000
 
-RUN apk add gosu \
-    curl \
+RUN apk add curl \
+    && apk add --no-cache --repository=http://dl-cdn.alpinelinux.org/alpine/edge/community gosu \
     && rm -rf /var/cache/apk/*
 
 # Copy app from the build stage
diff --git a/src/Notifications/Dockerfile b/src/Notifications/Dockerfile
index 854e47bce0..75d39b4fb8 100644
--- a/src/Notifications/Dockerfile
+++ b/src/Notifications/Dockerfile
@@ -50,8 +50,8 @@ ENV SSL_CERT_DIR=/etc/bitwarden/ca-certificates
 ENV DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=false
 EXPOSE 5000
 
-RUN apk add gosu \
-    curl \
+RUN apk add curl \
+    && apk add --no-cache --repository=http://dl-cdn.alpinelinux.org/alpine/edge/community gosu \
     && rm -rf /var/cache/apk/*
 
 # Copy app from the build stage
diff --git a/util/Setup/Dockerfile b/util/Setup/Dockerfile
index 80c264d393..db886153d3 100644
--- a/util/Setup/Dockerfile
+++ b/util/Setup/Dockerfile
@@ -1,7 +1,7 @@
 ###############################################
 #                 Build stage                 #
 ###############################################
-FROM --platform=$BUILDPLATFORM mcr.microsoft.com/dotnet/sdk:8.0-alpline AS build
+FROM --platform=$BUILDPLATFORM mcr.microsoft.com/dotnet/sdk:8.0-alpine AS build
 
 # Docker buildx supplies the value for this arg
 ARG TARGETPLATFORM