diff --git a/salt/common/tools/sbin/so-elastic-fleet-setup b/salt/common/tools/sbin/so-elastic-fleet-setup
index e7f740783..490fb34db 100644
--- a/salt/common/tools/sbin/so-elastic-fleet-setup
+++ b/salt/common/tools/sbin/so-elastic-fleet-setup
@@ -78,9 +78,9 @@ wget -P /opt/so/saltstack/default/salt/elastic-fleet/files/elastic-agent/  https
 wget -P /opt/so/saltstack/default/salt/elastic-fleet/files/elastic-agent/ https://github.com/Security-Onion-Solutions/securityonion-docker-rpm/releases/download/so_elastic-agent-8.4.1/so-elastic-agent-8.4.1-linux-x86_64.tar.gz
 wget -P /opt/so/saltstack/default/salt/elastic-fleet/files/elastic-agent/ https://github.com/Security-Onion-Solutions/securityonion-docker-rpm/releases/download/so_elastic-agent-8.4.1/so-elastic-agent-8.4.1-windows-x86_64.tar.gz
 
-git clone -b 2.4-so-elastic-agent https://github.com/Security-Onion-Solutions/securityonion-image.git
-cd securityonion-image/so-elastic-agent-builder
-docker build -t so-elastic-agent-builder .
+#git clone -b 2.4-so-elastic-agent https://github.com/Security-Onion-Solutions/securityonion-image.git
+#cd securityonion-image/so-elastic-agent-builder
+#docker build -t so-elastic-agent-builder .
 
 so-elastic-agent-gen-installers
 salt-call state.apply elastic-fleet.install_agent_grid
\ No newline at end of file
diff --git a/salt/common/tools/sbin/so-image-common b/salt/common/tools/sbin/so-image-common
index b29f4bd45..32bfb2acc 100755
--- a/salt/common/tools/sbin/so-image-common
+++ b/salt/common/tools/sbin/so-image-common
@@ -40,6 +40,7 @@ container_list() {
     TRUSTED_CONTAINERS=(
       "so-curator"
       "so-elastalert"
+      "so-elastic-agent-builder"
       "so-elasticsearch"
       "so-filebeat"
       "so-grafana"