diff --git a/.github/workflows/docs-release.yml b/.github/workflows/docs-release.yml
index 1017da88..5b55f8a5 100644
--- a/.github/workflows/docs-release.yml
+++ b/.github/workflows/docs-release.yml
@@ -33,10 +33,16 @@ jobs:
       - run: |
           if [ -d site-standalone ]; then
             cp -a site-standalone/. _site/standalone/
+          elif [ -d docs-standalone/site ]; then
+            cp -a docs-standalone/site/. _site/standalone/
           elif [ -d site ]; then
             cp -a site/. _site/standalone/
+          elif [ -d docs-standalone/build ]; then
+            cp -a docs-standalone/build/. _site/standalone/
+          elif [ -d build ]; then
+            cp -a build/. _site/standalone/
           else
-            echo "Standalone docs output not found (expected 'site-standalone' or 'site')."
+            echo "Standalone docs output not found (tried site-standalone, docs-standalone/site, site, docs-standalone/build, build)."
             exit 1
           fi
       - uses: actions/upload-pages-artifact@v4
diff --git a/docs-standalone/_assets/user.css b/docs-standalone/docs/_assets/user.css
similarity index 100%
rename from docs-standalone/_assets/user.css
rename to docs-standalone/docs/_assets/user.css
diff --git a/docs-standalone/cards.md b/docs-standalone/docs/cards.md
similarity index 100%
rename from docs-standalone/cards.md
rename to docs-standalone/docs/cards.md
diff --git a/docs-standalone/configuration.md b/docs-standalone/docs/configuration.md
similarity index 100%
rename from docs-standalone/configuration.md
rename to docs-standalone/docs/configuration.md
diff --git a/docs-standalone/connection-modes.md b/docs-standalone/docs/connection-modes.md
similarity index 100%
rename from docs-standalone/connection-modes.md
rename to docs-standalone/docs/connection-modes.md
diff --git a/docs-standalone/entities.md b/docs-standalone/docs/entities.md
similarity index 100%
rename from docs-standalone/entities.md
rename to docs-standalone/docs/entities.md
diff --git a/docs-standalone/getting-started.md b/docs-standalone/docs/getting-started.md
similarity index 100%
rename from docs-standalone/getting-started.md
rename to docs-standalone/docs/getting-started.md
diff --git a/docs-standalone/index.md b/docs-standalone/docs/index.md
similarity index 100%
rename from docs-standalone/index.md
rename to docs-standalone/docs/index.md
diff --git a/docs-standalone/screensaver.md b/docs-standalone/docs/screensaver.md
similarity index 100%
rename from docs-standalone/screensaver.md
rename to docs-standalone/docs/screensaver.md
diff --git a/docs-standalone/troubleshooting.md b/docs-standalone/docs/troubleshooting.md
similarity index 100%
rename from docs-standalone/troubleshooting.md
rename to docs-standalone/docs/troubleshooting.md
diff --git a/docs-standalone/mkdocs.yml b/docs-standalone/mkdocs.yml
index 9bb434a6..2f8094ae 100644
--- a/docs-standalone/mkdocs.yml
+++ b/docs-standalone/mkdocs.yml
@@ -9,8 +9,7 @@ edit_uri: ""
 
 copyright: "Copyright © 2026 Johannes Braun"
 
-docs_dir: .
-site_dir: ../site-standalone
+docs_dir: docs
 
 theme:
   name: material