diff --git a/setup/automation/distributed-ami-forwardnode b/setup/automation/distributed-ami-forwardnode
deleted file mode 100644
index edcc3fd7c..000000000
--- a/setup/automation/distributed-ami-forwardnode
+++ /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=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=forwardnode-aws
-install_type=SENSOR
-# LSINPUTBATCHCOUNT=
-# LSINPUTTHREADS=
-# LSPIPELINEBATCH=
-# LSPIPELINEWORKERS=
-#MANAGERADV=BASIC
-MANAGERUPDATES=1
-# MDNS=
-# MGATEWAY=
-# MIP=
-# MMASK=
-MNIC=ens5
-# MSEARCH=
-MSRV=manager-aws
-MSRVIP=172.16.163.10
-# 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
diff --git a/setup/automation/distributed-ami-searchnode b/setup/automation/distributed-ami-searchnode
deleted file mode 100644
index eda2f6d2e..000000000
--- a/setup/automation/distributed-ami-searchnode
+++ /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=searchnode-aws
-install_type=SEARCHNODE
-# LSINPUTBATCHCOUNT=
-# LSINPUTTHREADS=
-# LSPIPELINEBATCH=
-# LSPIPELINEWORKERS=
-#MANAGERADV=BASIC
-MANAGERUPDATES=1
-# MDNS=
-# MGATEWAY=
-# MIP=
-# MMASK=
-MNIC=ens5
-# MSEARCH=
-MSRV=manager-aws
-MSRVIP=172.16.163.10
-# 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