diff --git a/puppetserver/Dockerfile b/puppetserver/Dockerfile
index df76a697..6886ead1 100644
--- a/puppetserver/Dockerfile
+++ b/puppetserver/Dockerfile
@@ -96,6 +96,8 @@ FROM base as release
 ARG PUPPET_RELEASE=8
 ARG PUPPETSERVER_VERSION=8.6.1
 ARG UBUNTU_CODENAME
+ARG PUPPET_USER_UID=999
+ARG PUPPET_USER_GID=999
 
 ######################################################
 # final image
@@ -112,6 +114,10 @@ ARG build_date
 ENV PUPPET_DEB=puppet${PUPPET_RELEASE}-release-${UBUNTU_CODENAME}.deb
 ADD https://apt.puppet.com/${PUPPET_DEB} /${PUPPET_DEB}
 
+# Create puppet user and group with PUPPET_USER_UID and PUPPET_USER_GID
+RUN groupadd -g ${PUPPET_USER_GID} puppet && \
+    useradd -m -u ${PUPPET_USER_UID} -g puppet puppet
+
 # hadolint ignore=DL3008,DL3028
 RUN dpkg -i /${PUPPET_DEB} && \
     rm /${PUPPET_DEB}