diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml
index 55be78ccb..cc9473115 100644
--- a/.github/workflows/e2e.yml
+++ b/.github/workflows/e2e.yml
@@ -73,12 +73,16 @@ jobs:
           just coordinator initializer port-forwarder openssl cryptsetup service-mesh-proxy node-installer ${{ inputs.platform }}
       - name: E2E Test
         run: |
+          nix build .#scripts.get-logs
           nix run .#scripts.get-logs start workspace/e2e.namespace &
           nix shell -L .#contrast.e2e --command ${{ inputs.test-name }}.test -test.v \
             --image-replacements workspace/just.containerlookup \
             --namespace-file workspace/e2e.namespace \
             --platform ${{ inputs.platform }} \
             --skip-undeploy="${{ inputs.skip-undeploy && 'true' || 'false' }}"
+      - name: Download logs
+        if: always()
+        run: |
           nix run .#scripts.get-logs download workspace/e2e.namespace
       - name: Upload logs
         if: always()
diff --git a/.github/workflows/e2e_aks_runtime.yml b/.github/workflows/e2e_aks_runtime.yml
index 23e5ddfa7..4b3d10d15 100644
--- a/.github/workflows/e2e_aks_runtime.yml
+++ b/.github/workflows/e2e_aks_runtime.yml
@@ -80,6 +80,7 @@ jobs:
           az extension add --name confcom
       - name: E2E test
         run: |
+          nix build .#scripts.get-logs
           nix run .#scripts.get-logs start workspace/e2e.namespace &
           nix build .#contrast.e2e
           ./result/bin/aks-runtime.test -test.v \
@@ -87,6 +88,9 @@ jobs:
             --namespace-file workspace/e2e.namespace \
             --platform AKS-CLH-SNP \
             --skip-undeploy="false"
+      - name: Download logs
+        if: always()
+        run: |
           nix run .#scripts.get-logs download workspace/e2e.namespace
       - name: Upload logs
         if: always()