diff --git a/salt/grafana/etc/datasources/influxdb.yaml b/salt/grafana/etc/datasources/influxdb.yaml
index c95126b14..1c4fd8135 100644
--- a/salt/grafana/etc/datasources/influxdb.yaml
+++ b/salt/grafana/etc/datasources/influxdb.yaml
@@ -9,7 +9,7 @@ datasources:
     type: influxdb
     access: proxy
     database: telegraf
-    url: https://{{ GLOBALS.manager_ip }}:8086
+    url: https://{{ GLOBALS.influxdb_host }}:8086
     jsonData:
       tlsAuth: false
       tlsAuthWithCACert: false
diff --git a/salt/soc/defaults.map.jinja b/salt/soc/defaults.map.jinja
index facba77c8..ecab4d3ce 100644
--- a/salt/soc/defaults.map.jinja
+++ b/salt/soc/defaults.map.jinja
@@ -15,7 +15,7 @@
 {% do SOCDEFAULTS.soc.server.modules.elastic.update({'username': GLOBALS.elasticsearch.auth.users.so_elastic_user.user, 'password': GLOBALS.elasticsearch.auth.users.so_elastic_user.pass}) %}
 
 {% if GLOBALS.role != 'so-import' %}
-{%   do SOCDEFAULTS.soc.server.modules.influxdb.update({'hostUrl': 'https://' ~ GLOBALS.manager_ip ~ ':8086'}) %}
+{%   do SOCDEFAULTS.soc.server.modules.influxdb.update({'hostUrl': 'https://' ~ GLOBALS.influxdb_host ~ ':8086'}) %}
 {% endif %}
 
 {% do SOCDEFAULTS.soc.server.modules.statickeyauth.update({'anonymousCidr': GLOBALS.docker_range, 'apiKey': pillar.sensoroni.sensoronikey}) %}
diff --git a/salt/telegraf/etc/telegraf.conf b/salt/telegraf/etc/telegraf.conf
index 895a25d6c..c9cbe70e5 100644
--- a/salt/telegraf/etc/telegraf.conf
+++ b/salt/telegraf/etc/telegraf.conf
@@ -1,5 +1,5 @@
 # Telegraf Configuration
-{%- set MANAGER = GLOBALS.manager %}
+{%- set INFLUXDBHOST = GLOBALS.influxdb_host %}
 {%- set ES_USER = salt['pillar.get']('elasticsearch:auth:users:so_elastic_user:user', '') %}
 {%- set ES_PASS = salt['pillar.get']('elasticsearch:auth:users:so_elastic_user:pass', '') %}
 {%- set NODEIP = GLOBALS.node_ip %}
@@ -72,7 +72,7 @@
 
 # Configuration for sending metrics to InfluxDB
 [[outputs.influxdb]]
-  urls = ["https://{{ MANAGER }}:8086"]
+  urls = ["https://{{ INFLUXDBHOST }}:8086"]
 
   ## Optional TLS Config for use on HTTP connections.
    tls_ca = "/etc/telegraf/ca.crt"
diff --git a/setup/so-functions b/setup/so-functions
index 97b3fcdd4..4f6af0e7c 100755
--- a/setup/so-functions
+++ b/setup/so-functions
@@ -1431,6 +1431,7 @@ create_global() {
 	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
 	echo "  endgamehost: '$ENDGAMEHOST'" >> $global_pillar_file
 }