diff --git a/salt/thehive/etc/application.conf b/salt/thehive/etc/application.conf
index f06c3f7c6..8aaf7a9a5 100644
--- a/salt/thehive/etc/application.conf
+++ b/salt/thehive/etc/application.conf
@@ -1,10 +1,11 @@
 {%- set MANAGERIP = salt['pillar.get']('static:managerip', '') %}
 {%- set CORTEXKEY = salt['pillar.get']('static:cortexorguserkey', '') %}
+{%- set HIVEPLAYSECRET = salt['pillar.get']('static:hiveplaysecret', '') %}
 
 # Secret Key
 # The secret key is used to secure cryptographic functions.
 # WARNING: If you deploy your application on several servers, make sure to use the same key.
-play.http.secret.key="letsdewdis"
+play.http.secret.key="{{ HIVEPLAYSECRET }}"
 play.http.context=/thehive/
 search.uri = "http://{{ MANAGERIP }}:9400"
 # Elasticsearch
diff --git a/salt/thehive/etc/cortex-application.conf b/salt/thehive/etc/cortex-application.conf
index b9cbe20cc..c7e52d954 100644
--- a/salt/thehive/etc/cortex-application.conf
+++ b/salt/thehive/etc/cortex-application.conf
@@ -1,9 +1,10 @@
 {%- set MANAGERIP = salt['pillar.get']('static:managerip', '') %}
+{%- set CORTEXPLAYSECRET = salt['pillar.get']('static:cortexplaysecret', '') %}
 
 # Secret Key
 # The secret key is used to secure cryptographic functions.
 # WARNING: If you deploy your application on several servers, make sure to use the same key.
-play.http.secret.key="letsdewdis"
+play.http.secret.key="{{ CORTEXPLAYSECRET }}"
 play.http.context=/cortex/
 search.uri = "http://{{ MANAGERIP }}:9400"
 
diff --git a/setup/so-functions b/setup/so-functions
index 5d5c9f585..2f1ea7198 100755
--- a/setup/so-functions
+++ b/setup/so-functions
@@ -875,8 +875,10 @@ generate_passwords(){
   FLEETPASS=$(tr -dc 'a-zA-Z0-9' < /dev/urandom  | fold -w 20 | head -n 1)
   FLEETJWT=$(tr -dc 'a-zA-Z0-9' < /dev/urandom  | fold -w 20 | head -n 1)
   HIVEKEY=$(tr -dc 'a-zA-Z0-9' < /dev/urandom  | fold -w 20 | head -n 1)
+  HIVEPLAYSECRET=$(tr -dc 'a-zA-Z0-9' < /dev/urandom  | fold -w 20 | head -n 1)
   CORTEXKEY=$(tr -dc 'a-zA-Z0-9' < /dev/urandom  | fold -w 20 | head -n 1)
   CORTEXORGUSERKEY=$(tr -dc 'a-zA-Z0-9' < /dev/urandom  | fold -w 20 | head -n 1)
+  CORTEXPLAYSECRET=$(tr -dc 'a-zA-Z0-9' < /dev/urandom  | fold -w 20 | head -n 1)
   SENSORONIKEY=$(tr -dc 'a-zA-Z0-9' < /dev/urandom  | fold -w 20 | head -n 1)
   KRATOSKEY=$(tr -dc 'a-zA-Z0-9' < /dev/urandom  | fold -w 20 | head -n 1)
 }
@@ -1027,12 +1029,14 @@ manager_static() {
 		"  hiveuser: $WEBUSER"\
 		"  hivepassword: '$WEBPASSWD1'"\
 		"  hivekey: $HIVEKEY"\
+		"  hiveplaysecret: $HIVEPLAYSECRET"\
 		"  cortexuser: $WEBUSER"\
 		"  cortexpassword: '$WEBPASSWD1'"\
 		"  cortexkey: $CORTEXKEY"\
 		"  cortexorgname: SecurityOnion"\
-		"  cortexorguser: $WEBUSER"\
+		"  cortexorguser: soadmin"\
 		"  cortexorguserkey: $CORTEXORGUSERKEY"\
+		"  cortexplaysecret: $CORTEXPLAYSECRET"\
 		"  fleet_custom_hostname: "\
 		"  fleet_manager: False"\
 		"  fleet_node: False"\