diff --git a/pillar/top.sls b/pillar/top.sls
index ac46bfc12..7a36dcc53 100644
--- a/pillar/top.sls
+++ b/pillar/top.sls
@@ -101,6 +101,8 @@ base:
     - soc.adv_soc
     - soctopus.soc_soctopus
     - soctopus.adv_soctopus
+    - kibana.soc_kibana
+    - kibana.adv_kibana
     - strelka.soc_strelka
     - strelka.adv_strelka
     - curator.soc_curator
@@ -155,6 +157,8 @@ base:
     - soc.adv_soc
     - soctopus.soc_soctopus
     - soctopus.adv_soctopus
+    - kibana.soc_kibana
+    - kibana.adv_kibana
     - strelka.soc_strelka
     - strelka.adv_strelka
     - curator.soc_curator
@@ -248,6 +252,8 @@ base:
     - soc.adv_soc
     - soctopus.soc_soctopus
     - soctopus.adv_soctopus
+    - kibana.soc_kibana
+    - kibana.adv_kibana
     - curator.soc_curator
     - curator.adv_curator
     - backup.soc_backup
diff --git a/setup/so-functions b/setup/so-functions
index dff20b7b3..d14367361 100755
--- a/setup/so-functions
+++ b/setup/so-functions
@@ -898,7 +898,6 @@ create_manager_pillars() {
 	manager_pillar
 	create_global
 	create_sensoroni_pillar
-	#create_strelka_pillar
 	backup_pillar
 	soctopus_pillar
 	docker_pillar
@@ -911,6 +910,7 @@ create_manager_pillars() {
 	logrotate_pillar
 	patch_pillar
 	nginx_pillar
+	kibana_pillar
 }
 
 create_repo() {