diff --git a/.github/workflows/_run-e2e-tests.yml b/.github/workflows/_run-e2e-tests.yml
index 1f15f82d35..3a08810be7 100644
--- a/.github/workflows/_run-e2e-tests.yml
+++ b/.github/workflows/_run-e2e-tests.yml
@@ -694,3 +694,35 @@ jobs:
           artifact-aleph-e2e-client-image: ${{ inputs.artifact-aleph-e2e-client-image }}
           artifact-aleph-node-image: ${{ inputs.artifact-aleph-node-image }}
           artifact-chain-bootstrapper-image: ${{ inputs.artifact-chain-bootstrapper-image }}
+
+  run-e2e-all-validators-have-ideal-performance:
+    name: Run all validators have ideal performance test.
+    needs: [run-e2e-finalization-test]
+    runs-on: ubuntu-20.04
+    steps:
+      - name: Checkout source code
+        uses: actions/checkout@v4
+
+      - name: Run e2e test
+        uses: ./.github/actions/run-e2e-test
+        with:
+          test-case: all_validators_have_ideal_performance
+          artifact-aleph-e2e-client-image: ${{ inputs.artifact-aleph-e2e-client-image }}
+          artifact-aleph-node-image: ${{ inputs.artifact-aleph-node-image }}
+          artifact-chain-bootstrapper-image: ${{ inputs.artifact-chain-bootstrapper-image }}
+
+  run-e2e-one-validator-is-dead:
+    name: Run one validator is dead performance test
+    needs: [run-e2e-finalization-test]
+    runs-on: ubuntu-20.04
+    steps:
+      - name: Checkout source code
+        uses: actions/checkout@v4
+
+      - name: Run e2e test
+        uses: ./.github/actions/run-e2e-test
+        with:
+          test-case: one_validator_is_dead
+          artifact-aleph-e2e-client-image: ${{ inputs.artifact-aleph-e2e-client-image }}
+          artifact-aleph-node-image: ${{ inputs.artifact-aleph-node-image }}
+          artifact-chain-bootstrapper-image: ${{ inputs.artifact-chain-bootstrapper-image }}
diff --git a/.github/workflows/nightly-normal-session-e2e-tests.yml b/.github/workflows/nightly-normal-session-e2e-tests.yml
index 502dbb74d7..64ef4870da 100644
--- a/.github/workflows/nightly-normal-session-e2e-tests.yml
+++ b/.github/workflows/nightly-normal-session-e2e-tests.yml
@@ -371,52 +371,6 @@ jobs:
           artifact-aleph-e2e-client-image: ${{ needs.build-aleph-e2e-client-image.outputs.artifact-name-image }}
           timeout-minutes: 35
 
-  run-e2e-all-validators-have-ideal-performance:
-    needs:
-      - build-production-aleph-node
-      - build-aleph-e2e-client-image
-      - build-chain-bootstrapper-production
-    name: All validators have ideal abft performance
-    runs-on: ubuntu-20.04
-    steps:
-      - name: Checkout source code
-        uses: actions/checkout@v4
-
-      - name: Run e2e test
-        uses: ./.github/actions/run-e2e-test
-        with:
-          test-case: all_validators_have_ideal_performance
-          # yamllint disable-line rule:line-length
-          artifact-aleph-node-image: ${{ needs.build-production-aleph-node.outputs.artifact-name-image }}
-          # yamllint disable-line rule:line-length
-          artifact-chain-bootstrapper-image: ${{ needs.build-chain-bootstrapper-production.outputs.artifact-name-image }}
-          # yamllint disable-line rule:line-length
-          artifact-aleph-e2e-client-image: ${{ needs.build-aleph-e2e-client-image.outputs.artifact-name-image }}
-          timeout-minutes: 35
-
-  run-e2e-one-validator-is-dead:
-    needs:
-      - build-production-aleph-node
-      - build-aleph-e2e-client-image
-      - build-chain-bootstrapper-production
-    name: All validators except one have ideal abft performance
-    runs-on: ubuntu-20.04
-    steps:
-      - name: Checkout source code
-        uses: actions/checkout@v4
-
-      - name: Run e2e test
-        uses: ./.github/actions/run-e2e-test
-        with:
-          test-case: one_validator_is_dead
-          # yamllint disable-line rule:line-length
-          artifact-aleph-node-image: ${{ needs.build-production-aleph-node.outputs.artifact-name-image }}
-          # yamllint disable-line rule:line-length
-          artifact-chain-bootstrapper-image: ${{ needs.build-chain-bootstrapper-production.outputs.artifact-name-image }}
-          # yamllint disable-line rule:line-length
-          artifact-aleph-e2e-client-image: ${{ needs.build-aleph-e2e-client-image.outputs.artifact-name-image }}
-          timeout-minutes: 35
-
   check-nightly-pipeline-completion:
     needs: [run-e2e-high-out-latency,
             run-e2e-sync-test-one_node_catching_up_and_then_becoming_necessary_for_consensus,