diff --git a/setup/automation/eval-cloud b/setup/automation/eval-cloud
index 2e9a69784..87994dad2 100644
--- a/setup/automation/eval-cloud
+++ b/setup/automation/eval-cloud
@@ -34,7 +34,7 @@ GRAFANA=1
 # HELIXAPIKEY=
 HNMANAGER=10.0.0.0/8,192.168.0.0/16,172.16.0.0/12
 HNSENSOR=inherit
-HOSTNAME=eval-aws
+HOSTNAME=eval
 install_type=EVAL
 # LSINPUTBATCHCOUNT=
 # LSINPUTTHREADS=
diff --git a/setup/automation/standalone-cloud b/setup/automation/standalone-cloud
index 28bb2ae87..94fc26cbb 100644
--- a/setup/automation/standalone-cloud
+++ b/setup/automation/standalone-cloud
@@ -34,7 +34,7 @@ GRAFANA=1
 # HELIXAPIKEY=
 HNMANAGER=10.0.0.0/8,192.168.0.0/16,172.16.0.0/12
 HNSENSOR=inherit
-HOSTNAME=standalone-aws
+HOSTNAME=standalone
 install_type=STANDALONE
 # LSINPUTBATCHCOUNT=
 # LSINPUTTHREADS=