diff --git a/.github/workflows/check-doc-build.yml b/.github/workflows/check-doc-build.yml
deleted file mode 100644
index 6bc93632b..000000000
--- a/.github/workflows/check-doc-build.yml
+++ /dev/null
@@ -1,34 +0,0 @@
-name: Check documentation build
-
-on:
-  push:
-    branches: [ "master" ]
-  pull_request:
-    branches: [ "master" ]
-
-  workflow_dispatch:
-
-concurrency:
-  group: '${{ github.workflow }} @ ${{ github.event.pull_request.head.label || github.head_ref || github.ref }}'
-  cancel-in-progress: true
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-
-    steps:
-      - uses: actions/checkout@v3
-
-      - name: Install platform dependencies
-        run: |
-          sudo apt update
-          sudo apt install -y build-essential python3-dev python3-pip libpq-dev libffi-dev libssl-dev libkrb5-dev zlib1g-dev
-
-      - name: Install Python dependencies
-        run: |
-          sudo pip install --upgrade pip
-          sudo pip install -r requirements.txt
-          sudo pip install "pyOpenSSL>=23.*" sphinx sphinxcontrib-youtube
-
-      - name: Check the documentation
-        run: make docs
diff --git a/.github/workflows/check-pdf-build.yml b/.github/workflows/check-doc-builds.yml
similarity index 65%
rename from .github/workflows/check-pdf-build.yml
rename to .github/workflows/check-doc-builds.yml
index 050e403d6..537c80077 100644
--- a/.github/workflows/check-pdf-build.yml
+++ b/.github/workflows/check-doc-builds.yml
@@ -1,4 +1,4 @@
-name: Check PDF build
+name: Check documentation builds
 
 on:
   push:
@@ -24,12 +24,30 @@ jobs:
           sudo apt update
           sudo apt install -y build-essential python3-dev python3-pip libpq-dev libffi-dev libssl-dev libkrb5-dev zlib1g-dev latexmk texlive-latex-recommended tex-gyre texlive-latex-extra
 
-      - name: Install Python requirements
+      - name: Install Python dependencies
         run: |
           sudo pip install --upgrade pip
           sudo pip install -r requirements.txt
           sudo pip install "pyOpenSSL>=23.*" sphinx sphinxcontrib-youtube
 
+      - name: Check the HTML build
+        run: make docs
+
+      - name: Archive HTML
+        uses: actions/upload-artifact@v3
+        with:
+          name: pgadmin4-html-build-output
+          path: docs/en_US/_build/html/*
+
+      - name: Check the ePub build
+        run: make docs-epub
+
+      - name: Archive ePub
+        uses: actions/upload-artifact@v3
+        with:
+          name: pgadmin4-epub-build-output
+          path: docs/en_US/_build/epub/pgAdmin4.epub
+
       - name: Check the PDF build
         run: make docs-pdf
 
diff --git a/.github/workflows/check-epub-build.yml b/.github/workflows/check-epub-build.yml
deleted file mode 100644
index eb2942410..000000000
--- a/.github/workflows/check-epub-build.yml
+++ /dev/null
@@ -1,40 +0,0 @@
-name: Check ePub build
-
-on:
-  push:
-    branches: [ "master" ]
-  pull_request:
-    branches: [ "master" ]
-
-  workflow_dispatch:
-
-concurrency:
-  group: '${{ github.workflow }} @ ${{ github.event.pull_request.head.label || github.head_ref || github.ref }}'
-  cancel-in-progress: true
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-
-    steps:
-      - uses: actions/checkout@v3
-
-      - name: Install platform dependencies
-        run: |
-          sudo apt update
-          sudo apt install -y build-essential python3-dev python3-pip libpq-dev libffi-dev libssl-dev libkrb5-dev zlib1g-dev
-
-      - name: Install Python dependencies
-        run: |
-          sudo pip install --upgrade pip
-          sudo pip install -r requirements.txt
-          sudo pip install "pyOpenSSL>=23.*" sphinx sphinxcontrib-youtube
-
-      - name: Check the ePub build
-        run: make docs-epub
-
-      - name: Archive ePub
-        uses: actions/upload-artifact@v3
-        with:
-          name: pgadmin4-epub-build-output
-          path: docs/en_US/_build/epub/pgAdmin4.epub