diff --git a/contrib/docker/Dockerfile b/contrib/docker/Dockerfile
index 0f110f54298006fc6fc8fa49fbc0471f1a521312..2a1386e1d45c54a08f831df1fed629c297c0356f 100644
--- a/contrib/docker/Dockerfile
+++ b/contrib/docker/Dockerfile
@@ -21,6 +21,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
     ecdsautils \
     lua-check \
     shellcheck \
+    libnss-unknown \
     && apt-get clean \
     && rm -rf /var/lib/apt/lists/*
 
@@ -30,7 +31,7 @@ RUN mkdir /tmp/ec &&\
     mv bin/ec-linux-amd64 /usr/local/bin/editorconfig-checker &&\
     rm -rf /tmp/ec
 
-RUN useradd -d /gluon gluon
+RUN useradd -m -d /gluon -u 100 -g 100 -o gluon
 USER gluon
 
 VOLUME /gluon
diff --git a/scripts/container.sh b/scripts/container.sh
index 072d2ec13ba06804faab16c5f4a5ac2b1a4d196d..3c7b30b8936b9b3b86af708491836085406e7611 100755
--- a/scripts/container.sh
+++ b/scripts/container.sh
@@ -12,13 +12,13 @@ TAG="gluon:${BRANCH:-latest}"
 if [ "$(command -v podman)" ]
 then
 	podman build -t "${TAG}" contrib/docker
-	podman run -it --rm --userns=keep-id --volume="$(pwd):/gluon" "${TAG}"
+	podman run -it --rm -u "$(id -u):$(id -g)" --userns=keep-id --volume="$(pwd):/gluon" "${TAG}"
 elif [ "$(command -v docker)" ]
 then
 	docker build -t "${TAG}" contrib/docker
-	docker run -it --rm --volume="$(pwd):/gluon" "${TAG}"
+	docker run -it --rm -u "$(id -u):$(id -g)" --volume="$(pwd):/gluon" -e HOME=/gluon "${TAG}"
 else
-	1>&2 echo "Please install either podman or docker. Exiting" >/dev/null
+	echo "Please install either podman or docker. Exiting" >&2
 	exit 1
 fi