diff --git a/.github/workflows/test-e2e.yml b/.github/workflows/test-e2e.yml
index 78b44bf2b..23f4aa89d 100644
--- a/.github/workflows/test-e2e.yml
+++ b/.github/workflows/test-e2e.yml
@@ -118,7 +118,8 @@ jobs:
 
       - name: Install cypress requirements
         run: |
-          sudo wget --no-verbose -O /opt/cucumber-json-formatter "https://github.com/cucumber/json-formatter/releases/download/v19.0.0/cucumber-json-formatter-linux-386"
+          sudo wget --no-verbose -O /opt/cucumber-json-formatter "https://github.com/cucumber/json-formatter/releases/download/v19.0.0/cucumber-json-formatter-linux-amd64"
+          echo "66a2ef158866c3ecb3d8e49a7189814a485bddca43e133e4ca5735b8d3951bf7  /opt/cucumber-json-formatter" | sha256sum -c -
           sudo chmod +x /opt/cucumber-json-formatter
           cd backend
           yarn install
@@ -200,10 +201,22 @@ jobs:
           path: /tmp/webapp.tar
           key: ${{ github.run_id }}-e2e-webapp-cache
           
+      - name: Copy env files
+        run: |
+          cp webapp/.env.template webapp/.env
+          cp backend/.env.test_e2e backend/.env
+
+      - name: Ensure cucumber-json-formatter exists
+        run: |
+          if [ ! -f /opt/cucumber-json-formatter ]; then
+            sudo wget --no-verbose -O /opt/cucumber-json-formatter "https://github.com/cucumber/json-formatter/releases/download/v19.0.0/cucumber-json-formatter-linux-amd64"
+            echo "66a2ef158866c3ecb3d8e49a7189814a485bddca43e133e4ca5735b8d3951bf7  /opt/cucumber-json-formatter" | sha256sum -c -
+          fi
+          sudo chmod +x /opt/cucumber-json-formatter
+          sudo ln -fs /opt/cucumber-json-formatter /usr/bin/cucumber-json-formatter
+
       - name: Boot up test system | docker compose
         run: |
-          chmod +x /opt/cucumber-json-formatter
-          sudo ln -fs /opt/cucumber-json-formatter /usr/bin/cucumber-json-formatter
           docker load < /tmp/neo4j.tar
           docker load < /tmp/backend.tar
           docker load < /tmp/minio.tar