diff --git a/setup/automation/distributed-ami-manager b/setup/automation/distributed-ami-manager
deleted file mode 100644
index 6f5fb93dc..000000000
--- a/setup/automation/distributed-ami-manager
+++ /dev/null
@@ -1,76 +0,0 @@
-#!/bin/bash
-
-# Copyright 2014,2015,2016,2017,2018,2019,2020,2021 Security Onion Solutions, LLC
-
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
-
-TESTING=true
-
-address_type=DHCP
-ADMINUSER=onionuser
-ADMINPASS1=onionuser
-ADMINPASS2=onionuser
-ALLOW_CIDR=0.0.0.0/0
-ALLOW_ROLE=a
-BASICZEEK=2
-BASICSURI=2
-# BLOGS=
-#BNICS=eth1
-ZEEKVERSION=ZEEK
-# CURCLOSEDAYS=
-# EVALADVANCED=BASIC
-GRAFANA=1
-# HELIXAPIKEY=
-HNMANAGER=10.0.0.0/8,192.168.0.0/16,172.16.0.0/12
-HNSENSOR=inherit
-HOSTNAME=distributed-manager
-install_type=MANAGER
-# LSINPUTBATCHCOUNT=
-# LSINPUTTHREADS=
-# LSPIPELINEBATCH=
-# LSPIPELINEWORKERS=
-MANAGERADV=BASIC
-# MDNS=
-# MGATEWAY=
-# MIP=
-# MMASK=
-MNIC=eth0
-# MSEARCH=
-# MSRV=
-# MTU=
-NIDS=Suricata
-# NODE_ES_HEAP_SIZE=
-# NODE_LS_HEAP_SIZE=
-NODESETUP=NODEBASIC
-NSMSETUP=BASIC
-NODEUPDATES=MANAGER
-# OINKCODE=
-OSQUERY=1
-# PATCHSCHEDULEDAYS=
-# PATCHSCHEDULEHOURS=
-PATCHSCHEDULENAME=auto
-PLAYBOOK=1
-REDIRECTHOST=$(curl http://169.254.169.254/latest/meta-data/public-ipv4)
-REDIRECTINFO=OTHER
-RULESETUP=ETOPEN
-# SHARDCOUNT=
-# SKIP_REBOOT=0
-SOREMOTEPASS1=onionuser
-SOREMOTEPASS2=onionuser
-STRELKA=1
-THEHIVE=1
-WAZUH=1
-WEBUSER=onionuser@somewhere.invalid
-WEBPASSWD1=0n10nus3r
-WEBPASSWD2=0n10nus3r
diff --git a/setup/automation/distributed-azure-search b/setup/automation/distributed-azure-search
deleted file mode 100644
index 7e7a82291..000000000
--- a/setup/automation/distributed-azure-search
+++ /dev/null
@@ -1,78 +0,0 @@
-#!/bin/bash
-
-# Copyright 2014,2015,2016,2017,2018,2019,2020,2021 Security Onion Solutions, LLC
-
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
-
-TESTING=true
-
-address_type=DHCP
-ADMINUSER=onionuser
-ADMINPASS1=onionuser
-ADMINPASS2=onionuser
-#ALLOW_CIDR=0.0.0.0/0
-#ALLOW_ROLE=a
-#BASICZEEK=7
-#BASICSURI=7
-# BLOGS=
-#BNICS=ens6
-#ZEEKVERSION=ZEEK
-# CURCLOSEDAYS=
-# EVALADVANCED=BASIC
-#GRAFANA=1
-# HELIXAPIKEY=
-HNMANAGER=10.0.0.0/8,192.168.0.0/16,172.16.0.0/12
-HNSENSOR=inherit
-HOSTNAME=distributed-search
-install_type=SEARCHNODE
-# LSINPUTBATCHCOUNT=
-# LSINPUTTHREADS=
-# LSPIPELINEBATCH=
-# LSPIPELINEWORKERS=
-#MANAGERADV=BASIC
-MANAGERUPDATES=1
-# MDNS=
-# MGATEWAY=
-# MIP=
-# MMASK=
-MNIC=eth0
-# MSEARCH=
-MSRV=distributed-manager
-MSRVIP=10.99.1.20
-# MTU=
-#NIDS=Suricata
-# NODE_ES_HEAP_SIZE=
-# NODE_LS_HEAP_SIZE=
-NODESETUP=NODEBASIC
-NSMSETUP=BASIC
-NODEUPDATES=MANAGER
-# OINKCODE=
-#OSQUERY=1
-# PATCHSCHEDULEDAYS=
-# PATCHSCHEDULEHOURS=
-PATCHSCHEDULENAME=auto
-#PLAYBOOK=1
-# REDIRECTHOST=
-#REDIRECTINFO=HOSTNAME
-#RULESETUP=ETOPEN
-# SHARDCOUNT=
-# SKIP_REBOOT=0
-SOREMOTEPASS1=onionuser
-SOREMOTEPASS2=onionuser
-#STRELKA=1
-#THEHIVE=1
-#WAZUH=1
-# WEBUSER=onionuser@somewhere.invalid
-# WEBPASSWD1=0n10nus3r
-# WEBPASSWD2=0n10nus3r
\ No newline at end of file
diff --git a/setup/automation/distributed-azure-sensor b/setup/automation/distributed-azure-sensor
deleted file mode 100644
index fc12774b3..000000000
--- a/setup/automation/distributed-azure-sensor
+++ /dev/null
@@ -1,78 +0,0 @@
-#!/bin/bash
-
-# Copyright 2014,2015,2016,2017,2018,2019,2020,2021 Security Onion Solutions, LLC
-
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
-
-TESTING=true
-
-address_type=DHCP
-ADMINUSER=onionuser
-ADMINPASS1=onionuser
-ADMINPASS2=onionuser
-#ALLOW_CIDR=0.0.0.0/0
-#ALLOW_ROLE=a
-BASICZEEK=2
-BASICSURI=2
-# BLOGS=
-BNICS=eth1
-ZEEKVERSION=ZEEK
-# CURCLOSEDAYS=
-# EVALADVANCED=BASIC
-#GRAFANA=1
-# HELIXAPIKEY=
-HNMANAGER=10.0.0.0/8,192.168.0.0/16,172.16.0.0/12
-HNSENSOR=inherit
-HOSTNAME=distributed-sensor
-install_type=SENSOR
-# LSINPUTBATCHCOUNT=
-# LSINPUTTHREADS=
-# LSPIPELINEBATCH=
-# LSPIPELINEWORKERS=
-#MANAGERADV=BASIC
-MANAGERUPDATES=1
-# MDNS=
-# MGATEWAY=
-# MIP=
-# MMASK=
-MNIC=eth0
-# MSEARCH=
-MSRV=distributed-manager
-MSRVIP=10.99.1.20
-# MTU=
-#NIDS=Suricata
-# NODE_ES_HEAP_SIZE=
-# NODE_LS_HEAP_SIZE=
-#NODESETUP=NODEBASIC
-NSMSETUP=BASIC
-NODEUPDATES=MANAGER
-# OINKCODE=
-#OSQUERY=1
-# PATCHSCHEDULEDAYS=
-# PATCHSCHEDULEHOURS=
-PATCHSCHEDULENAME=auto
-#PLAYBOOK=1
-# REDIRECTHOST=
-#REDIRECTINFO=HOSTNAME
-#RULESETUP=ETOPEN
-# SHARDCOUNT=
-# SKIP_REBOOT=0
-SOREMOTEPASS1=onionuser
-SOREMOTEPASS2=onionuser
-#STRELKA=1
-#THEHIVE=1
-#WAZUH=1
-# WEBUSER=onionuser@somewhere.invalid
-# WEBPASSWD1=0n10nus3r
-# WEBPASSWD2=0n10nus3r
\ No newline at end of file
diff --git a/setup/automation/distributed-azure-manager b/setup/automation/distributed-cloud-manager
similarity index 100%
rename from setup/automation/distributed-azure-manager
rename to setup/automation/distributed-cloud-manager
diff --git a/setup/automation/distributed-ami-search b/setup/automation/distributed-cloud-search
similarity index 100%
rename from setup/automation/distributed-ami-search
rename to setup/automation/distributed-cloud-search
diff --git a/setup/automation/distributed-ami-sensor b/setup/automation/distributed-cloud-sensor
similarity index 100%
rename from setup/automation/distributed-ami-sensor
rename to setup/automation/distributed-cloud-sensor
diff --git a/setup/automation/eval-ami b/setup/automation/eval-ami
deleted file mode 100644
index ac8e42728..000000000
--- a/setup/automation/eval-ami
+++ /dev/null
@@ -1,76 +0,0 @@
-#!/bin/bash
-
-# Copyright 2014,2015,2016,2017,2018,2019,2020,2021 Security Onion Solutions, LLC
-
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
-
-TESTING=true
-
-address_type=DHCP
-ADMINUSER=onionuser
-ADMINPASS1=onionuser
-ADMINPASS2=onionuser
-ALLOW_CIDR=0.0.0.0/0
-ALLOW_ROLE=a
-BASICZEEK=2
-BASICSURI=2
-# BLOGS=
-BNICS=eth1
-ZEEKVERSION=ZEEK
-# CURCLOSEDAYS=
-# EVALADVANCED=BASIC
-GRAFANA=1
-# HELIXAPIKEY=
-HNMANAGER=10.0.0.0/8,192.168.0.0/16,172.16.0.0/12
-HNSENSOR=inherit
-HOSTNAME=eval-aws
-install_type=EVAL
-# LSINPUTBATCHCOUNT=
-# LSINPUTTHREADS=
-# LSPIPELINEBATCH=
-# LSPIPELINEWORKERS=
-MANAGERADV=BASIC
-# MDNS=
-# MGATEWAY=
-# MIP=
-# MMASK=
-MNIC=eth0
-# MSEARCH=
-# MSRV=
-# MTU=
-NIDS=Suricata
-# NODE_ES_HEAP_SIZE=
-# NODE_LS_HEAP_SIZE=
-NODESETUP=NODEBASIC
-NSMSETUP=BASIC
-NODEUPDATES=MANAGER
-# OINKCODE=
-OSQUERY=1
-# PATCHSCHEDULEDAYS=
-# PATCHSCHEDULEHOURS=
-PATCHSCHEDULENAME=auto
-PLAYBOOK=1
-REDIRECTHOST=$(curl http://169.254.169.254/latest/meta-data/public-ipv4)
-REDIRECTINFO=OTHER
-RULESETUP=ETOPEN
-# SHARDCOUNT=
-# SKIP_REBOOT=
-SOREMOTEPASS1=onionuser
-SOREMOTEPASS2=onionuser
-STRELKA=1
-THEHIVE=1
-WAZUH=1
-WEBUSER=onionuser@somewhere.invalid
-WEBPASSWD1=0n10nus3r
-WEBPASSWD2=0n10nus3r
diff --git a/setup/automation/eval-azure b/setup/automation/eval-cloud
similarity index 98%
rename from setup/automation/eval-azure
rename to setup/automation/eval-cloud
index 2e9a69784..87994dad2 100644
--- a/setup/automation/eval-azure
+++ 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/import-ami b/setup/automation/import-ami
deleted file mode 100644
index 039e9caee..000000000
--- a/setup/automation/import-ami
+++ /dev/null
@@ -1,76 +0,0 @@
-#!/bin/bash
-
-# Copyright 2014,2015,2016,2017,2018,2019,2020,2021 Security Onion Solutions, LLC
-
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
-
-TESTING=true
-
-address_type=DHCP
-ADMINUSER=onionuser
-ADMINPASS1=onionuser
-ADMINPASS2=onionuser
-ALLOW_CIDR=0.0.0.0/0
-ALLOW_ROLE=a
-BASICZEEK=2
-BASICSURI=2
-# BLOGS=
-#BNICS=eth1
-ZEEKVERSION=ZEEK
-# CURCLOSEDAYS=
-# EVALADVANCED=BASIC
-# GRAFANA=1
-# HELIXAPIKEY=
-HNMANAGER=10.0.0.0/8,192.168.0.0/16,172.16.0.0/12
-HNSENSOR=inherit
-HOSTNAME=import
-install_type=IMPORT
-# LSINPUTBATCHCOUNT=
-# LSINPUTTHREADS=
-# LSPIPELINEBATCH=
-# LSPIPELINEWORKERS=
-MANAGERADV=BASIC
-# MDNS=
-# MGATEWAY=
-# MIP=
-# MMASK=
-MNIC=eth0
-# MSEARCH=
-# MSRV=
-# MTU=
-NIDS=Suricata
-# NODE_ES_HEAP_SIZE=
-# NODE_LS_HEAP_SIZE=
-NODESETUP=NODEBASIC
-NSMSETUP=BASIC
-NODEUPDATES=MANAGER
-# OINKCODE=
-# OSQUERY=1
-# PATCHSCHEDULEDAYS=
-# PATCHSCHEDULEHOURS=
-PATCHSCHEDULENAME=auto
-# PLAYBOOK=1
-REDIRECTHOST=$(curl http://169.254.169.254/latest/meta-data/public-ipv4)
-REDIRECTINFO=OTHER
-RULESETUP=ETOPEN
-# SHARDCOUNT=
-# SKIP_REBOOT=
-# SOREMOTEPASS1=onionuser
-# SOREMOTEPASS2=onionuser
-STRELKA=1
-# THEHIVE=1
-# WAZUH=1
-WEBUSER=onionuser@somewhere.invalid
-WEBPASSWD1=0n10nus3r
-WEBPASSWD2=0n10nus3r
diff --git a/setup/automation/import-azure b/setup/automation/import-cloud
similarity index 100%
rename from setup/automation/import-azure
rename to setup/automation/import-cloud
diff --git a/setup/automation/standalone-ami b/setup/automation/standalone-ami
deleted file mode 100644
index c006b28fb..000000000
--- a/setup/automation/standalone-ami
+++ /dev/null
@@ -1,76 +0,0 @@
-#!/bin/bash
-
-# Copyright 2014,2015,2016,2017,2018,2019,2020,2021 Security Onion Solutions, LLC
-
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
-
-TESTING=true
-
-address_type=DHCP
-ADMINUSER=onionuser
-ADMINPASS1=onionuser
-ADMINPASS2=onionuser
-ALLOW_CIDR=0.0.0.0/0
-ALLOW_ROLE=a
-BASICZEEK=2
-BASICSURI=2
-# BLOGS=
-BNICS=eth1
-ZEEKVERSION=ZEEK
-# CURCLOSEDAYS=
-# EVALADVANCED=BASIC
-GRAFANA=1
-# HELIXAPIKEY=
-HNMANAGER=10.0.0.0/8,192.168.0.0/16,172.16.0.0/12
-HNSENSOR=inherit
-HOSTNAME=standalone-aws
-install_type=STANDALONE
-# LSINPUTBATCHCOUNT=
-# LSINPUTTHREADS=
-# LSPIPELINEBATCH=
-# LSPIPELINEWORKERS=
-MANAGERADV=BASIC
-# MDNS=
-# MGATEWAY=
-# MIP=
-# MMASK=
-MNIC=eth0
-# MSEARCH=
-# MSRV=
-# MTU=
-NIDS=Suricata
-# NODE_ES_HEAP_SIZE=
-# NODE_LS_HEAP_SIZE=
-NODESETUP=NODEBASIC
-NSMSETUP=BASIC
-NODEUPDATES=MANAGER
-# OINKCODE=
-OSQUERY=1
-# PATCHSCHEDULEDAYS=
-# PATCHSCHEDULEHOURS=
-PATCHSCHEDULENAME=auto
-PLAYBOOK=1
-REDIRECTHOST=$(curl http://169.254.169.254/latest/meta-data/public-ipv4)
-REDIRECTINFO=OTHER
-RULESETUP=ETOPEN
-# SHARDCOUNT=
-# SKIP_REBOOT=
-SOREMOTEPASS1=onionuser
-SOREMOTEPASS2=onionuser
-STRELKA=1
-THEHIVE=1
-WAZUH=1
-WEBUSER=onionuser@somewhere.invalid
-WEBPASSWD1=0n10nus3r
-WEBPASSWD2=0n10nus3r
diff --git a/setup/automation/standalone-azure b/setup/automation/standalone-cloud
similarity index 98%
rename from setup/automation/standalone-azure
rename to setup/automation/standalone-cloud
index 28bb2ae87..94fc26cbb 100644
--- a/setup/automation/standalone-azure
+++ 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=