diff --git a/.readthedocs/.readthedocs.yaml b/.readthedocs/.readthedocs.yaml
index 005cff2da..0e30538ea 100644
--- a/.readthedocs/.readthedocs.yaml
+++ b/.readthedocs/.readthedocs.yaml
@@ -21,9 +21,12 @@ build:
   os: ubuntu-24.04
   tools:
     python: "3.13"
-  # jobs:
-    # post_checkout: # MODIFY IF NEEDED: uncomment to cancel the RTD build
-    #   - exit 183
+  jobs:
+    # post_checkout: ['exit 183'] # MODIFY IF NEEDED: uncomment to cancel the RTD build
+    build:
+      html:
+        - curl -sSL https://raw.githubusercontent.com/ACCESS-NRI/ACCESS-Hive-Docs/main/.readthedocs/scripts/custom_build.sh | bash # Custom build
+    
 
 # Build documentation with Mkdocs
 mkdocs:
diff --git a/.readthedocs/scripts/custom_build.sh b/.readthedocs/scripts/custom_build.sh
new file mode 100644
index 000000000..27ea753e9
--- /dev/null
+++ b/.readthedocs/scripts/custom_build.sh
@@ -0,0 +1,59 @@
+# This is a custom build script for mkdocs that checks for the branch name and exports 
+# a EDIT_URI env variable to be used in the mkdocs build to set edit_uri to the proper branch, 
+# especially for PR preview builds.
+# If the build comes from a forked repo or from a tag, the EDIT_URI variable will not be set.
+# This is needed to avoid the link-check workflow to fail for new pages if the edit_uri points to 
+# a non-existing file in the main branch.
+
+set -e
+
+if [ "$READTHEDOCS_VERSION_TYPE" == external ]; then # PR preview build
+    # Download jq
+    export JQ_EXE=$(pwd)/jq
+    JQ_VERSION='jq-1.8.1'
+    wget -q https://github.com/stedolan/jq/releases/download/$JQ_VERSION/jq-linux64 -O "$JQ_EXE"
+    chmod +x "$JQ_EXE"
+    "$JQ_EXE" --version
+    # Get full repo
+    full_repo=$(sed -E 's|.*github\.com[:/](.+)$|\1|' <<< "$READTHEDOCS_GIT_CLONE_URL")
+    # Remove .git suffix if present
+    full_repo=${full_repo%.git}
+    # Get repo and owner
+    IFS='/' read owner repo <<< "$full_repo"
+    # Check if the PR comes from a forked repo
+    gh_api_url="https://api.github.com/repos/$owner/$repo"
+    pr_info=$(curl -s "$gh_api_url/pulls/$READTHEDOCS_GIT_IDENTIFIER")
+    pr_head_owner=$("$JQ_EXE" -r '.head.user.login' <<< "$pr_info")
+    if [ "$owner" == "$pr_head_owner" ]; then # Not a fork
+        # Get the branch name
+        branch_name=$("$JQ_EXE" -r '.head.ref' <<< "$pr_info")
+    fi
+elif git show-ref --heads "$READTHEDOCS_GIT_IDENTIFIER" --quiet; then # Branch build
+    branch_name="$READTHEDOCS_GIT_IDENTIFIER"
+fi
+
+# Download yq
+export YQ_EXE=$(pwd)/yq
+YQ_VERSION='v4.50.1'
+wget -q https://github.com/mikefarah/yq/releases/download/$YQ_VERSION/yq_linux_amd64 -O "$YQ_EXE"
+chmod +x "$YQ_EXE"
+"$YQ_EXE" --version
+
+# Get RTD config path
+rtd_config_path=$(find "$READTHEDOCS_REPOSITORY_PATH" -type f \( -name ".readthedocs.yaml" -o -name ".readthedocs.yml" \))
+# Get mkdocs config path
+mkdocs_path=$("$YQ_EXE" '.mkdocs.configuration' "$rtd_config_path")
+if [ -n "$branch_name" ]; then
+    # Get docs_dir from mkdocs config or set to default 'docs'
+    docs_dir=$("$YQ_EXE" '.docs_dir // "docs"' "$mkdocs_path")
+    EDIT_URI="edit/$branch_name/$docs_dir"
+    echo "This is a branch build. EDIT_URI set to to '$EDIT_URI'"
+    export EDIT_URI
+fi
+
+# Default RTD mkdocs build commands
+echo ======= START OF mkdocs.yml =======
+cat "$mkdocs_path"
+echo ======= ENF OF mkdocs.yml =======
+cmd="python -m mkdocs build --clean --site-dir $READTHEDOCS_OUTPUT/html --config-file $mkdocs_path"
+eval "$cmd"
\ No newline at end of file
diff --git a/mkdocs.yml b/mkdocs.yml
index eb07b43cf..2d02193de 100644
--- a/mkdocs.yml
+++ b/mkdocs.yml
@@ -8,7 +8,9 @@ site_url: !ENV READTHEDOCS_CANONICAL_URL
 repo_url: https://github.com/ACCESS-NRI/ACCESS-Hive-Docs
 repo_name: ACCESS-Hive-Docs
 
-edit_uri: edit/development/docs/
+edit_uri: !ENV [EDIT_URI, ""]
+# EDIT_URI is set within the website build (ReadTheDocs) through the ACCESS-Hive-Docs repo script
+# https://github.com/ACCESS-NRI/ACCESS-Hive-Docs/blob/main/.readthedocs/scripts/custom_build.sh
 
 theme:
   name: material