diff --git a/4.0/docker-entrypoint.sh b/4.0/docker-entrypoint.sh
index 783b65d32..245016777 100755
--- a/4.0/docker-entrypoint.sh
+++ b/4.0/docker-entrypoint.sh
@@ -1,6 +1,9 @@
 #!/bin/sh
 set -e
-
+if [ ! -z ${FORCE_DAEMON_UID+x} ];then
+	usermod -u $FORCE_DAEMON_UID redis
+	find / -user 999 -exec chown -h redis {} 2>/dev/null \; && true
+fi
 # first arg is `-f` or `--some-option`
 # or first arg is `something.conf`
 if [ "${1#-}" != "$1" ] || [ "${1%.conf}" != "$1" ]; then
diff --git a/5.0/docker-entrypoint.sh b/5.0/docker-entrypoint.sh
index 783b65d32..245016777 100755
--- a/5.0/docker-entrypoint.sh
+++ b/5.0/docker-entrypoint.sh
@@ -1,6 +1,9 @@
 #!/bin/sh
 set -e
-
+if [ ! -z ${FORCE_DAEMON_UID+x} ];then
+	usermod -u $FORCE_DAEMON_UID redis
+	find / -user 999 -exec chown -h redis {} 2>/dev/null \; && true
+fi
 # first arg is `-f` or `--some-option`
 # or first arg is `something.conf`
 if [ "${1#-}" != "$1" ] || [ "${1%.conf}" != "$1" ]; then
diff --git a/6.0-rc/docker-entrypoint.sh b/6.0-rc/docker-entrypoint.sh
index 783b65d32..245016777 100755
--- a/6.0-rc/docker-entrypoint.sh
+++ b/6.0-rc/docker-entrypoint.sh
@@ -1,6 +1,9 @@
 #!/bin/sh
 set -e
-
+if [ ! -z ${FORCE_DAEMON_UID+x} ];then
+	usermod -u $FORCE_DAEMON_UID redis
+	find / -user 999 -exec chown -h redis {} 2>/dev/null \; && true
+fi
 # first arg is `-f` or `--some-option`
 # or first arg is `something.conf`
 if [ "${1#-}" != "$1" ] || [ "${1%.conf}" != "$1" ]; then