diff --git a/.github/workflows/ci-main.yml b/.github/workflows/ci-main.yml
index 541f3ac4e..7679e2747 100644
--- a/.github/workflows/ci-main.yml
+++ b/.github/workflows/ci-main.yml
@@ -69,7 +69,6 @@ jobs:
       - name: Cache workspace
         uses: Swatinem/rust-cache@v2
         with:
-          key: ${{ steps.toolchain.outputs.cachekey }}
           workspaces: |
             ./substrate
             ./cargo-workspaces/cargo-workspaces
diff --git a/.github/workflows/deploy-api-docs.yml b/.github/workflows/deploy-api-docs.yml
index 877998d04..c7227abeb 100644
--- a/.github/workflows/deploy-api-docs.yml
+++ b/.github/workflows/deploy-api-docs.yml
@@ -17,30 +17,39 @@ jobs:
   deploy-api-docs:
     name: Deploy API documentation
     runs-on: ubuntu-latest
-    environment: docs
+    environment: main
     steps:
-      - uses: actions/checkout@v4
       - name: Install Protoc
         uses: arduino/setup-protoc@v2
         with:
           repo-token: ${{ secrets.GITHUB_TOKEN }}
+      - uses: actions/checkout@v4
+        with:
+          path: main
+      - uses: actions/checkout@v4
+        with:
+          path: release
+          ref: refs/tags/release
       - uses: Swatinem/rust-cache@v2
         with:
-          key: ${{ steps.toolchain.outputs.cachekey }}
           workspaces: |
-            ${{ inputs.workspace_path }}
+            main
+            release
           cache-on-failure: true
       - uses: superfly/flyctl-actions/setup-flyctl@master
         with:
-          version: 0.3.66
+          version: 0.4.6
       - run: ./build.sh . ${{ inputs.name || github.ref_name }}
-        working-directory: docs/api
-      - uses: actions/checkout@v4
-        with:
-          ref: refs/tags/release
-      - run: ./build.sh . release
-        working-directory: docs/api
+        working-directory: main/docs/api
+      - run: ../../../main/docs/api/build.sh ../../../main/docs/api release
+        working-directory: release/docs/api
+        env:
+          # For backwards compatibility with compile-time environment variables.
+          OPEN_PDKS_ROOT: ""
+          SKY130_CDS_PDK_ROOT: ""
+      - run: echo "<meta http-equiv=\"refresh\" content=\"0; url=release/substrate\">" > ./static/index.html
+        working-directory: main/docs/api
       - run: flyctl deploy --remote-only --detach
-        working-directory: docs/api
+        working-directory: main/docs/api
         env:
           FLY_ACCESS_TOKEN: ${{ secrets.FLY_API_TOKEN_API }}
diff --git a/.github/workflows/deploy-docs.yml b/.github/workflows/deploy-docs.yml
index a17d11f6d..7d6770f10 100644
--- a/.github/workflows/deploy-docs.yml
+++ b/.github/workflows/deploy-docs.yml
@@ -24,7 +24,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: superfly/flyctl-actions/setup-flyctl@master
         with:
-          version: 0.3.66
+          version: 0.4.6
       - uses: actions/setup-node@v3
         with:
           node-version: 23.x
diff --git a/docs/api/.dockerignore b/docs/api/.dockerignore
index 8694d60a3..1b381226c 100644
--- a/docs/api/.dockerignore
+++ b/docs/api/.dockerignore
@@ -1,2 +1,2 @@
 *
-!target/doc
+!static
diff --git a/docs/api/.gitignore b/docs/api/.gitignore
index a3e363a4b..74f1fc136 100644
--- a/docs/api/.gitignore
+++ b/docs/api/.gitignore
@@ -1,2 +1,3 @@
 target/
+static/
 *.hidden
diff --git a/docs/api/Dockerfile b/docs/api/Dockerfile
index 66806b857..3f7ddbd8e 100644
--- a/docs/api/Dockerfile
+++ b/docs/api/Dockerfile
@@ -1,2 +1,2 @@
 FROM pierrezemb/gostatic
-COPY ./target/doc/ /srv/http/
+COPY ./static/ /srv/http/
diff --git a/docs/api/build.sh b/docs/api/build.sh
index fb3095e0f..88507cad2 100755
--- a/docs/api/build.sh
+++ b/docs/api/build.sh
@@ -16,7 +16,7 @@ REF_NAME=$2
 
 cargo d --no-deps --workspace --all-features --target-dir ./target --exclude tests --exclude examples
 echo "<meta http-equiv=\"refresh\" content=\"0; url=substrate\">" > ./target/doc/index.html
-rm -rf $PUBLIC_DOCS_DIR/api/static/$REF_NAME
-mkdir -p $PUBLIC_DOCS_DIR/api/static/$REF_NAME
-cp -r ./target/doc/. $PUBLIC_DOCS_DIR/api/static/$REF_NAME
-cd $PUBLIC_DOCS_DIR/api
+rm -rf $PUBLIC_DOCS_DIR/static/$REF_NAME
+mkdir -p $PUBLIC_DOCS_DIR/static/$REF_NAME
+cp -r ./target/doc/. $PUBLIC_DOCS_DIR/static/$REF_NAME
+cd $PUBLIC_DOCS_DIR
diff --git a/docs/docusaurus/deploy.sh b/docs/docusaurus/deploy.sh
index 5f6604983..80a3ea2a1 100755
--- a/docs/docusaurus/deploy.sh
+++ b/docs/docusaurus/deploy.sh
@@ -22,14 +22,14 @@ cat << EOF > ./site-config.json
 EOF
 yarn install --frozen-lockfile
 yarn build
-if [ $REF_NAME = "main" ]; then
-    find $PUBLIC_DOCS_DIR/docusaurus/static -maxdepth 1 -mindepth 1 -not -name "branch" -exec rm -r {} +
-    mkdir -p $PUBLIC_DOCS_DIR/docusaurus/static
-    cp -r ./build/. $PUBLIC_DOCS_DIR/docusaurus/static
-else
-    rm -rf $PUBLIC_DOCS_DIR/docusaurus/static/branch/$REF_NAME
-    mkdir -p $PUBLIC_DOCS_DIR/docusaurus/static/branch/$REF_NAME
-    cp -r ./build/. $PUBLIC_DOCS_DIR/docusaurus/static/branch/$REF_NAME
-fi
-cd $PUBLIC_DOCS_DIR/docusaurus
+# if [ $REF_NAME = "main" ]; then
+#     find $PUBLIC_DOCS_DIR/docusaurus/static -maxdepth 1 -mindepth 1 -not -name "branch" -exec rm -r {} +
+#     mkdir -p $PUBLIC_DOCS_DIR/docusaurus/static
+#     cp -r ./build/. $PUBLIC_DOCS_DIR/docusaurus/static
+# else
+#     rm -rf $PUBLIC_DOCS_DIR/docusaurus/static/branch/$REF_NAME
+#     mkdir -p $PUBLIC_DOCS_DIR/docusaurus/static/branch/$REF_NAME
+#     cp -r ./build/. $PUBLIC_DOCS_DIR/docusaurus/static/branch/$REF_NAME
+# fi
+# cd $PUBLIC_DOCS_DIR/docusaurus
 flyctl deploy --remote-only --detach