diff --git a/5.5/Dockerfile b/5.5/Dockerfile
index 25d1f568b..d26a90336 100644
--- a/5.5/Dockerfile
+++ b/5.5/Dockerfile
@@ -1,7 +1,11 @@
 FROM debian:stretch-slim
 
 # add our user and group first to make sure their IDs get assigned consistently, regardless of whatever dependencies get added
-RUN groupadd -r mysql && useradd -r -g mysql mysql
+ARG MYSQL_UID
+ENV MYSQL_UID ${MYSQL_UID:-}
+ARG MYSQL_GID
+ENV MYSQL_GID ${MYSQL_GID:-$MYSQL_UID}
+RUN groupadd -r ${MYSQL_GID:+-g $MYSQL_GID} mysql && useradd -r ${MYSQL_UID:+-u $MYSQL_UID} -g mysql mysql
 
 RUN apt-get update && apt-get install -y --no-install-recommends gnupg dirmngr && rm -rf /var/lib/apt/lists/*
 
diff --git a/5.6/Dockerfile b/5.6/Dockerfile
index 677d59f38..5c4ec8537 100644
--- a/5.6/Dockerfile
+++ b/5.6/Dockerfile
@@ -1,7 +1,11 @@
 FROM debian:stretch-slim
 
 # add our user and group first to make sure their IDs get assigned consistently, regardless of whatever dependencies get added
-RUN groupadd -r mysql && useradd -r -g mysql mysql
+ARG MYSQL_UID
+ENV MYSQL_UID ${MYSQL_UID:-}
+ARG MYSQL_GID
+ENV MYSQL_GID ${MYSQL_GID:-$MYSQL_UID}
+RUN groupadd -r ${MYSQL_GID:+-g $MYSQL_GID} mysql && useradd -r ${MYSQL_UID:+-u $MYSQL_UID} -g mysql mysql
 
 RUN apt-get update && apt-get install -y --no-install-recommends gnupg dirmngr && rm -rf /var/lib/apt/lists/*
 
diff --git a/5.7/Dockerfile b/5.7/Dockerfile
index 87aa7e48a..f31e51d6c 100644
--- a/5.7/Dockerfile
+++ b/5.7/Dockerfile
@@ -1,7 +1,11 @@
 FROM debian:stretch-slim
 
 # add our user and group first to make sure their IDs get assigned consistently, regardless of whatever dependencies get added
-RUN groupadd -r mysql && useradd -r -g mysql mysql
+ARG MYSQL_UID
+ENV MYSQL_UID ${MYSQL_UID:-}
+ARG MYSQL_GID
+ENV MYSQL_GID ${MYSQL_GID:-$MYSQL_UID}
+RUN groupadd -r ${MYSQL_GID:+-g $MYSQL_GID} mysql && useradd -r ${MYSQL_UID:+-u $MYSQL_UID} -g mysql mysql
 
 RUN apt-get update && apt-get install -y --no-install-recommends gnupg dirmngr && rm -rf /var/lib/apt/lists/*
 
diff --git a/8.0/Dockerfile b/8.0/Dockerfile
index 8dd69ee5a..8fcedd3bf 100644
--- a/8.0/Dockerfile
+++ b/8.0/Dockerfile
@@ -1,7 +1,11 @@
 FROM debian:stretch-slim
 
 # add our user and group first to make sure their IDs get assigned consistently, regardless of whatever dependencies get added
-RUN groupadd -r mysql && useradd -r -g mysql mysql
+ARG MYSQL_UID
+ENV MYSQL_UID ${MYSQL_UID:-}
+ARG MYSQL_GID
+ENV MYSQL_GID ${MYSQL_GID:-$MYSQL_UID}
+RUN groupadd -r ${MYSQL_GID:+-g $MYSQL_GID} mysql && useradd -r ${MYSQL_UID:+-u $MYSQL_UID} -g mysql mysql
 
 RUN apt-get update && apt-get install -y --no-install-recommends gnupg dirmngr && rm -rf /var/lib/apt/lists/*