diff --git a/.github/workflows/benchmark.yaml b/.github/workflows/benchmark.yaml
index cc51016a3cd8..976ff2d47773 100644
--- a/.github/workflows/benchmark.yaml
+++ b/.github/workflows/benchmark.yaml
@@ -12,15 +12,15 @@ jobs:
     steps:
       - uses: actions/checkout@v2
 
-      - run: go version
-      - uses: actions/setup-go@v5
-        with:
-          go-version: '>=1.21.1' 
-      - run: go version
+      #- run: go version
+      #- uses: actions/setup-go@v5
+      #  with:
+      #    go-version: '>=1.21.1' 
+      #- run: go version
 
       - name: Download Nighthawk Docker images
         run: |
-         docker pull envoyproxy/nighthawk-dev:latest
+          docker pull envoyproxy/nighthawk-dev:latest
         
       - name: Run Benchmark tests
         env:
diff --git a/tools/make/kube.mk b/tools/make/kube.mk
index e16b9226f52a..f41bf3ad8d2e 100644
--- a/tools/make/kube.mk
+++ b/tools/make/kube.mk
@@ -101,7 +101,7 @@ conformance: create-cluster kube-install-image kube-deploy run-conformance delet
 experimental-conformance: create-cluster kube-install-image kube-deploy run-experimental-conformance delete-cluster ## Create a kind cluster, deploy EG into it, run Gateway API conformance, and clean up.
 
 .PHONY: benchmark
-benchmark: create-cluster kube-install-image kube-deploy build-benchmark run-benchmark 
+benchmark: create-cluster kube-install-image kube-deploy run-benchmark 
 
 .PHONY: e2e
 e2e: create-cluster kube-install-image kube-deploy install-ratelimit run-e2e delete-cluster
@@ -185,19 +185,20 @@ run-experimental-conformance: ## Run Experimental Gateway API conformance.
 	kubectl apply -f test/config/gatewayclass.yaml
 	go test -v -tags experimental ./test/conformance -run TestExperimentalConformance --gateway-class=envoy-gateway --debug=true --organization=envoyproxy --project=envoy-gateway --url=https://github.com/envoyproxy/gateway --version=latest --report-output="$(CONFORMANCE_REPORT_PATH)" --contact=https://github.com/envoyproxy/gateway/blob/main/GOVERNANCE.md
 
-.PHONY: build-benchmark
-build-benchmark: ## Build Benchmark Framework
-	@$(LOG_TARGET)
-	git clone -b 0.5.0 https://github.com/envoyproxy/nighthawk.git && cd nighthawk
-	ci/do_ci.sh build
-
 .PHONY: run-benchmark
 run-benchmark: ## Run benchmark tests
 	@$(LOG_TARGET)
 	kubectl wait --timeout=$(WAIT_TIMEOUT) -n envoy-gateway-system deployment/envoy-gateway --for=condition=Available
 	kubectl apply -f test/config/gatewayclass.yaml
 # kubectl create configmap test-server-config --from-file=test/benchmark/test-server.yaml --output yaml
+	@$(call log, "Deploying benchmark test server")
     kubectl apply -f https://github.com/envoyproxy/gateway/releases/download/v0.6.0/quickstart.yaml -n default
+	export ENVOY_SERVICE=$(kubectl get svc -n envoy-gateway-system --selector=gateway.envoyproxy.io/owning-gateway-namespace=default,gateway.envoyproxy.io/owning-gateway-name=eg -o jsonpath='{.items[0].metadata.name}')
+	kubectl -n envoy-gateway-system port-forward service/${ENVOY_SERVICE} 8888:80 &
+	curl --verbose --header "Host: www.example.com" http://localhost:8888/get
+	@$(call log, "Running benchmark tests")
+	docker run envoyproxy/nighthawk-dev:latest nighthawk_client http://localhost:8888
+	
 
 .PHONY: delete-cluster
 delete-cluster: $(tools/kind) ## Delete kind cluster.