diff --git a/assets/config/gitlab-shell/config.yml b/assets/config/gitlab-shell/config.yml
index ca661ad8..0e556214 100644
--- a/assets/config/gitlab-shell/config.yml
+++ b/assets/config/gitlab-shell/config.yml
@@ -37,7 +37,7 @@ redis:
 
 # Log file.
 # Default is gitlab-shell.log in the root directory.
-log_file: "/var/log/gitlab/gitlab-shell/gitlab-shell.log"
+log_file: "{{GITLAB_LOG_DIR}}/gitlab-shell/gitlab-shell.log"
 
 # Log level. INFO by default
 log_level: INFO
diff --git a/entrypoint.sh b/entrypoint.sh
index e17d7e02..28798a72 100755
--- a/entrypoint.sh
+++ b/entrypoint.sh
@@ -414,6 +414,7 @@ sudo -u ${GITLAB_USER} -H sed 's/{{REDIS_PORT}}/'"${REDIS_PORT}"'/g' -i config/r
 # configure gitlab-shell
 sed 's,{{GITLAB_RELATIVE_URL_ROOT}},'"${GITLAB_RELATIVE_URL_ROOT}"',' -i ${GITLAB_SHELL_INSTALL_DIR}/config.yml
 sudo -u ${GITLAB_USER} -H sed 's,{{GITLAB_HOME}},'"${GITLAB_HOME}"',g' -i ${GITLAB_SHELL_INSTALL_DIR}/config.yml
+sudo -u ${GITLAB_USER} -H sed 's,{{GITLAB_LOG_DIR}},'"${GITLAB_LOG_DIR}"',g' -i ${GITLAB_SHELL_INSTALL_DIR}/config.yml
 sudo -u ${GITLAB_USER} -H sed 's,{{GITLAB_DATA_DIR}},'"${GITLAB_DATA_DIR}"',g' -i ${GITLAB_SHELL_INSTALL_DIR}/config.yml
 sudo -u ${GITLAB_USER} -H sed 's,{{GITLAB_BACKUP_DIR}},'"${GITLAB_BACKUP_DIR}"',g' -i ${GITLAB_SHELL_INSTALL_DIR}/config.yml
 sudo -u ${GITLAB_USER} -H sed 's/{{SSL_SELF_SIGNED}}/'"${SSL_SELF_SIGNED}"'/' -i ${GITLAB_SHELL_INSTALL_DIR}/config.yml