diff --git a/.github/workflows/funcbench.yml b/.github/workflows/funcbench.yml
index ea0eac365..92fc890b6 100644
--- a/.github/workflows/funcbench.yml
+++ b/.github/workflows/funcbench.yml
@@ -27,18 +27,16 @@ jobs:
         --data '{"state":"pending","context":"funcbench-status","target_url":"'$GITHUB_STATUS_TARGET_URL'"}'
         "https://api.github.com/repos/$GITHUB_REPOSITORY/statuses/$LAST_COMMIT_SHA"
     - name: Prepare nodepool
-      uses: docker://prominfra/prombench:master
+      uses: docker://prominfra/funcbench:master
       with:
-        args: make funcbench_nodepool_create
-    - name: Run funcbench
-      uses: docker://prominfra/prombench:master
-      with:
-        args: make funcbench_resource_apply
+        entrypoint: 'docker_entrypoint'
+        args: make deploy
     - name: Delete all resources
       if: always()
-      uses: docker://prominfra/prombench:master
+      uses: docker://prominfra/funcbench:master
       with:
-        args: make funcbench_resource_delete; make funcbench_nodepool_delete
+        entrypoint: 'docker_entrypoint'
+        args: make clean
     - name: Update status to failure
       if: failure()
       run: >-
diff --git a/.github/workflows/prombench.yml b/.github/workflows/prombench.yml
index ec7f38051..e7ae13147 100644
--- a/.github/workflows/prombench.yml
+++ b/.github/workflows/prombench.yml
@@ -12,7 +12,6 @@ env:
   PROJECT_ID: macro-mile-203600
   PR_NUMBER: ${{ github.event.client_payload.PR_NUMBER }}
   RELEASE: ${{ github.event.client_payload.RELEASE }}
-  TEST_INFRA_REPO: https://github.com/prometheus/test-infra.git
   ZONE: europe-west3-a
 jobs:
   benchmark_start: