diff --git a/k6/bench.js b/k6/bench.js
index cc2b8986..7778f2c3 100644
--- a/k6/bench.js
+++ b/k6/bench.js
@@ -18,7 +18,7 @@ export const options = {
   },
 };
 
-const url = 'http://localhost:8000/graphql';
+const url = __ENV.GRAPHQL_ENDPOINT || 'http://localhost:8000/graphql';
 const params = {
   headers: {
     'Connection': 'keep-alive',
diff --git a/k6/bench.sh b/k6/bench.sh
index a0ed1bdb..80595313 100644
--- a/k6/bench.sh
+++ b/k6/bench.sh
@@ -1,8 +1,10 @@
-test_name=$1
-benchmark=$2
+graphql_endpoint=$1
+type=$2
+test_name=$3
+benchmark=$4
 
-if [ "$IS_K6_CLOUD_ENABLED" == "true" ]; then
-  k6 run k6/bench.js --quiet --out cloud --env TEST_NAME=$test_name --env BENCHMARK=$benchmark
+if [ "$IS_K6_CLOUD_ENABLED" == "true" ] && [ "$type" == "upload" ]; then
+  k6 run k6/bench.js --quiet --out cloud --env TEST_NAME=$test_name --env BENCHMARK=$benchmark --env GRAPHQL_ENDPOINT=$graphql_endpoint
 else
-    k6 run k6/bench.js --quiet --env TEST_NAME=$test_name --env BENCHMARK=$benchmark
+  k6 run k6/bench.js --quiet --env TEST_NAME=$test_name --env BENCHMARK=$benchmark --env GRAPHQL_ENDPOINT=$graphql_endpoint
 fi
diff --git a/k6/warmup.sh b/k6/warmup.sh
deleted file mode 100644
index f2a99f6b..00000000
--- a/k6/warmup.sh
+++ /dev/null
@@ -1 +0,0 @@
-k6 run k6/bench.js --quiet