diff --git a/salt/kibana/bin/so-kibana-config-load b/salt/kibana/bin/so-kibana-config-load
index 4dea98102..d9a98e19f 100644
--- a/salt/kibana/bin/so-kibana-config-load
+++ b/salt/kibana/bin/so-kibana-config-load
@@ -2,7 +2,7 @@
 # {%- set FLEET_MASTER = salt['pillar.get']('static:fleet_master', False) -%}
 # {%- set FLEET_NODE = salt['pillar.get']('static:fleet_node', False) -%}
 # {%- set FLEET_IP = salt['pillar.get']('static:fleet_ip', '') %}
-# {%- set MASTER = salt['pillar.get']('kratos:redirect', '') %}
+# {%- set MASTER = salt['pillar.get']('master:url_base', '') %}
 
 KIBANA_VERSION="7.6.1"
 
diff --git a/salt/soc/files/kratos/kratos.yaml b/salt/soc/files/kratos/kratos.yaml
index 2e21ecdfb..e5a970557 100644
--- a/salt/soc/files/kratos/kratos.yaml
+++ b/salt/soc/files/kratos/kratos.yaml
@@ -1,4 +1,4 @@
-{%- set WEBACCESS = salt['pillar.get']('kratos:redirect', '') -%}
+{%- set WEBACCESS = salt['pillar.get']('master:url_base', '') -%}
 {%- set KRATOSKEY = salt['pillar.get']('kratos:kratoskey', '') -%}
 
 selfservice:
diff --git a/setup/so-functions b/setup/so-functions
index 0549d25c5..88618339b 100755
--- a/setup/so-functions
+++ b/setup/so-functions
@@ -810,6 +810,18 @@ master_pillar() {
 			"  mtu: $MTU" >> "$pillar_file"
 	fi
 
+	case $REDIRECTINFO in
+		'IP')
+			REDIRECTIT="$MAINIP"
+			;;
+		'HOSTNAME')
+			REDIRECTIT=$HOSTNAME
+			;;
+		*)
+			REDIRECTIT="$REDIRECTHOST"
+			;;
+	esac
+
 	printf '%s\n'\
 		"  lsheap: $LS_HEAP_SIZE"\
 		"  lsaccessip: 127.0.0.1"\
@@ -825,24 +837,12 @@ master_pillar() {
 		"  thehive: $THEHIVE"\
 		"  playbook: $PLAYBOOK"\
 		"  navigator: $NAVIGATOR"\
+		"  url_base: $REDIRECTIT"\
 		""\
 		"kratos:" >> "$pillar_file"
 
-	case $REDIRECTINFO in
-		'IP')
-			REDIRECTIT="$MAINIP"
-			;;
-		'HOSTNAME')
-			REDIRECTIT=$HOSTNAME
-			;;
-		*)
-			REDIRECTIT="$REDIRECTHOST"
-			;;
-	esac
-
 	printf '%s\n'\
 		"  kratoskey: $KRATOSKEY"\
-		"  redirect: $REDIRECTIT"\
 		"" >> "$pillar_file"
 
 	printf '%s\n'  '----' >> "$setup_log" 2>&1