diff --git a/util/Nginx/Dockerfile b/util/Nginx/Dockerfile
index d0d05b0bf7..d0150dd208 100644
--- a/util/Nginx/Dockerfile
+++ b/util/Nginx/Dockerfile
@@ -1,15 +1,19 @@
-FROM --platform=$BUILDPLATFORM nginx:stable
+FROM --platform=$BUILDPLATFORM nginx:stable-alpine
 
 ARG TARGETPLATFORM
 LABEL com.bitwarden.product="bitwarden"
 
 ENV SSL_CERT_DIR=/etc/bitwarden/ca-certificates
 
-RUN apt-get update \
-    && apt-get install -y --no-install-recommends \
-    gosu \
-    curl \
-    && rm -rf /var/lib/apt/lists/*
+# RUN apt-get update \
+#     && apt-get install -y --no-install-recommends \
+#     gosu \
+#     curl \
+#     && rm -rf /var/lib/apt/lists/*
+
+RUN apk add curl \
+    && apk add --no-cache --repository=http://dl-cdn.alpinelinux.org/alpine/edge/community gosu \
+    && rm -rf /var/cache/apk/*
 
 COPY util/Nginx/nginx.conf /etc/nginx
 COPY util/Nginx/proxy.conf /etc/nginx
diff --git a/util/Nginx/Dockerfile-k8s b/util/Nginx/Dockerfile-k8s
index 9f0d89ee1d..692147a101 100644
--- a/util/Nginx/Dockerfile-k8s
+++ b/util/Nginx/Dockerfile-k8s
@@ -1,15 +1,19 @@
-FROM nginx:stable
+FROM nginx:stable-alpine
 
 LABEL com.bitwarden.product="bitwarden"
 
 ENV USERNAME="bitwarden"
 ENV GROUPNAME="bitwarden"
 
-RUN apt-get update && \
-    apt-get install -y --no-install-recommends \
-        gosu \
-        curl && \
-    rm -rf /var/lib/apt/lists/*
+# RUN apt-get update && \
+#     apt-get install -y --no-install-recommends \
+#         gosu \
+#         curl && \
+#     rm -rf /var/lib/apt/lists/*
+
+RUN apk add curl \
+    && apk add --no-cache --repository=http://dl-cdn.alpinelinux.org/alpine/edge/community gosu \
+    && rm -rf /var/cache/apk/*
 
 COPY nginx.conf /etc/nginx/nginx.conf
 COPY proxy.conf /etc/nginx/proxy.conf
diff --git a/util/Nginx/entrypoint.sh b/util/Nginx/entrypoint.sh
index 0cf8a58888..a5812bfa6d 100644
--- a/util/Nginx/entrypoint.sh
+++ b/util/Nginx/entrypoint.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
 
 # Setup
 
@@ -21,11 +21,10 @@ fi
 
 # Create user and group
 
-groupadd -o -g $LGID $GROUPNAME >/dev/null 2>&1 ||
-groupmod -o -g $LGID $GROUPNAME >/dev/null 2>&1
-useradd -o -u $LUID -g $GROUPNAME -s /bin/false $USERNAME >/dev/null 2>&1 ||
-usermod -o -u $LUID -g $GROUPNAME -s /bin/false $USERNAME >/dev/null 2>&1
-mkhomedir_helper $USERNAME
+addgroup -g "$LGID" -S "$GROUPNAME" 2>/dev/null || true
+adduser -u "$LUID" -G "$GROUPNAME" -S -D -H "$USERNAME" 2>/dev/null || true
+mkdir -p /home/$USERNAME
+chown $USERNAME:$GROUPNAME /home/$USERNAME
 
 # The rest...
 
diff --git a/util/Nginx/setup-bwuser.sh b/util/Nginx/setup-bwuser.sh
index b17454722a..88e05a90a3 100644
--- a/util/Nginx/setup-bwuser.sh
+++ b/util/Nginx/setup-bwuser.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
 
 # Setup
 
@@ -32,8 +32,7 @@ fi
 
 # Create user and group
 
-groupadd -o -g $LGID $GROUPNAME >/dev/null 2>&1 ||
-groupmod -o -g $LGID $GROUPNAME >/dev/null 2>&1
-useradd -o -u $LUID -g $GROUPNAME -s /bin/false $USERNAME >/dev/null 2>&1 ||
-usermod -o -u $LUID -g $GROUPNAME -s /bin/false $USERNAME >/dev/null 2>&1
-mkhomedir_helper $USERNAME
+addgroup -g "$LGID" -S "$GROUPNAME" 2>/dev/null || true
+adduser -u "$LUID" -G "$GROUPNAME" -S -D -H "$USERNAME" 2>/dev/null || true
+mkdir -p /home/$USERNAME
+chown $USERNAME:$GROUPNAME /home/$USERNAME