diff --git a/salt/common/tools/sbin/so-image-common b/salt/common/tools/sbin/so-image-common
index 3449158c0..f0fd8d691 100755
--- a/salt/common/tools/sbin/so-image-common
+++ b/salt/common/tools/sbin/so-image-common
@@ -17,6 +17,7 @@
 
 # NOTE: This script depends on so-common
 IMAGEREPO=securityonion
+FEATURESCHECK=$(lookup_pillar elastic features)    
 
 container_list() {
     MANAGERCHECK=$1
@@ -46,17 +47,24 @@ container_list() {
         "so-curator" \
         "so-domainstats" \
         "so-elastalert" \
-        "so-elasticsearch" \
-        "so-filebeat" \
+        if [[ "$FEATURESCHECK" == "True" ]]; then
+          "so-elasticsearch-features" \
+          "so-filebeat-features" \
+          "so-logstash-features" \
+          "so-kibana-features" \
+        else
+          "so-elasticsearch" \
+          "so-filebeat" \
+          "so-logstash" \
+          "so-kibana" \
+        fi
         "so-fleet" \
         "so-fleet-launcher" \
         "so-freqserver" \
         "so-grafana" \
         "so-idstools" \
         "so-influxdb" \
-        "so-kibana" \
         "so-kratos" \
-        "so-logstash" \
         "so-minio" \
         "so-mysql" \
         "so-nginx" \