diff --git a/.github/workflows/ci-suite.yml b/.github/workflows/ci-suite.yml
index e631f6c4cf..484f9219fd 100644
--- a/.github/workflows/ci-suite.yml
+++ b/.github/workflows/ci-suite.yml
@@ -76,18 +76,10 @@ jobs:
       - name: Patch Doxyfile
         run: |
           VERSION=$(cat "build/Version.props" | grep -oPm1 "(?<=<TgsCoreVersion>)[^<]+")
-          echo -e "\nPROJECT_NUMBER = $VERSION\nINPUT = .\nOUTPUT_DIRECTORY = $HOME/tgsdox\nPROJECT_LOGO = ./build/tgs.ico\nHAVE_DOT=YES" >> "docs/Doxyfile"
+          echo -e "\nPROJECT_NUMBER = $VERSION\nINPUT = .\nOUTPUT_DIRECTORY = $HOME/tgsdoxout\nPROJECT_LOGO = ./build/tgs.ico\nHAVE_DOT=YES" >> "docs/Doxyfile"
 
       - name: Create DOXDIR
-        if: github.event_name != 'push' || github.event.ref != 'refs/heads/dev'
-        run: mkdir -p $HOME/tgsdox
-
-      - name: Prep gh-pages Repository
-        if: github.event_name == 'push' && github.event.ref == 'refs/heads/dev'
-        run: |
-          git clone -b gh-pages --single-branch "https://git@github.com/tgstation/tgstation-server" $HOME/tgsdox
-          cd $HOME/tgsdox
-          rm -r *
+        run: mkdir -p $HOME/tgsdoxout
 
       - name: Doxygen Build
         uses: mattnotmitt/doxygen-action@v1
@@ -97,7 +89,10 @@ jobs:
       - name: gh-pages push
         if: github.event_name == 'push' && github.event.ref == 'refs/heads/dev'
         run: |
+        git clone -b gh-pages --single-branch "https://git@github.com/tgstation/tgstation-server" $HOME/tgsdox
           cd $HOME/tgsdox
+          rm -r *
+          mv $HOME/tgsdoxout/* ./
           git config --global push.default simple
           git config user.name "tgstation-server"
           git config user.email "tgstation-server@tgstation13.org"
@@ -679,7 +674,7 @@ jobs:
 
   deploy-tgs:
     name: Deploy TGS
-    needs: [deploy-dm, deploy-http, deploy-client]
+    needs: [upload-code-coverage, validate-openapi-spec]
     runs-on: windows-latest
     if: github.event_name == 'push' && github.event.ref == 'refs/heads/master' && contains(github.event.head_commit.message, '[TGSDeploy]')
     steps: