diff --git a/pillar/top.sls b/pillar/top.sls
index 63bcbbaaf..9ee372fe1 100644
--- a/pillar/top.sls
+++ b/pillar/top.sls
@@ -43,6 +43,8 @@ base:
     - manager.adv_manager
     - soc.soc_soc
     - soc.adv_soc
+    - backup.soc_backup
+    - backup.adv_backup
     - minions.{{ grains.id }}
     - minions.adv_{{ grains.id }}
 
@@ -67,6 +69,8 @@ base:
     - elasticsearch.soc_elasticsearch
     - manager.soc_manager
     - soc.soc_soc
+    - backup.soc_backup
+    - backup.adv_backup
     - minions.{{ grains.id }}
     - minions.adv_{{ grains.id }}
 
@@ -89,6 +93,8 @@ base:
     - elasticsearch.soc_elasticsearch
     - manager.soc_manager
     - soc.soc_soc
+    - backup.soc_backup
+    - backup.adv_backup
     - minions.{{ grains.id }}
     - minions.adv_{{ grains.id }}
 
@@ -140,6 +146,8 @@ base:
     - soc_global
     - adv_global
     - manager.soc_manager
+    - backup.soc_backup
+    - backup.adv_backup
     - minions.{{ grains.id }}
     - minions.adv_{{ grains.id }}
 
diff --git a/salt/backup/config_backup.sls b/salt/backup/config_backup.sls
index 5c4125ceb..f4379f939 100644
--- a/salt/backup/config_backup.sls
+++ b/salt/backup/config_backup.sls
@@ -16,7 +16,7 @@ config_backup_script:
     - group: root
     - file_mode: 755
     - template: jinja
-    - source: salt://backup/tools/sbin
+    - source: salt://backup/tools/sbin/so-config-backup.jinja
     - defaults:
         BACKUPLOCATIONS: {{ BACKUP_MERGED.locations }}
   
diff --git a/salt/backup/defaults.yaml b/salt/backup/defaults.yaml
index f994eac29..9b8d5909d 100644
--- a/salt/backup/defaults.yaml
+++ b/salt/backup/defaults.yaml
@@ -1,3 +1,6 @@
 backup:
   locations:
     - /opt/so/saltstack/local
+    - /etc/pki
+    - /etc/salt
+    - /opt/so/conf/kratos
diff --git a/salt/backup/map.jinja b/salt/backup/map.jinja
index 2a7724ff4..52ae20c56 100644
--- a/salt/backup/map.jinja
+++ b/salt/backup/map.jinja
@@ -1,2 +1,2 @@
 {% import_yaml 'backup/defaults.yaml' as BACKUP_DEFAULTS %}
-{% set BACKUP_MERGED = salt['pillar.get']('backup', BACKUP_DEFAULTS, merge=true, merge_nested_lists=true) %}
+{% set BACKUP_MERGED = salt['pillar.get']('backup', BACKUP_DEFAULTS.backup, merge=true, merge_nested_lists=true) %}
diff --git a/salt/backup/tools/sbin/so-config-backup b/salt/backup/tools/sbin/so-config-backup.jinja
similarity index 92%
rename from salt/backup/tools/sbin/so-config-backup
rename to salt/backup/tools/sbin/so-config-backup.jinja
index b808bd350..c0e24cd80 100755
--- a/salt/backup/tools/sbin/so-config-backup
+++ b/salt/backup/tools/sbin/so-config-backup.jinja
@@ -24,9 +24,6 @@ if [ ! -f $BACKUPFILE ]; then
   {%- for LOCATION in BACKUPLOCATIONS %}
   tar -rf $BACKUPFILE {{ LOCATION }}
   {%- endfor %}
-  tar -rf $BACKUPFILE /etc/pki
-  tar -rf $BACKUPFILE /etc/salt
-  tar -rf $BACKUPFILE /opt/so/conf/kratos
 
 fi
 
diff --git a/salt/kibana/config.map.jinja b/salt/kibana/config.map.jinja
index 120c49cdb..af0e26fd5 100644
--- a/salt/kibana/config.map.jinja
+++ b/salt/kibana/config.map.jinja
@@ -3,7 +3,7 @@
 {% set HIGHLANDER = salt['pillar.get']('global:highlander', False) %}
 
 {% do KIBANACONFIG.kibana.config.server.update({'publicBaseUrl': 'https://' ~ GLOBALS.url_base ~ '/kibana'}) %}
-{% do KIBANACONFIG.kibana.config.elasticsearch.update({'hosts': ['https://' ~ GLOBALS..manager_ip ~ ':9200']}) %}
+{% do KIBANACONFIG.kibana.config.elasticsearch.update({'hosts': ['https://' ~ GLOBALS.manager_ip ~ ':9200']}) %}
 
 {% do KIBANACONFIG.kibana.config.elasticsearch.update({'username': salt['pillar.get']('elasticsearch:auth:users:so_kibana_user:user'), 'password': salt['pillar.get']('elasticsearch:auth:users:so_kibana_user:pass')}) %}
 
diff --git a/salt/logstash/map.jinja b/salt/logstash/map.jinja
index 49cdc0cc0..035e36d86 100644
--- a/salt/logstash/map.jinja
+++ b/salt/logstash/map.jinja
@@ -10,5 +10,5 @@
     {% endif %}
   {% endfor %}
 {% else %}
-  {% do REDIS_NODES.append({GLOBALS.node_ip}) %}
+  {% do REDIS_NODES.append({GLOBALS.hostname:GLOBALS.node_ip}) %}
 {% endif %}
diff --git a/salt/vars/globals.map.jinja b/salt/vars/globals.map.jinja
index f9dfef404..a88b77e45 100644
--- a/salt/vars/globals.map.jinja
+++ b/salt/vars/globals.map.jinja
@@ -33,7 +33,7 @@
       'so-manager',
       'so-managersearch',
       'so-standalone'
-    ]
+    ],
     'sensor_roles': [
       'so-eval',
       'so-heavynode',