diff --git a/.github/workflows/any-branch-uploads.yml b/.github/workflows/any-branch-uploads.yml
index 20cc7ae0..2ce49d27 100644
--- a/.github/workflows/any-branch-uploads.yml
+++ b/.github/workflows/any-branch-uploads.yml
@@ -15,7 +15,8 @@ jobs:
       run: |
         make -C docs/tools/
         docker run -v `pwd`/docs/v1:/usr/src/p4-spec p4lang/p4rt-asciidoc make
-        ls docs/v1/build
+        ls docs/v1/P4Runtime-Spec.pdf
+        ls docs/v1/P4Runtime-Spec.html
     - name: Upload spec to S3 if needed
       if: ${{ github.actor != 'dependabot[bot]' }}
       uses: jakejarvis/s3-sync-action@v0.5.1
@@ -26,5 +27,5 @@ jobs:
         AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
         AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
         AWS_REGION: 'us-west-2'
-        SOURCE_DIR: 'docs/v1/build'
+        SOURCE_DIR: 'docs/v1'
         DEST_DIR: ci/${{ github.ref_name }} # only runs for push events
diff --git a/.github/workflows/main-branch-uploads.yml b/.github/workflows/main-branch-uploads.yml
index a1524449..ca592ea4 100644
--- a/.github/workflows/main-branch-uploads.yml
+++ b/.github/workflows/main-branch-uploads.yml
@@ -18,7 +18,8 @@ jobs:
       run: |
         make -C docs/tools/
         docker run -v `pwd`/docs/v1:/usr/src/p4-spec p4lang/p4rt-asciidoc make
-        ls docs/v1/build
+        ls docs/v1/P4Runtime-Spec.pdf
+        ls docs/v1/P4Runtime-Spec.html
     - name: Upload spec to S3
       uses: jakejarvis/s3-sync-action@v0.5.1
       with:
@@ -28,14 +29,15 @@ jobs:
         AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
         AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
         AWS_REGION: 'us-west-2'
-        SOURCE_DIR: 'docs/v1/build'
+        SOURCE_DIR: 'docs/v1'
         DEST_DIR: docs/main
     - name: Prepare spec for upload to gh-pages
       run: |
         git checkout gh-pages
         mkdir -p spec
         rm -rf spec/main
-        cp -r docs/v1/build spec/main
+        cp docs/v1/P4Runtime-Spec.html spec/main
+        cp docs/v1/P4Runtime-Spec.pdf spec/main
     - name: Upload spec to gh-pages
       uses: EndBug/add-and-commit@v9
       with:
diff --git a/.github/workflows/tag-uploads.yml b/.github/workflows/tag-uploads.yml
index 796cfaaa..fc6df554 100644
--- a/.github/workflows/tag-uploads.yml
+++ b/.github/workflows/tag-uploads.yml
@@ -20,7 +20,8 @@ jobs:
       run: |
         make -C docs/tools/
         docker run -v `pwd`/docs/v1:/usr/src/p4-spec p4lang/p4rt-asciidoc make
-        ls docs/v1/build
+        ls docs/v1/P4Runtime-Spec.pdf
+        ls docs/v1/P4Runtime-Spec.html
     - name: Upload spec to S3
       uses: jakejarvis/s3-sync-action@v0.5.1
       with:
@@ -30,14 +31,15 @@ jobs:
         AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
         AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
         AWS_REGION: 'us-west-2'
-        SOURCE_DIR: 'docs/v1/build'
+        SOURCE_DIR: 'docs/v1/'
         DEST_DIR: docs/${{ github.ref_name }}
     - name: Prepare spec for upload to gh-pages
       run: |
         git checkout gh-pages
         mkdir -p spec
         rm -rf spec/$TAG
-        cp -r docs/v1/build spec/$TAG
+        cp docs/v1/P4Runtime-Spec.html spec/$TAG
+        cp docs/v1/P4Runtime-Spec.pdf spec/$TAG
     - name: Upload spec to gh-pages
       uses: EndBug/add-and-commit@v9
       with:
diff --git a/.gitignore b/.gitignore
index c2889b78..04666e9d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,5 @@
 # Emacs
 *~
-docs/v1/build/
 .DS_Store
 build
 dist
diff --git a/docs/v1/Makefile b/docs/v1/Makefile
index 3856a62c..985ce44b 100644
--- a/docs/v1/Makefile
+++ b/docs/v1/Makefile
@@ -27,6 +27,6 @@ images:
 	soffice --convert-to png --outdir resources/figs resources/figs/*.odg > /dev/null 2>&1
 
 build_spec_with_images: images all
- 
+
 clean:
 	/bin/rm -f ${SPEC}.pdf ${SPEC}.html
\ No newline at end of file