diff --git a/Dockerfile b/Dockerfile
index b95ba8328960d..e1d2e13ab4729 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -69,8 +69,7 @@ RUN addgroup \
     -s /bin/bash \
     -u 1000 \
     -G git \
-    git && \
-  echo "git:*" | chpasswd -e
+    git 
 
 ENV USER=git
 ENV GITEA_CUSTOM=/data/gitea
diff --git a/docker/root/usr/bin/entrypoint b/docker/root/usr/bin/entrypoint
index 08587fc4f4dcf..401e1ef8e5fe6 100755
--- a/docker/root/usr/bin/entrypoint
+++ b/docker/root/usr/bin/entrypoint
@@ -30,6 +30,11 @@ if [ -n "${USER_UID}" ] && [ "${USER_UID}" != "`id -u ${USER}`" ]; then
     sed -i -e "s/^${USER}:\([^:]*\):[0-9]*:\([0-9]*\)/${USER}:\1:${USER_UID}:\2/" /etc/passwd
 fi
 
+# change password for git user
+if [ -z "${PASS}" ]; then
+  echo "git:${PASS}" | chpasswd -e
+fi
+
 for FOLDER in /data/gitea/conf /data/gitea/log /data/git /data/ssh; do
     mkdir -p ${FOLDER}
 done