diff --git a/config/samples/uperf-scale/cr.yaml b/config/samples/uperf-scale/cr.yaml
index c70564243..4fcc0b2fd 100644
--- a/config/samples/uperf-scale/cr.yaml
+++ b/config/samples/uperf-scale/cr.yaml
@@ -6,7 +6,7 @@ metadata:
 spec:
   clustername: myk8scluster
   elasticsearch:
-    url: https://search-perfscale-dev-chmf5l4sh66lvxbnadi4bznl3a.us-west-2.es.amazonaws.com:443
+    url: "http://es-instance.com:9200"
   #test_user: username_to_attach_to_metadata
   workload:
     # cleanup: true
diff --git a/docs/system-metrics.md b/docs/system-metrics.md
index 5586ae2da..096297604 100644
--- a/docs/system-metrics.md
+++ b/docs/system-metrics.md
@@ -30,7 +30,7 @@ spec:
     prom_token: eyJhbGciOiJSUzI1NiIsImtpZCI6IlljTUxlUHBTY2hvUVJQYUlZWmV5MTE4d3VnRFpjUUh5MWZtdE9hdnlvNFUifQ.eyJpc3MiOiJrdWJlcnopeVzL3NlcnZpY2VhY2NvdW50Iiwia3ViZXJuZXRlcy5pby9zZXJ2aWNlYWNjb3VudC9uYW1lc3BhY2UiOiJvcGVuc2hpZnQtbW9uaXRvcmluZyIsImt1YmVybmV0ZXMuaW8vc2VydmljZWFjY291bnQvc2VjcmV0Lm5hbWUiOiJwcm9tZXRoZXVzLWs4cy10b2tlbi12NGo3YyIsImt1YmVybmV0ZXMuaW8vc2VydmljZWFjY291bnQvc2VydmljZS1hY2NvdW50Lm5hbWUiOiJwcm9tZXRoZXVzLWs4cyIsImt1YmVybmV0ZXMuaW8vc2VydmljZWFjY291bnQvc2VydmljZS1hY2NvdW50LnVpZCI6IjFkYTdkMTRkLWE2MTktNDZjYS1iZGRlLTMzOTYxOWYxMmM4MiIsInN1YiI6InN5c3RlbTpzZXJ2aWNlYWNjb3VudDpvcGVuc2hpZnQtbW9uaXRvcmluZzpwcm9tZXRoZXVzLWs4cyJ9.PJp5pD_CjMG05vVLFdxUDRWGA8C71TNyRsUcHmpMlnZLQWBwxZSDZ-Uh3y6g1O-Yz3nopeCoZLB6lugxxalcT1DhiEC9yNK53Lr6HLqaz8nWUbRPbex0913KcuSsnpeRj7tzlwQ2K3WbtIeyyHpG5vAeff07LDvHUcPsc3B_dyetGnInClBHFVEJRES6f5DbIUidtXZEfYKANJNcssly0qZMZicwvM4a_pRp6ctGB-zzR6Ac4lh3b1JLfl_5TLGuuoYEOAeJPVUF4TjemsNNJ5BlycEkVI377LKNdHf83wua5pn3ItJtKE5gdrG833203p-y0pj-UDJj2bAv0cjUQ
     metrics_profile: https://raw.githubusercontent.com/cloud-bulldozer/benchmark-operator/master/roles/kube-burner/files/metrics-aggregated.yaml
   elasticsearch:
-    url: https://search-perfscale-dev-chmf5l4sh66lvxbnadi4bznl3a.us-west-2.es.amazonaws.com:443
+    url: "http://es-instance.com:9200"
     index_name: ripsaw-uperf
   metadata:
     collection: false
diff --git a/e2e/helpers.bash b/e2e/helpers.bash
index 7e8a4414e..69cf525a4 100644
--- a/e2e/helpers.bash
+++ b/e2e/helpers.bash
@@ -8,7 +8,6 @@ NAMESPACE=benchmark-operator
 
 basic_setup() {
   export PROMETHEUS_TOKEN=$(oc sa get-token -n openshift-monitoring prometheus-k8s)
-  export ES_SERVER=${ES_SERVER:-https://search-perfscale-dev-chmf5l4sh66lvxbnadi4bznl3a.us-west-2.es.amazonaws.com}
 }
 
 basic_teardown() {
diff --git a/roles/nighthawk/README.md b/roles/nighthawk/README.md
index 695e5bb5b..ec509e75a 100644
--- a/roles/nighthawk/README.md
+++ b/roles/nighthawk/README.md
@@ -17,7 +17,7 @@ metadata:
 spec:
   clustername: myk8scluster
   elasticsearch:
-    url: https://search-perfscale-dev-chmf5l4sh66lvxbnadi4bznl3a.us-west-2.es.amazonaws.com:443
+    url: "http://es-instance.com:9200"
   workload:
     cleanup: true
     name: nighthawk
@@ -45,7 +45,7 @@ metadata:
 spec:
   clustername: myk8scluster
   elasticsearch:
-    url: https://search-perfscale-dev-chmf5l4sh66lvxbnadi4bznl3a.us-west-2.es.amazonaws.com:443
+    url: "http://es-instance.com:9200"
   workload:
     cleanup: true
     name: nighthawk
diff --git a/tests/test_crs/valid_fs_drift.yaml b/tests/test_crs/valid_fs_drift.yaml
index 54a73ee18..c5aa35b3d 100644
--- a/tests/test_crs/valid_fs_drift.yaml
+++ b/tests/test_crs/valid_fs_drift.yaml
@@ -7,12 +7,12 @@ spec:
   system_metrics:
     collection: true
     prom_url: https://prometheus-k8s.openshift-monitoring.svc.cluster.local:9091
-    es_url: https://search-perfscale-dev-chmf5l4sh66lvxbnadi4bznl3a.us-west-2.es.amazonaws.com
+    es_url: "http://es-instance.com:9200"
     prom_token: PROMETHEUS_TOKEN
     metrics_profile: node-metrics.yml
   # where elastic search is running
   elasticsearch:
-    url: https://search-perfscale-dev-chmf5l4sh66lvxbnadi4bznl3a.us-west-2.es.amazonaws.com
+    url: "http://es-instance.com:9200"
     index_name: ripsaw-fs-drift
   metadata:
     collection: true