diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index c8ce2237..8a3ea1e8 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -20,8 +20,9 @@ jobs:
         sudo apt update
         sudo apt install -y wget npm
         sudo npm install -g tiddlywiki
-        ./Build.sh
-        ./DeployOld.sh
+        ./Bootstrap.sh
+        #./Build.sh
+        #./DeployOld.sh
 
     - name: Deploy
       uses: JamesIves/github-pages-deploy-action@v4
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 6249c1cd..c3b67e21 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -8,8 +8,9 @@ before_script: |
 pages:
   stage: deploy
   script: |
-    ./Build.sh
-    ./DeployOld.sh
+    ./Bootstrap.sh
+    #./Build.sh
+    #./DeployOld.sh
   artifacts:
     paths:
     - public
diff --git a/Bootstrap.sh b/Bootstrap.sh
new file mode 100755
index 00000000..47416655
--- /dev/null
+++ b/Bootstrap.sh
@@ -0,0 +1,37 @@
+#!/bin/sh
+
+# Export all tiddlers from the specific path of the HTML wiki
+tiddlywiki \
+	--verbose \
+	--load ./public/index.html \
+	--output ./Output.tmp \
+	--save "[prefix[$:/OcttKB/Repo/]]"
+
+# Move the exported folder to a better location
+mv ./Output.tmp/\$_/OcttKB/Repo ./Repo.tmp
+
+# Prepare the special files already present in the repo for the next step
+cd ./Repo
+for File in *.sh
+do
+	mv "$File" "$File.sh.txt.sh"
+done
+cd ..
+
+# Rename all extracted scripts to have a correct extension
+cd ./Repo.tmp
+for File in *.sh.txt
+do
+	mv "$File" "$File.sh"
+done
+cd ..
+
+# Move the files of this repo to overwrite the extracted ones, then move everything back
+# This is so, if present, files from the repo are preferred, if needed in case of emergency
+mv ./Repo/* ./Repo.tmp/
+mv ./Repo.tmp/* ./Repo/
+
+# Move everything to the working directory and on to the next step
+mv ./Repo/* ./
+chmod +x *.sh
+./Main.sh.txt.sh