diff --git a/.github/prepare_artifacts.sh b/.github/prepare_artifacts.sh
index 353dbaee..a916459b 100755
--- a/.github/prepare_artifacts.sh
+++ b/.github/prepare_artifacts.sh
@@ -6,6 +6,7 @@ gem install asciidoctor-diagram-plantuml
 asciidoctor -V
 cd asciidoc || exit
 
+rm -rf sdpi-documents
 mkdir sdpi-documents
 
 asciidoctor -r asciidoctor-diagram -D ../sdpi-documents sdpi-standard.adoc
@@ -31,5 +32,7 @@ rm -rf sdpi-documents/sdpi-supplement/readme.md
 rm -rf sdpi-documents/sdpi-standard.html
 rm -rf sdpi-documents/sdpi-supplement.html
 
+rm -rf sdpi-documents/.asciidoctor
+
 sudo apt-get install zip gzip tar
 zip -r "sdpi-documents-$1.zip" sdpi-documents
\ No newline at end of file
diff --git a/.github/workflows/latest-master-build.yml b/.github/workflows/latest-master-build.yml
index 9ff66809..3bef59fe 100755
--- a/.github/workflows/latest-master-build.yml
+++ b/.github/workflows/latest-master-build.yml
@@ -37,8 +37,17 @@ jobs:
     - name: Setup gradle
       uses: gradle/actions/setup-gradle@v4
 
-    - name: Create HTML with Gradle
-      run: ./gradlew run --args="--input-file ../../asciidoc/sdpi-standard.adoc --output-folder ../../sdpi-standard --github-token ${{ secrets.SDPI_API_ACCESS_TOKEN_SECRET }} --backend html"
+    - name: Create folders
+      run: |
+        mkdir -p sdpi-documents/sdpi-standard
+        mkdir -p sdpi-documents/sdpi-supplement
+
+    - name: Create SDPi Standard HTML with Gradle
+      run: ./gradlew run --args="--input-file ../../asciidoc/sdpi-standard.adoc --output-folder ../../sdpi-documents/sdpi-standard --github-token '${{ secrets.SDPI_API_ACCESS_TOKEN_SECRET }}' --backend html"
+      working-directory: .ci/asciidoc-converter
+
+    - name: Create SDPi Supplement HTML with Gradle
+      run: ./gradlew run --args="--input-file ../../asciidoc/sdpi-supplement.adoc --output-folder ../../sdpi-documents/sdpi-supplement --github-token '${{ secrets.SDPI_API_ACCESS_TOKEN_SECRET }}' --backend html"
       working-directory: .ci/asciidoc-converter
 
     - name: Generate PlantUML diagrams and copy static files
diff --git a/.github/workflows/release-build.yml b/.github/workflows/release-build.yml
index 64a79fac..d251eff2 100644
--- a/.github/workflows/release-build.yml
+++ b/.github/workflows/release-build.yml
@@ -37,8 +37,17 @@ jobs:
     - name: Setup gradle
       uses: gradle/actions/setup-gradle@v4
 
-    - name: Create HTML with Gradle
-      run: ./gradlew run --args="--input-file ../../asciidoc/sdpi-standard.adoc --output-folder ../../sdpi-standard --github-token ${{ secrets.SDPI_API_ACCESS_TOKEN_SECRET }} --backend html"
+    - name: Create folders
+      run: |
+        mkdir -p sdpi-documents/sdpi-standard
+        mkdir -p sdpi-documents/sdpi-supplement
+
+    - name: Create SDPi Standard HTML with Gradle
+      run: ./gradlew run --args="--input-file ../../asciidoc/sdpi-standard.adoc --output-folder ../../sdpi-documents/sdpi-standard --github-token '${{ secrets.SDPI_API_ACCESS_TOKEN_SECRET }}' --backend html"
+      working-directory: .ci/asciidoc-converter
+
+    - name: Create SDPi Supplement HTML with Gradle
+      run: ./gradlew run --args="--input-file ../../asciidoc/sdpi-supplement.adoc --output-folder ../../sdpi-documents/sdpi-supplement --github-token '${{ secrets.SDPI_API_ACCESS_TOKEN_SECRET }}' --backend html"
       working-directory: .ci/asciidoc-converter
 
     - name: Generate PlantUML diagrams and static files