diff --git a/.github/workflows/publish-website-gen1-legacy.yml b/.github/workflows/publish-website-gen1-legacy.yml
index b5d142585..ec567a058 100644
--- a/.github/workflows/publish-website-gen1-legacy.yml
+++ b/.github/workflows/publish-website-gen1-legacy.yml
@@ -11,12 +11,15 @@ on:
       - "**/website/**"
   workflow_dispatch:
 
+permissions:
+contents: write
+
 jobs:
   build_docs_job:
+    # Prevent overlapping publishes on rapid pushes
+    concurrency: ci-${{ github.ref }}
     runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        python-version: [3.6]
+
     steps:
     - name: Checkout
       uses: actions/checkout@v4
@@ -40,9 +43,12 @@ jobs:
         retention-days: 30
     - name: Deploy to GitHub Pages
       if: ${{ github.event_name == 'push' || github.event_name == 'workflow_dispatch' }}
-      uses: JamesIves/github-pages-deploy-action@releases/v3
+      uses: JamesIves/github-pages-deploy-action@v4
       with:
-          ACCESS_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          BRANCH: gh-pages # The branch the action should deploy to.
-          FOLDER: website/build # The folder the action should deploy.
-          CLEAN: true
+        token: ${{ secrets.GITHUB_TOKEN }}
+        branch: gh-pages
+        folder: website/build
+        clean: true
+        single-commit: true
+        clean-exclude: |
+          gen2/**
diff --git a/.github/workflows/publish-website.yml b/.github/workflows/publish-website.yml
index 340f09a2b..d2c78466a 100644
--- a/.github/workflows/publish-website.yml
+++ b/.github/workflows/publish-website.yml
@@ -11,12 +11,15 @@ on:
       - "**/website/**"
   workflow_dispatch:
 
+permissions:
+  contents: write
+
 jobs:
   build_docs_job:
+    # Prevent overlapping publishes on rapid pushes
+    concurrency: ci-${{ github.ref }}
     runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        python-version: [3.6]
+
     steps:
     - name: Checkout
       uses: actions/checkout@v4
@@ -40,9 +43,11 @@ jobs:
         retention-days: 30
     - name: Deploy to GitHub Pages
       if: ${{ github.event_name == 'push' || github.event_name == 'workflow_dispatch' }}
-      uses: JamesIves/github-pages-deploy-action@releases/v3
+      uses: JamesIves/github-pages-deploy-action@v4
       with:
-          ACCESS_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          BRANCH: gh-pages # The branch the action should deploy to.
-          TARGET_FOLDER: gen2 # The folder the action should deploy to.
-          FOLDER: website/build # The folder the action should deploy.
+        token: ${{ secrets.GITHUB_TOKEN }}
+        branch: gh-pages
+        folder: website/build
+        target-folder: gen2
+        clean: true
+        single-commit: true
diff --git a/website/docusaurus.config.js b/website/docusaurus.config.js
index 82e144998..51b10a5da 100644
--- a/website/docusaurus.config.js
+++ b/website/docusaurus.config.js
@@ -30,11 +30,11 @@ const config = {
   favicon: 'img/aria_logo.png',
 
   url: 'https://facebookresearch.github.io',
-  baseUrl: '/projectaria_tools_gen2/',
+  baseUrl: '/projectaria_tools/gen2/',
   trailingSlash: false,
 
   organizationName: 'Facebook Research',
-  projectName: 'projectaria_tools_gen2',
+  projectName: 'projectaria_tools',
 
   onBrokenLinks: 'throw',
   onBrokenMarkdownLinks: 'throw',
@@ -50,7 +50,7 @@ const config = {
           routeBasePath: '/',
           sidebarPath: false,
           editUrl:
-            'https://www.internalfb.com/code/fbsource/arvr/projects/ariane/aria_research_kit/projectaria_tools_gen2/website',
+            'https://www.internalfb.com/code/fbsource/arvr/projects/ariane/aria_research_kit/projectaria_tools/website',
           remarkPlugins: [math],
           rehypePlugins: [katex],
         },
@@ -89,7 +89,7 @@ const config = {
         routeBasePath: 'research-tools',
         sidebarPath: require.resolve('./sidebars-research-tools.js'),
         editUrl:
-          'https://www.internalfb.com/code/fbsource/arvr/projects/ariane/aria_research_kit/projectaria_tools_gen2/website',
+          'https://www.internalfb.com/code/fbsource/arvr/projects/ariane/aria_research_kit/projectaria_tools/website',
         remarkPlugins: [math],
         rehypePlugins: [katex],
       },
@@ -102,7 +102,7 @@ const config = {
         routeBasePath: 'ark',
         sidebarPath: require.resolve('./sidebars-ark.js'),
         editUrl:
-          'https://www.internalfb.com/code/fbsource/arvr/projects/ariane/aria_research_kit/projectaria_tools_gen2/website',
+          'https://www.internalfb.com/code/fbsource/arvr/projects/ariane/aria_research_kit/projectaria_tools/website',
         remarkPlugins: [math],
         rehypePlugins: [katex],
       },
@@ -115,7 +115,7 @@ const config = {
         routeBasePath: 'technical-specs',
         sidebarPath: require.resolve('./sidebars-technical-specs.js'),
         editUrl:
-          'https://www.internalfb.com/code/fbsource/arvr/projects/ariane/aria_research_kit/projectaria_tools_gen2/website',
+          'https://www.internalfb.com/code/fbsource/arvr/projects/ariane/aria_research_kit/projectaria_tools/website',
         remarkPlugins: [math],
         rehypePlugins: [katex],
       },