diff --git a/.github/workflows/publish-microzig.yml b/.github/workflows/publish-microzig.yml
index c2ad9e7c..9170587d 100644
--- a/.github/workflows/publish-microzig.yml
+++ b/.github/workflows/publish-microzig.yml
@@ -47,8 +47,8 @@ jobs:
       github-artifact-name: microzig-alt
       source-path: /
     secrets:
-      target-path: ${{ secrets.DEPLOY_MZ_ROOT_DATA_PATH }}
-      ssh-key: ${{ secrets.DEPLOY_MZ_PRIVATE_KEY }}
-      host: ${{ secrets.DEPLOY_MZ_HOST }}
-      port: ${{ secrets.DEPLOY_MZ_PORT }}
-      user: ${{ secrets.DEPLOY_MZ_USER }}
+      target-path: ${{ secrets.DEPLOY_ROOT_DATA_PATH }}
+      ssh-key: ${{ secrets.DEPLOY_PRIVATE_KEY }}
+      host: ${{ secrets.DEPLOY_HOST }}
+      port: ${{ secrets.DEPLOY_PORT }}
+      user: ${{ secrets.DEPLOY_USER }}
diff --git a/.github/workflows/publish-website-staging.yml b/.github/workflows/publish-website-staging.yml
index ceb2e761..ec9b575b 100644
--- a/.github/workflows/publish-website-staging.yml
+++ b/.github/workflows/publish-website-staging.yml
@@ -33,11 +33,11 @@ jobs:
       github-artifact-name: website-build
       source-path: /
     secrets:
-      target-path: "${{ secrets.DEPLOY_WS_ROOT_DATA_PATH }}/staging/pulls/${{ github.event.number }}/"
-      ssh-key: ${{ secrets.DEPLOY_WS_PRIVATE_KEY }}
-      host: ${{ secrets.DEPLOY_WS_HOST }}
-      port: ${{ secrets.DEPLOY_WS_PORT }}
-      user: ${{ secrets.DEPLOY_WS_USER }}
+      target-path: "${{ secrets.DEPLOY_ROOT_DATA_PATH }}/staging/pulls/${{ github.event.number }}/"
+      ssh-key: ${{ secrets.DEPLOY_PRIVATE_KEY }}
+      host: ${{ secrets.DEPLOY_HOST }}
+      port: ${{ secrets.DEPLOY_PORT }}
+      user: ${{ secrets.DEPLOY_USER }}
   pr-comment:
     runs-on: ubuntu-latest
     needs: publish-website
diff --git a/.github/workflows/publish-website.yml b/.github/workflows/publish-website.yml
index 0d5cedbf..3a50e9f6 100644
--- a/.github/workflows/publish-website.yml
+++ b/.github/workflows/publish-website.yml
@@ -33,8 +33,8 @@ jobs:
       github-artifact-name: website-build
       source-path: /
     secrets:
-      target-path: ${{ secrets.DEPLOY_WS_ROOT_DATA_PATH }}
-      ssh-key: ${{ secrets.DEPLOY_WS_PRIVATE_KEY }}
-      host: ${{ secrets.DEPLOY_WS_HOST }}
-      port: ${{ secrets.DEPLOY_WS_PORT }}
-      user: ${{ secrets.DEPLOY_WS_USER }}
+      target-path: ${{ secrets.DEPLOY_ROOT_DATA_PATH }}
+      ssh-key: ${{ secrets.DEPLOY_PRIVATE_KEY }}
+      host: ${{ secrets.DEPLOY_HOST }}
+      port: ${{ secrets.DEPLOY_PORT }}
+      user: ${{ secrets.DEPLOY_USER }}