diff --git a/.github/workflows/aws_build_cpu.yml b/.github/workflows/aws_build_cpu.yml
index eae551d93..c3779b2b9 100644
--- a/.github/workflows/aws_build_cpu.yml
+++ b/.github/workflows/aws_build_cpu.yml
@@ -200,3 +200,38 @@ jobs:
         with:
           name: html-docs
           path: docs/_build/html
+
+  PublishDoc:
+    runs-on: ubuntu-20.04
+    needs: BuildAndTest
+    if: ${{ startsWith(github.ref_name, 'v') || github.ref_name == 'main' }}
+    steps:
+      - name: Download Documentation
+        id: download
+        uses: actions/download-artifact@v3
+        with:
+          name: html-docs
+
+      - name: Publish Documentation to S3
+        id: publish
+        if: ${{ steps.download.outcome == 'success' && !cancelled() }}
+        uses: jakejarvis/s3-sync-action@be0c4ab89158cac4278689ebedd8407dd5f35a83
+        with:
+          args: --acl public-read
+        env:
+          AWS_S3_BUCKET: ${{ secrets.AWS_PREPROD_REPO_DOCUMENTATION_BUCKET_NAME }}
+          AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
+          AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
+          AWS_REGION: ${{ secrets.AWS_REGION }}
+          SOURCE_DIR: '.'
+          DEST_DIR: 'concrete-compiler/${{ github.ref_name }}'
+
+      - name: Invalidate CloudFront Cache
+        if: ${{ steps.publish.outcome == 'success' }}
+        uses: awact/cloudfront-action@8bcfabc7b4bbc0cb8e55e48527f0e3a6d681627c
+        env:
+          SOURCE_PATH: '/concrete-compiler/*'
+          AWS_REGION: ${{ secrets.AWS_REGION }}
+          AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
+          AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
+          DISTRIBUTION_ID: ${{ secrets.AWS_REPO_DOCUMENTATION_DISTRIBUTION_ID }}
diff --git a/.github/workflows/publish_doc.yml b/.github/workflows/publish_doc.yml
deleted file mode 100644
index 9cfaae353..000000000
--- a/.github/workflows/publish_doc.yml
+++ /dev/null
@@ -1,48 +0,0 @@
-name: Publish documentation
-
-on:
-  workflow_run:
-    workflows: [AwsEc2BuildCpu, AwsEc2BuildGpu]
-    branches:
-      - main
-    types:
-      - completed
-
-jobs:
-  WaitOnAllWorkflows:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v2
-      - uses: ahmadnassri/action-workflow-run-wait@v1
-
-  PublishDoc:
-    runs-on: ubuntu-20.04
-    needs: WaitOnAllWorkflows
-    steps:
-      - name: Download Documentation
-        id: download
-        uses: actions/download-artifact@v3
-        with:
-          name: html-docs
-      - name: Publish Documentation to S3
-        id: publish
-        if: ${{ steps.download.outcome == 'success' && !cancelled() }}
-        uses: jakejarvis/s3-sync-action@be0c4ab89158cac4278689ebedd8407dd5f35a83
-        with:
-          args: --acl public-read
-        env:
-          AWS_S3_BUCKET: ${{ secrets.AWS_PREPROD_REPO_DOCUMENTATION_BUCKET_NAME }}
-          AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
-          AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
-          AWS_REGION: ${{ secrets.AWS_REGION }}
-          SOURCE_DIR: '.'
-          DEST_DIR: 'concrete-compiler/${{ github.ref_name }}'
-      - name: Invalidate CloudFront Cache
-        if: ${{ steps.publish.outcome == 'success' }}
-        uses: awact/cloudfront-action@8bcfabc7b4bbc0cb8e55e48527f0e3a6d681627c
-        env:
-          SOURCE_PATH: '/concrete-compiler/*'
-          AWS_REGION: ${{ secrets.AWS_REGION }}
-          AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
-          AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
-          DISTRIBUTION_ID: ${{ secrets.AWS_REPO_DOCUMENTATION_DISTRIBUTION_ID }}