diff --git a/.github/workflows/_build-aleph-node.yml b/.github/workflows/_build-aleph-node.yml
index 6b541c5f97..f6ab50c4a3 100644
--- a/.github/workflows/_build-aleph-node.yml
+++ b/.github/workflows/_build-aleph-node.yml
@@ -29,7 +29,7 @@ on:
         description: 'Personal access token (PAT) used to fetch the repository.'
         type: string
         required: false
-        default: ''
+        default: ${{ github.token }}
     outputs:
       artifact-name-binary:
         description: 'Name of artifact aleph-node binary'
@@ -51,6 +51,15 @@ jobs:
       artifact-name-image: ${{ steps.get-artifact-name-image.outputs.name }}
     steps:
       - name: Checkout aleph-node source code
+        if: inputs.token == ''
+        uses: actions/checkout@v4
+        with:
+          ref: ${{ inputs.ref }}
+          repository: ${{ inputs.repository }}
+          fetch-depth: 0
+
+      - name: Checkout aleph-node source code
+        if: inputs.token != ''
         uses: actions/checkout@v4
         with:
           ref: ${{ inputs.ref }}
diff --git a/.github/workflows/nightly-normal-session-e2e-tests.yml b/.github/workflows/nightly-normal-session-e2e-tests.yml
index d27a6475d6..7a18276796 100644
--- a/.github/workflows/nightly-normal-session-e2e-tests.yml
+++ b/.github/workflows/nightly-normal-session-e2e-tests.yml
@@ -40,17 +40,6 @@ jobs:
       # yamllint disable-line rule:line-length
       artifact-aleph-node-image: ${{ needs.build-production-aleph-node.outputs.artifact-name-image }}
 
-  build-aleph-node-with-network-flooding-test:
-    needs: [check-vars-and-secrets]
-    name: Build aleph-node with flooding routines for both sync-network and alephbft-network
-    uses: ./.github/workflows/_build-aleph-node.yml
-    with:
-      ref: main
-      repository: Cardinal-Cryptography/aleph-node-flooder
-      production: false
-      additional-flags: "--features network_flooding_test"
-      token: ${{ secrets.CI_GH_TOKEN }}
-
   build-chain-bootstrapper-production:
     name: Build chain-bootstrapper
     uses: ./.github/workflows/_build-chain-bootstrapper.yml
@@ -328,15 +317,23 @@ jobs:
             --testcase test_major_sync
 
   run-network-flooding-test:
-    secrets: inherit
     needs:
+      - check-vars-and-secrets
       - build-production-aleph-node
-      - build-aleph-node-with-network-flooding-test
       - build-aleph-e2e-client-image
       - build-chain-bootstrapper-production
     name: Run network flooding test
     runs-on: ubuntu-20.04
     steps:
+      - name: Build aleph-node with flooding routines for both sync-network and AlephBFT network
+        uses: ./.github/workflows/_build-aleph-node.yml
+        with:
+          ref: main
+          repository: Cardinal-Cryptography/aleph-node-flooder
+          production: false
+          additional-flags: "--features network_flooding_test"
+          token: ${{ secrets.CI_GH_TOKEN }}
+
       - name: Checkout source code
         uses: actions/checkout@v4