diff --git a/.github/workflows/build-documentation.yml b/.github/workflows/build-documentation.yml
index 851206dc1..edfdb5c28 100644
--- a/.github/workflows/build-documentation.yml
+++ b/.github/workflows/build-documentation.yml
@@ -21,7 +21,7 @@ jobs:
         with:
           concurrent_skipping: 'same_content'
           skip_after_successful_duplicate: 'true'
-          do_not_skip: '["pull_request", "workflow_dispatch", "schedule"]'
+          do_not_skip: '["push", "workflow_dispatch", "schedule"]'
 
   build-docs:
     #Continue if checks-for-duplicates found no duplicates. Always runs for pull-requests.
@@ -71,9 +71,9 @@ jobs:
           fi
 
   build-usersguide:
-    # Name the Job
     needs: checks-for-duplicates
     if: ${{ needs.checks-for-duplicates.outputs.should_skip != 'true' }}
+    # Name the Job
     name: Users Guide
     # Set the type of machine to run on
     runs-on: ubuntu-18.04
@@ -92,7 +92,7 @@ jobs:
           cp ./cfe/cmake/Makefile.sample Makefile
           cp -r ./cfe/cmake/sample_defs sample_defs
 
-      # Setup the build system
+      # Setup the build system   
       - name: Make Prep
         run: make prep
 
@@ -102,7 +102,6 @@ jobs:
       - name: Build Usersguide
         run: |
           make usersguide > make_usersguide_stdout.txt 2> make_usersguide_stderr.txt
-          mv build/doc/warnings.log usersguide_warnings.log
 
       - name: Archive Users Guide Build Logs
         uses: actions/upload-artifact@v2
@@ -111,8 +110,7 @@ jobs:
           path: |
             make_usersguide_stdout.txt
             make_usersguide_stderr.txt
-            usersguide_warnings.log
-
+            cfe-usersguide-warnings.log
 
       - name: Error Check
         run: |
@@ -123,11 +121,11 @@ jobs:
 
       - name: Warning Check
         run: |
-          if [[ -s usersguide_warnings.log ]]; then
-            cat usersguide_warnings.log
+          if [[ -s cfe-usersguide-warnings.log ]]; then
+            cat cfe-usersguide-warnings.log
             exit -1
           fi
-
+    
       - name: PDF generation installs
         if: ${{ github.event_name == 'push' && contains(github.ref, 'main')}}
         run: |
@@ -138,7 +136,7 @@ jobs:
         run: |
           set -x
           mkdir deploy
-          cd ./build/doc/users_guide/latex
+          cd ./build/docs/users_guide/latex
           make > build.txt
           mv refman.pdf $GITHUB_WORKSPACE/deploy/cFE_Users_Guide.pdf
           # Could add pandoc and convert to github markdown
@@ -155,9 +153,9 @@ jobs:
           SINGLE_COMMIT: true
 
   build-osalguide:
-    # Name the Job
     needs: checks-for-duplicates
     if: ${{ needs.checks-for-duplicates.outputs.should_skip != 'true' }}
+    # Name the Job
     name: Osal Guide
     # Set the type of machine to run on
     runs-on: ubuntu-18.04
@@ -176,7 +174,7 @@ jobs:
           cp ./cfe/cmake/Makefile.sample Makefile
           cp -r ./cfe/cmake/sample_defs sample_defs
 
-      # Setup the build system
+      # Setup the build system 
       - name: Make Prep
         run: make prep
 
@@ -186,8 +184,7 @@ jobs:
       - name: Build OSAL Guide
         run: |
           make osalguide > make_osalguide_stdout.txt 2> make_osalguide_stderr.txt
-          mv build/doc/osalguide/osal-apiguide-warnings.log osal-apiguide-warnings.log
-
+          mv build/docs/osalguide/osal-apiguide-warnings.log osal-apiguide-warnings.log
 
       - name: Archive Osal Guide Build Logs
         uses: actions/upload-artifact@v2
@@ -198,7 +195,6 @@ jobs:
             make_osalguide_stderr.txt
             osal-apiguide-warnings.log
 
-
       - name: Error Check
         run: |
           if [[ -s make_osalguide_stderr.txt ]]; then
@@ -222,7 +218,7 @@ jobs:
         if: ${{ github.event_name == 'push' && contains(github.ref, 'main')}}
         run: |
           mkdir deploy
-          cd ./build/doc/osalguide/latex
+          cd ./build/docs/osalguide/apiguide/latex
           make > build.txt
           mv refman.pdf $GITHUB_WORKSPACE/deploy/OSAL_Users_Guide.pdf
           # Could add pandoc and convert to github markdown