diff --git a/salt/global/defaults.yaml b/salt/global/defaults.yaml
index bd7244a58..5daa942c8 100644
--- a/salt/global/defaults.yaml
+++ b/salt/global/defaults.yaml
@@ -1,2 +1,3 @@
 global:
-  pcapengine: STENO
\ No newline at end of file
+  pcapengine: STENO
+  pipeline: REDIS
\ No newline at end of file
diff --git a/salt/global/soc_global.yaml b/salt/global/soc_global.yaml
index 667bf7826..5a349a3c3 100644
--- a/salt/global/soc_global.yaml
+++ b/salt/global/soc_global.yaml
@@ -37,6 +37,8 @@ global:
     advanced: True
   pipeline:
     description: Sets which pipeline technology for events to use. Currently only Redis is fully supported. Kafka is experimental and requires a Security Onion Pro license.
+    regex: ^(REDIS|KAFKA)$
+    regexFailureMessage: You must enter either REDIS or KAFKA.
     global: True
     advanced: True
   repo_host:
diff --git a/salt/kafka/init.sls b/salt/kafka/init.sls
index b4a6a28b0..acedba3c3 100644
--- a/salt/kafka/init.sls
+++ b/salt/kafka/init.sls
@@ -4,9 +4,10 @@
 # Elastic License 2.0.
 
 {% from 'kafka/map.jinja' import KAFKAMERGED %}
+{% from 'vars/globals.map.jinja' import GLOBALS %}
 
 include:
-{% if KAFKAMERGED.enabled %}
+{% if GLOBALS.pipeline == "KAFKA" and KAFKAMERGED.enabled %}
   - kafka.enabled
 {% else %}
   - kafka.disabled
diff --git a/salt/manager/tools/sbin/soup b/salt/manager/tools/sbin/soup
index fa3c3b5ee..3ca353856 100755
--- a/salt/manager/tools/sbin/soup
+++ b/salt/manager/tools/sbin/soup
@@ -438,7 +438,8 @@ post_to_2.4.60() {
 }
 
 post_to_2.4.70() {
-  echo "Nothing to apply"
+  echo "Removing global.pipeline pillar configuration"
+  sed -i '/pipeline:/d' /opt/so/saltstack/local/pillar/global/soc_global.sls
   POSTVERSION=2.4.70
 }
 
diff --git a/salt/redis/init.sls b/salt/redis/init.sls
index 4936c3254..7142c92c3 100644
--- a/salt/redis/init.sls
+++ b/salt/redis/init.sls
@@ -4,10 +4,10 @@
 # Elastic License 2.0.
 
 {% from 'redis/map.jinja' import REDISMERGED %}
-{% from 'kafka/map.jinja' import KAFKAMERGED %}
+{% from 'vars/globals.map.jinja' import GLOBALS %}
 
 include:
-{% if REDISMERGED.enabled and not KAFKAMERGED.enabled %}
+{% if GLOBALS.pipeline == "REDIS" and REDISMERGED.enabled %}
   - redis.enabled
 {% else %}
   - redis.disabled
diff --git a/salt/vars/kafkanode.map.jinja b/salt/vars/kafkanode.map.jinja
deleted file mode 100644
index 396cefcc9..000000000
--- a/salt/vars/kafkanode.map.jinja
+++ /dev/null
@@ -1 +0,0 @@
-{% set ROLE_GLOBALS = {} %}
\ No newline at end of file
diff --git a/setup/so-functions b/setup/so-functions
index 176349edb..038a4deb4 100755
--- a/setup/so-functions
+++ b/setup/so-functions
@@ -1327,7 +1327,6 @@ create_global() {
 
 	# Continue adding other details	
 	echo "  imagerepo: '$IMAGEREPO'" >> $global_pillar_file
-	echo "  pipeline: 'redis'" >> $global_pillar_file
 	echo "  repo_host: '$HOSTNAME'" >> $global_pillar_file
 	echo "  influxdb_host: '$HOSTNAME'" >> $global_pillar_file
 	echo "  registry_host: '$HOSTNAME'" >> $global_pillar_file