diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index d3c078d6a6..7ed197e027 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -99,13 +99,10 @@ jobs:
       - uses: actions/setup-go@v5
         with:
           go-version-file: "go.mod"
-      - name: Build AvalancheGo and update Coreth dependency
-        run: ./scripts/run_task.sh build-avalanchego-with-coreth
       - name: Run e2e tests
         uses: ava-labs/avalanchego/.github/actions/run-monitored-tmpnet-cmd@cc3242f48a6262c52057e98a85d6cf8184dfaca3
         with:
-          run: ./scripts/run_task.sh test-e2e
-          run_env: AVALANCHEGO_CLONE_PATH=avalanchego
+          run: ./scripts/run_task.sh test-e2e-ci
           prometheus_username: ${{ secrets.PROMETHEUS_ID || '' }}
           prometheus_password: ${{ secrets.PROMETHEUS_PASSWORD || '' }}
           loki_username: ${{ secrets.LOKI_ID || '' }}
@@ -130,18 +127,10 @@ jobs:
           repository: ${{ github.event.inputs.avalanchegoRepo }}
           ref: ${{ github.event.inputs.avalanchegoBranch }}
           path: avalanchego
-      - name: Move AvalancheGo
-        if: ${{ github.event_name == 'workflow_dispatch' }}
-        run: mv avalanchego /tmp/e2e/warp/avalanchego
-      - name: Build AvalancheGo and update Coreth dependency
-        run: ./scripts/run_task.sh build-avalanchego-with-coreth
-        env:
-          AVALANCHEGO_CLONE_PATH: /tmp/e2e/warp/avalanchego
       - name: Run Warp E2E Tests
         uses: ava-labs/avalanchego/.github/actions/run-monitored-tmpnet-cmd@cc3242f48a6262c52057e98a85d6cf8184dfaca3
         with:
           run: ./scripts/run_task.sh test-e2e-warp-ci
-          run_env: AVALANCHEGO_BUILD_PATH=/tmp/e2e/warp/avalanchego/build
           artifact_prefix: warp
           prometheus_username: ${{ secrets.PROMETHEUS_ID || '' }}
           prometheus_password: ${{ secrets.PROMETHEUS_PASSWORD || '' }}
diff --git a/Taskfile.yml b/Taskfile.yml
index 8ec0554dad..859adc7171 100644
--- a/Taskfile.yml
+++ b/Taskfile.yml
@@ -5,9 +5,7 @@
 version: '3'
 
 env:
-  BASEDIR: '{{.BASEDIR | default "/tmp/e2e-test"}}'
-  AVALANCHEGO_BUILD_PATH: '{{.AVALANCHEGO_BUILD_PATH | default "/tmp/e2e-test/avalanchego"}}'
-  DATA_DIR: '{{.DATA_DIR | default "/tmp/e2e-test/coreth-data"}}'
+  AVALANCHEGO_BUILD_PATH: '{{.AVALANCHEGO_BUILD_PATH | default (printf "%s/avalanchego/build" .TASKFILE_DIR) }}'
 
 tasks:
   default: ./scripts/run_task.sh --list
@@ -120,16 +118,23 @@ tasks:
     desc: Run AvalancheGo e2e tests from target version against current state of coreth
     cmd: ./scripts/tests.e2e.sh # ci.yml
 
+  test-e2e-ci:
+    desc: Run AvalancheGo e2e tests from target version against current state of coreth, cloning and building avalanchego if necessary
+    cmds:
+      - task: build-avalanchego-with-coreth
+      - task: test-e2e
+
   test-e2e-warp:
     desc: Run end-to-end warp tests using Ginkgo test framework
-    cmd: ./scripts/run_ginkgo_warp.sh # ci.yml
+    cmd: bash -x ./scripts/run_ginkgo_warp.sh # ci.yml
 
   test-e2e-warp-ci: # consolidated test-e2e-warp
     desc: Run E2E warp tests with CI setup
     cmds:
+      - task: build-avalanchego-with-coreth
       - task: build
       - task: test-e2e-warp
 
   update-avalanchego-version:
     desc: Update AvalancheGo version in go.mod and sync GitHub Actions workflow custom action version
-    cmd: bash -x ./scripts/update_avalanchego_version.sh # ci.yml 
\ No newline at end of file
+    cmd: bash -x ./scripts/update_avalanchego_version.sh # ci.yml