diff --git a/salt/firewall/portgroups.yaml b/salt/firewall/portgroups.yaml
index db7450364..8771df8ef 100644
--- a/salt/firewall/portgroups.yaml
+++ b/salt/firewall/portgroups.yaml
@@ -64,7 +64,7 @@ firewall:
       redis:
         tcp:
           - 6379
-          - 6380
+          - 9696
       salt_manager:
         tcp:
           - 4505
diff --git a/salt/logstash/pipelines/config/so/0900_input_redis.conf.jinja b/salt/logstash/pipelines/config/so/0900_input_redis.conf.jinja
index b2b4dc864..c98a2a388 100644
--- a/salt/logstash/pipelines/config/so/0900_input_redis.conf.jinja
+++ b/salt/logstash/pipelines/config/so/0900_input_redis.conf.jinja
@@ -4,7 +4,7 @@
 input {
 	redis {
 		host => '{{ MANAGER }}'
-		port => 6380
+		port => 9696
 		ssl => true
 		data_type => 'list'
 		key => 'logstash:unparsed'
diff --git a/salt/logstash/pipelines/config/so/9999_output_redis.conf.jinja b/salt/logstash/pipelines/config/so/9999_output_redis.conf.jinja
index 4b38a684d..5505ca636 100644
--- a/salt/logstash/pipelines/config/so/9999_output_redis.conf.jinja
+++ b/salt/logstash/pipelines/config/so/9999_output_redis.conf.jinja
@@ -3,7 +3,7 @@
 output {
 	redis {
 		host => '{{ MANAGER }}'
-		port => 6380
+		port => 9696
 		data_type => 'list'
 		key => 'logstash:unparsed'
 		congestion_interval => 1
diff --git a/salt/redis/etc/redis.conf b/salt/redis/etc/redis.conf
index 46f0c46e8..cf43bc04c 100644
--- a/salt/redis/etc/redis.conf
+++ b/salt/redis/etc/redis.conf
@@ -89,7 +89,7 @@ protected-mode no
 tls-cert-file /certs/redis.crt
 tls-key-file /certs/redis.key
 tls-ca-cert-file /certs/ca.crt
-tls-port 6380
+tls-port 9696
 tls-auth-clients no
 
 # Accept connections on the specified port, default is 6379 (IANA #815344).