diff --git a/salt/hive/init.sls b/salt/hive/init.sls
index b6272b8ed..5897f6a93 100644
--- a/salt/hive/init.sls
+++ b/salt/hive/init.sls
@@ -56,7 +56,6 @@ so-thehive-es:
       - transport.tcp.port=9500
       - transport.host=0.0.0.0
       - cluster.name=hive
-      - script.inline=true
       - thread_pool.index.queue_size=100000
       - thread_pool.search.queue_size=100000
       - thread_pool.bulk.queue_size=100000
@@ -98,8 +97,8 @@ so-thehive:
     - port_bindings:
       - 0.0.0.0:9000:9000
 
-#hivescript:
-#  cmd.script:
-#    - source: salt://hive/thehive/scripts/hive_init.sh
-#    - cwd: /opt/so
-#    - template: jinja
+hivescript:
+  cmd.script:
+    - source: salt://hive/thehive/scripts/hive_init.sh
+    - cwd: /opt/so
+    - template: jinja
diff --git a/salt/hive/thehive/etc/application.conf b/salt/hive/thehive/etc/application.conf
index 1fd4b4816..e4dd1e2b2 100644
--- a/salt/hive/thehive/etc/application.conf
+++ b/salt/hive/thehive/etc/application.conf
@@ -5,59 +5,57 @@
 # WARNING: If you deploy your application on several servers, make sure to use the same key.
 play.http.secret.key="letsdewdis"
 play.http.context=/thehive/
-
+search.uri = "http://{{ MASTERIP }}:9400"
 # Elasticsearch
 search {
-  ## Basic configuration
-  # Index name.
-  index = the_hive
-  # ElasticSearch cluster name.
-  cluster = hive
-  # ElasticSearch instance address.
-  host = ["{{ MASTERIP }}:9500"]
+ # Name of the index
+ index = the_hive
+ # Name of the Elasticsearch cluster
+ cluster = hive
+ # Address of the Elasticsearch instance
+ host = ["{{ MASTERIP }}:9500"]
+ #search.uri = "http://{{ MASTERIP }}:9500"
+ # Scroll keepalive
+ keepalive = 1m
+ # Size of the page for scroll
+ pagesize = 50
+ # Number of shards
+ nbshards = 5
+ # Number of replicas
+ nbreplicas = 1
+ # Arbitrary settings
+ settings {
+   # Maximum number of nested fields
+   mapping.nested_fields.limit = 100
+ }
 
-  ## Advanced configuration
-  # Scroll keepalive.
-  #keepalive = 1m
-  # Scroll page size.
-  #pagesize = 50
-  # Number of shards
-  #nbshards = 5
-  # Number of replicas
-  #nbreplicas = 1
-  # Arbitrary settings
-  #settings {
-  #  # Maximum number of nested fields
-  #  mapping.nested_fields.limit = 100
-  #}
+ ### XPack SSL configuration
+ # Username for XPack authentication
+ #username
+ # Password for XPack authentication
+ #password
+ # Enable SSL to connect to ElasticSearch
+ ssl.enabled = false
+ # Path to certificate authority file
+ #ssl.ca
+ # Path to certificate file
+ #ssl.certificate
+ # Path to key file
+ #ssl.key
 
-  ### XPack SSL configuration
-  # Username for XPack authentication
-  #search.username = ""
-  # Password for XPack authentication
-  #search.password = ""
-  # Enable SSL to connect to ElasticSearch
-  search.ssl.enabled = false
-  # Path to certificate authority file
-  #search.ssl.ca = ""
-  # Path to certificate file
-  #search.ssl.certificate = ""
-  # Path to key file
-  #search.ssl.key = ""
-
-  ### SearchGuard configuration
-  # Path to JKS file containing client certificate
-  #search.guard.keyStore.path = ""
-  # Password of the keystore
-  #search.guard.keyStore.password = ""
-  # Path to JKS file containing certificate authorities
-  #search.guard.trustStore.path = ""
-  ## Password of the truststore
-  #search.guard.trustStore.password = ""
-  # Enforce hostname verification
-  #search.guard.hostVerification = false
-  # If hostname verification is enabled specify if hostname should be resolved
-  #search.guard.hostVerificationResolveHostname = false
+ ### SearchGuard configuration
+ # Path to JKS file containing client certificate
+ #guard.keyStore.path
+ # Password of the keystore
+ #guard.keyStore.password
+ # Path to JKS file containing certificate authorities
+ #guard.trustStore.path
+ ## Password of the truststore
+ #guard.trustStore.password
+ # Enforce hostname verification
+ #guard.hostVerification
+ # If hostname verification is enabled specify if hostname should be resolved
+ #guard.hostVerificationResolveHostname
 }
 
 # Authentication