diff --git a/build-site.sh b/build-site.sh
index 7b4a8460b184..e23a33d2da27 100755
--- a/build-site.sh
+++ b/build-site.sh
@@ -1,22 +1,23 @@
 #!/bin/bash
+set -x
 
 if [[ -z "${DEPLOY_PRIME_URL}" ]]; then
-  USE_BASE_URL_SITE=""  
-  USE_BASE_URL_SITE_DOCS=""
+  USE_BASE_URL_SITE=""
+  USE_BASE_URL_DOCS=""
 else
   echo -e "\033[0;32mNetlify DEPLOY_PRIME_URL detected, this seems to be a PR, deployment happening at ${DEPLOY_PRIME_URL}...\033[0m"
-  USE_BASE_URL_SITE="-b ${DEPLOY_PRIME_URL}"
-  USE_BASE_URL_DOCS="-b ${DEPLOY_PRIME_URL}/documentation"
+  USE_BASE_URL_SITE="--baseURL ${DEPLOY_PRIME_URL}"
+  USE_BASE_URL_DOCS="--baseURL ${DEPLOY_PRIME_URL}/documentation"
 fi
 
 echo -e "\033[0;32mDeleting Hugo previously generated directories for docs and main site...\033[0m"
 rm -rf site_source_files/public && rm -rf docs_source_files/public
 
 echo -e "\033[0;32mGenerating Hugo site for docs...\033[0m"
-cd docs_source_files && hugo --minify ${URL_BASE_DOCS} && cd ..
+cd docs_source_files && hugo --minify ${USE_BASE_URL_DOCS} && cd ..
 
 echo -e "\033[0;32mGenerating Hugo site for main website...\033[0m"
-cd site_source_files && hugo --minify ${URL_BASE_SITE} && cd ..
+cd site_source_files && hugo --minify ${USE_BASE_URL_SITE} && cd ..
 
 echo -e "\033[0;32mMerging both sites into a single one...\033[0m"
 mv docs_source_files/public/* site_source_files/public/documentation
diff --git a/docs_source_files/config.toml b/docs_source_files/config.toml
index dbf5e07e739d..252463d44bee 100644
--- a/docs_source_files/config.toml
+++ b/docs_source_files/config.toml
@@ -37,7 +37,6 @@ home = [ "HTML", "RSS", "JSON"]
 title = "Documentation for Selenium"
 weight = 1
 languageName = "English"
-baseURL = "https://www.selenium.dev/documentation/en"
 
 [[Languages.en.menu.shortcuts]]
 name = "<i class='fas fa-home'></i> Selenium Home"
@@ -69,7 +68,6 @@ weight = 30
 title = "Documentación de Selenium"
 weight = 2
 languageName = "Español"
-baseURL = "https://www.selenium.dev/documentation/es"
 
 [[Languages.es.menu.shortcuts]]
 name = "<i class='fas fa-home'></i> Selenium Home"
@@ -101,7 +99,6 @@ weight = 30
 title = "Selenium documentatie"
 weight = 3
 languageName = "Nederlands"
-baseURL = "https://www.selenium.dev/documentation/nl"
 
 [[Languages.nl.menu.shortcuts]]
 name = "<i class='fas fa-home'></i> Selenium Home"
@@ -133,7 +130,6 @@ weight = 30
 title = "Selenium 文档"
 weight = 4
 languageName = "中文简体"
-baseURL = "https://www.selenium.dev/documentation/zh-cn"
 
 [[Languages.zh-cn.menu.shortcuts]]
 name = "<i class='fas fa-home'></i> Selenium Home"
@@ -165,7 +161,6 @@ weight = 30
 title = "Documentation Selenium"
 weight = 5
 languageName = "Français"
-baseURL = "https://www.selenium.dev/documentation/fr"
 
 [[Languages.fr.menu.shortcuts]]
 name = "<i class='fas fa-fw fa-exclamation-triangle'></i> Signaler un problème"
@@ -197,7 +192,6 @@ weight = 10
 title = "Seleniumドキュメント"
 weight = 6
 languageName = "日本語"
-baseURL = "https://www.selenium.dev/documentation/ja"
 
 [[Languages.ja.menu.shortcuts]]
 name = "<i class='fas fa-home'></i> Selenium Home"
@@ -229,7 +223,6 @@ weight = 30
 title = "Selenium 문서"
 weight = 7
 languageName = "한국어"
-baseURL = "https://www.selenium.dev/documentation/ko"
 
 [[Languages.ko.menu.shortcuts]]
 name = "<i class='fas fa-home'></i> Selenium 홈"
@@ -261,7 +254,6 @@ weight = 30
 title = "Dokumentation für Selenium"
 weight = 1
 languageName = "Deutsch"
-baseURL = "https://www.selenium.dev/documentation/de"
 
 [[Languages.de.menu.shortcuts]]
 name = "<i class='fas fa-home'></i> Selenium Home"