diff --git a/setup/automation/distributed-ami-manager b/setup/automation/distributed-ami-manager
index b1effcf7a..d1cbb5ddb 100644
--- a/setup/automation/distributed-ami-manager
+++ b/setup/automation/distributed-ami-manager
@@ -26,7 +26,7 @@ ALLOW_ROLE=a
 BASICZEEK=2
 BASICSURI=2
 # BLOGS=
-BNICS=ens6
+#BNICS=eth1
 ZEEKVERSION=ZEEK
 # CURCLOSEDAYS=
 # EVALADVANCED=BASIC
@@ -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=manager-aws
+HOSTNAME=distributed-manager
 install_type=MANAGER
 # LSINPUTBATCHCOUNT=
 # LSINPUTTHREADS=
@@ -46,7 +46,7 @@ MANAGERUPDATES=1
 # MGATEWAY=
 # MIP=
 # MMASK=
-MNIC=ens5
+MNIC=eth0
 # MSEARCH=
 # MSRV=
 # MTU=
@@ -62,8 +62,8 @@ OSQUERY=1
 # PATCHSCHEDULEHOURS=
 PATCHSCHEDULENAME=auto
 PLAYBOOK=1
-# REDIRECTHOST=
-REDIRECTINFO=HOSTNAME
+REDIRECTHOST=$(curl http://169.254.169.254/latest/meta-data/public-ipv4)
+REDIRECTINFO=OTHER
 RULESETUP=ETOPEN
 # SHARDCOUNT=
 SKIP_REBOOT=0
diff --git a/setup/automation/distributed-ami-search b/setup/automation/distributed-ami-search
index e50e18475..f21b9e87a 100644
--- a/setup/automation/distributed-ami-search
+++ b/setup/automation/distributed-ami-search
@@ -34,7 +34,7 @@ ADMINPASS2=onionuser
 # HELIXAPIKEY=
 HNMANAGER=10.0.0.0/8,192.168.0.0/16,172.16.0.0/12
 HNSENSOR=inherit
-HOSTNAME=searchnode-aws
+HOSTNAME=distributed-search
 install_type=SEARCHNODE
 # LSINPUTBATCHCOUNT=
 # LSINPUTTHREADS=
@@ -46,7 +46,7 @@ MANAGERUPDATES=1
 # MGATEWAY=
 # MIP=
 # MMASK=
-MNIC=ens5
+MNIC=eth0
 # MSEARCH=
 MSRV=manager-aws
 MSRVIP=172.16.163.10
diff --git a/setup/automation/distributed-ami-sensor b/setup/automation/distributed-ami-sensor
index a3cd2cccb..062ca1e2d 100644
--- a/setup/automation/distributed-ami-sensor
+++ b/setup/automation/distributed-ami-sensor
@@ -26,7 +26,7 @@ ADMINPASS2=onionuser
 BASICZEEK=2
 BASICSURI=2
 # BLOGS=
-BNICS=ens6
+BNICS=eth1
 ZEEKVERSION=ZEEK
 # CURCLOSEDAYS=
 # EVALADVANCED=BASIC
@@ -34,7 +34,7 @@ ZEEKVERSION=ZEEK
 # HELIXAPIKEY=
 HNMANAGER=10.0.0.0/8,192.168.0.0/16,172.16.0.0/12
 HNSENSOR=inherit
-HOSTNAME=forwardnode-aws
+HOSTNAME=distributed-sensor
 install_type=SENSOR
 # LSINPUTBATCHCOUNT=
 # LSINPUTTHREADS=
@@ -46,7 +46,7 @@ MANAGERUPDATES=1
 # MGATEWAY=
 # MIP=
 # MMASK=
-MNIC=ens5
+MNIC=eth0
 # MSEARCH=
 MSRV=manager-aws
 MSRVIP=172.16.163.10