diff --git a/.github/workflows/documentation.yml b/.github/workflows/documentation.yml
index c61b42878c..f0459b6b45 100644
--- a/.github/workflows/documentation.yml
+++ b/.github/workflows/documentation.yml
@@ -26,17 +26,17 @@ jobs:
           java-version: 13
       - name: Set environment variables (Development)
         run: |
-          echo "TARGET_FOLDER=$BASE_PATH/development" >> $GITHUB_ENV
+          echo "BRANCH=development" >> $GITHUB_ENV
         if: github.ref == 'refs/heads/main'
       - name: Set environment variables (Tag)
         run: |
           echo "EXTRA_GRADLE_ARGS=-PreleaseMode" >> $GITHUB_ENV
-          echo "TARGET_FOLDER=$BASE_PATH/beta" >> $GITHUB_ENV
+          echo "BRANCH=beta" >> $GITHUB_ENV
         if: startsWith(github.ref, 'refs/tags/v')
       - name: Set environment variables (Release)
         run: |
           echo "EXTRA_GRADLE_ARGS=-PreleaseMode" >> $GITHUB_ENV
-          echo "TARGET_FOLDER=$BASE_PATH/release" >> $GITHUB_ENV
+          echo "BRANCH=release" >> $GITHUB_ENV
         if: startsWith(github.ref, 'refs/tags/v') && !contains(github.ref, 'alpha') && !contains(github.ref, 'beta')
       - name: Build with Gradle
         run: ./gradlew docs:generateJavaDocs docs:doxygen -PbuildServer ${{ env.EXTRA_GRADLE_ARGS }}
@@ -44,21 +44,12 @@ jobs:
         uses: webfactory/ssh-agent@v0.8.0
         with:
           ssh-private-key: ${{ secrets.GH_DEPLOY_KEY }}
-      - name: Deploy Java 🚀
+      - name: Deploy 🚀
         uses: JamesIves/github-pages-deploy-action@v4.4.1
         with:
           ssh-key: true
           repository-name: wpilibsuite/wpilibsuite.github.io
-          branch: main
+          branch: allwpilib-${{ env.BRANCH }}
           clean: true
-          folder: docs/build/docs/javadoc
-          target-folder: ${{ env.TARGET_FOLDER }}/java
-      - name: Deploy C++ 🚀
-        uses: JamesIves/github-pages-deploy-action@v4.4.1
-        with:
-          ssh-key: true
-          repository-name: wpilibsuite/wpilibsuite.github.io
-          branch: main
-          clean: true
-          folder: docs/build/docs/doxygen/html
-          target-folder: ${{ env.TARGET_FOLDER }}/cpp
+          single-commit: true
+          folder: docs/build/docs