diff --git a/prepare-upload.sh b/prepare-upload.sh
index c8030c13d..fb8501dd5 100755
--- a/prepare-upload.sh
+++ b/prepare-upload.sh
@@ -19,13 +19,17 @@ cp -r examples upload/img/
 # Merge repo JSON files into single file
 python merge_repo.py
 
+# PWE data files for /repo/ endpoint
+mkdir -p upload/dat
+cp site/dat/out.xml upload/dat/
+cp -r site/dat/repo upload/dat/
+cp -r site/files upload/ 2>/dev/null || true
+
 # PHP for /repo/ endpoint (stays dynamic)
 cp site/index.php upload/
 cp site/cfg.php upload/
 cp site/composer.json upload/
 cp -r site/JPGC upload/
-cp site/dat/out.xml upload/dat/
-cp -r site/files upload/ 2>/dev/null || true
 
 php --version
 curl -sS https://getcomposer.org/installer | php
diff --git a/site/build.sh b/site/build.sh
index 6b7678154..bcf3db5d9 100755
--- a/site/build.sh
+++ b/site/build.sh
@@ -3,13 +3,20 @@ set -e
 
 cd "$(dirname "$0")"
 
+# Assemble MkDocs source with only markdown files
+rm -rf .mkdocs_src
+mkdir -p .mkdocs_src/wiki .mkdocs_src/install
+cp dat/wiki/*.md .mkdocs_src/wiki/
+cp dat/install/Install.md .mkdocs_src/install/
+cp dat/index.md dat/catalogue.md dat/stats.md .mkdocs_src/
+
 mkdocs build --clean
 
+rm -rf .mkdocs_src
+
 # Static assets not managed by MkDocs
 cp robots.txt build/
 cp favicon.ico build/ 2>/dev/null || true
 cp -r img build/
-mkdir -p build/dat/stats
-cp -r dat/repo build/dat/
 
 echo "Build complete: build/"
diff --git a/site/mkdocs.yml b/site/mkdocs.yml
index fdf01b746..9cfd55935 100644
--- a/site/mkdocs.yml
+++ b/site/mkdocs.yml
@@ -2,7 +2,7 @@ site_name: JMeter-Plugins.org
 site_url: https://jmeter-plugins.org/
 site_description: Custom plugins for Apache JMeter
 
-docs_dir: dat
+docs_dir: .mkdocs_src
 site_dir: build
 
 use_directory_urls: true