diff --git a/.github/actions/build-docs/action.yml b/.github/actions/build-docs/action.yml
index 01244ef..e5e8b64 100644
--- a/.github/actions/build-docs/action.yml
+++ b/.github/actions/build-docs/action.yml
@@ -30,7 +30,8 @@ runs:
       working-directory: ./docs
       # Outputs to the './_site' directory by default
       shell: bash
-      run: bundle exec jekyll build --baseurl "${{ steps.pages.outputs.base_path }}"
+      run: make build_existing_version BASE_URL="${{ steps.pages.outputs.base_path }}"
+      #run: bundle exec jekyll build --baseurl "${{ steps.pages.outputs.base_path }}"
       env:
         JEKYLL_ENV: production
     - name: Upload artifact
diff --git a/docs/Makefile b/docs/Makefile
index c70a7a4..0ea0c52 100644
--- a/docs/Makefile
+++ b/docs/Makefile
@@ -1,3 +1,5 @@
+BASE_URL ?= ""
+
 default: install
 
 h help:
@@ -12,11 +14,17 @@ s serve:
 	bundle exec jekyll serve --trace --livereload
 
 build: version
-	npm run build
+	npm run build -- --baseurl $(BASE_URL)
+
+build_existing_version: copyversion
+	npm run build -- --baseurl $(BASE_URL)
 
 debug: version
-	npm run debug
+	npm run debug -- --baseurl $(BASE_URL)
 
 version:
 	(cd .. && make version)
+	make copyversion
+
+copyversion:
 	cp -f ../.version ./_includes/.version