diff --git a/docs/src/main/asciidoc/ghpages.sh b/docs/src/main/asciidoc/ghpages.sh
index f5230ad9..8d315164 100755
--- a/docs/src/main/asciidoc/ghpages.sh
+++ b/docs/src/main/asciidoc/ghpages.sh
@@ -6,6 +6,10 @@ set -e
 
 export GIT_BIN ROOT_FOLDER COMMIT_CHANGES MAVEN_PATH MAVEN_EXEC REPO_NAME SPRING_CLOUD_STATIC_REPO
 export CURRENT_BRANCH PREVIOUS_BRANCH
+export GITHUB_REPO_USERNAME_ENV="${GITHUB_REPO_USERNAME_ENV:-GITHUB_REPO_USERNAME}"
+export GITHUB_REPO_PASSWORD_ENV="${GITHUB_REPO_PASSWORD_ENV:-GITHUB_REPO_PASSWORD}"
+REPO_USER="${!GITHUB_REPO_USERNAME_ENV}"
+REPO_PASS="${!GITHUB_REPO_PASSWORD_ENV}"
 
 GIT_BIN="${GIT_BIN:-git}"
 
@@ -47,8 +51,8 @@ function add_oauth_token_to_remote_url() {
         remote="${remote}.git"
         echo "Remote with [.git] suffix: [${remote}]"
     fi
-    if [[ "${GITHUB_REPO_USERNAME}" != "" && ${remote} != *"@"* ]]; then
-        withUserAndPass=${remote/https:\/\//https://${GITHUB_REPO_USERNAME}:${GITHUB_REPO_PASSWORD}@}
+    if [[ "${REPO_USER}" != "" && ${remote} != *"@"* ]]; then
+        withUserAndPass=${remote/https:\/\//https://${REPO_USER}:${REPO_PASS}@}
         echo "Username and password found. Will reuse it to push the code to [${withUserAndPass}]"
         "${GIT_BIN}" remote set-url --push origin "${withUserAndPass}"
     elif [[ "${RELEASER_GIT_OAUTH_TOKEN}" != "" && ${remote} != *"@"* ]]; then
diff --git a/docs/src/test/bats/ghpages.bats b/docs/src/test/bats/ghpages.bats
index 7842a223..e316e01f 100644
--- a/docs/src/test/bats/ghpages.bats
+++ b/docs/src/test/bats/ghpages.bats
@@ -469,8 +469,10 @@ export -f stubbed_git
 @test "should commit changes with username and password if commit flag set" {
 	export GIT_BIN="printing_git_with_remotes"
 	export COMMIT_CHANGES="yes"
-	export GITHUB_REPO_USERNAME="username"
-	export GITHUB_REPO_PASSWORD="password"
+	export GITHUB_REPO_USERNAME_ENV="MY_REPO_USERNAME"
+	export GITHUB_REPO_PASSWORD_ENV="MY_REPO_PASSWORD"
+	export MY_REPO_USERNAME="username"
+	export MY_REPO_PASSWORD="password"
 
 	source "${SOURCE_DIR}"/ghpages.sh