diff --git a/Docker/Dockerfile b/Docker/Dockerfile
index d179d79a9..b6bd4fdd1 100644
--- a/Docker/Dockerfile
+++ b/Docker/Dockerfile
@@ -1,3 +1,10 @@
 FROM ubuntu:22.04
 
 RUN DEBIAN_FRONTEND=noninteractive apt update && apt install -y build-essential autoconf libtool
+
+ARG USER=docker
+ARG UID=1000
+ARG GID=1000
+RUN groupadd -g ${GID} docker && useradd -ms /bin/bash ${USER} -u ${UID} -g ${GID}
+
+USER ${UID}:${GID}
\ No newline at end of file
diff --git a/Docker/run.sh b/Docker/run.sh
index fb7d25390..78fc99de3 100755
--- a/Docker/run.sh
+++ b/Docker/run.sh
@@ -1,5 +1,5 @@
 echo "Running with \"${@}\"..."
-docker build -t wolfssl . && \
+docker build -t wolfssl --build-arg UID=$(id -u) --build-arg GID=$(id -g) . && \
 docker run -it -v $(pwd)/..:/tmp/wolfssl -w /tmp/wolfssl wolfssl /bin/bash -c "./autogen.sh && ./configure $(echo ${@}) && make && ./testsuite/testsuite.test" && \
 docker run -it -v $(pwd)/..:/tmp/wolfssl -w /tmp/wolfssl wolfssl /bin/bash
 echo "Exited with error code $?"