diff --git a/.github/workflows/staging-release.yaml b/.github/workflows/staging-release.yaml
index b87633a50af..303d60d5b92 100644
--- a/.github/workflows/staging-release.yaml
+++ b/.github/workflows/staging-release.yaml
@@ -504,6 +504,7 @@ jobs:
   staging-release-images-latest-tags:
     # Only update latest tags for 3.1 releases
     if: startsWith(github.event.inputs.version, '3.1')
+    # if: startsWith(github.event.inputs.version, '4.0')
     name: Release latest Linux container images
     runs-on: ubuntu-latest
     needs:
@@ -804,6 +805,7 @@ jobs:
           make_latest: false
 
       - name: Release 3.1 and latest
+        # TODO: change to 3.1 branch once 4.0 series is ready
         uses: softprops/action-gh-release@v2
         if: startsWith(inputs.version, '3.1')
         with:
@@ -814,6 +816,17 @@ jobs:
           tag_name: v${{ inputs.version }}
           make_latest: true
 
+      # - name: Release 4.0 and latest
+      #   uses: softprops/action-gh-release@v2
+      #   if: startsWith(inputs.version, '4.0')
+      #   with:
+      #     body: "https://fluentbit.io/announcements/v${{ inputs.version }}/"
+      #     draft: false
+      #     generate_release_notes: true
+      #     name: "Fluent Bit ${{ inputs.version }}"
+      #     tag_name: v${{ inputs.version }}
+      #     make_latest: true
+
   staging-release-windows-checksums:
     name: Get Windows checksums for new release
     runs-on: ubuntu-22.04
@@ -903,15 +916,24 @@ jobs:
         uses: actions/checkout@v4
         with:
           repository: fluent/fluent-bit-docs
+          ref: 3.0
           token: ${{ secrets.GH_PA_TOKEN }}
 
       - name: Release 3.1 and latest
+        # TODO: change to 3.1 branch once 4.0 series is ready
         if: startsWith(inputs.version, '3.1')
         uses: actions/checkout@v4
         with:
           repository: fluent/fluent-bit-docs
           token: ${{ secrets.GH_PA_TOKEN }}
 
+      # - name: Release 4.0 and latest
+      #   if: startsWith(inputs.version, '4.0')
+      #   uses: actions/checkout@v4
+      #   with:
+      #     repository: fluent/fluent-bit-docs
+      #     token: ${{ secrets.GH_PA_TOKEN }}
+
       - name: Ensure we have the script we need
         run: |
           if [[ ! -f update-release-version-docs.sh ]] ; then
@@ -984,15 +1006,23 @@ jobs:
         with:
           ref: 2.2
 
-      - name: Release 3.0 not latest
+      - name: Release 3.0
         if: startsWith(inputs.version, '3.0')
         uses: actions/checkout@v4
         with:
           ref: 3.0
 
-      - name: Release 3.1 latest
+      - name: Release 3.1
         if: startsWith(inputs.version, '3.1')
         uses: actions/checkout@v4
+        with:
+          ref: 3.1
+
+      - name: Release 4.0
+        if: startsWith(inputs.version, '4.0')
+        uses: actions/checkout@v4
+        with:
+          ref: master
 
       # Get the new version to use
       - name: 'Get next minor version'