diff --git a/salt/common/tools/sbin/so-cortex-restart b/salt/common/tools/sbin/so-cortex-restart
deleted file mode 100755
index fe8193bf7..000000000
--- a/salt/common/tools/sbin/so-cortex-restart
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/bash
-#
-# Copyright Security Onion Solutions LLC and/or licensed to Security Onion Solutions LLC under one
-# or more contributor license agreements. Licensed under the Elastic License 2.0 as shown at 
-# https://securityonion.net/license; you may not use this file except in compliance with the
-# Elastic License 2.0.
-
-
-
-. /usr/sbin/so-common
-
-echo "TheHive and its components are no longer part of Security Onion"
\ No newline at end of file
diff --git a/salt/common/tools/sbin/so-cortex-stop b/salt/common/tools/sbin/so-cortex-stop
deleted file mode 100755
index 036ab5689..000000000
--- a/salt/common/tools/sbin/so-cortex-stop
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/bash
-#
-# Copyright Security Onion Solutions LLC and/or licensed to Security Onion Solutions LLC under one
-# or more contributor license agreements. Licensed under the Elastic License 2.0 as shown at 
-# https://securityonion.net/license; you may not use this file except in compliance with the
-# Elastic License 2.0.
-
-
-
-. /usr/sbin/so-common
-
-echo "TheHive and its components are no longer part of Security Onion"
diff --git a/salt/common/tools/sbin/so-cortex-user-add b/salt/common/tools/sbin/so-cortex-user-add
deleted file mode 100755
index fe8193bf7..000000000
--- a/salt/common/tools/sbin/so-cortex-user-add
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/bash
-#
-# Copyright Security Onion Solutions LLC and/or licensed to Security Onion Solutions LLC under one
-# or more contributor license agreements. Licensed under the Elastic License 2.0 as shown at 
-# https://securityonion.net/license; you may not use this file except in compliance with the
-# Elastic License 2.0.
-
-
-
-. /usr/sbin/so-common
-
-echo "TheHive and its components are no longer part of Security Onion"
\ No newline at end of file
diff --git a/salt/common/tools/sbin/so-cortex-user-enable b/salt/common/tools/sbin/so-cortex-user-enable
deleted file mode 100755
index fe8193bf7..000000000
--- a/salt/common/tools/sbin/so-cortex-user-enable
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/bash
-#
-# Copyright Security Onion Solutions LLC and/or licensed to Security Onion Solutions LLC under one
-# or more contributor license agreements. Licensed under the Elastic License 2.0 as shown at 
-# https://securityonion.net/license; you may not use this file except in compliance with the
-# Elastic License 2.0.
-
-
-
-. /usr/sbin/so-common
-
-echo "TheHive and its components are no longer part of Security Onion"
\ No newline at end of file
diff --git a/salt/common/tools/sbin/so-thehive-es-start b/salt/common/tools/sbin/so-elastic-fleet-restart
similarity index 83%
rename from salt/common/tools/sbin/so-thehive-es-start
rename to salt/common/tools/sbin/so-elastic-fleet-restart
index feeb5cafd..e3c38b409 100755
--- a/salt/common/tools/sbin/so-thehive-es-start
+++ b/salt/common/tools/sbin/so-elastic-fleet-restart
@@ -9,4 +9,4 @@
 
 . /usr/sbin/so-common
 
-echo "TheHive and its components are no longer part of Security Onion"
\ No newline at end of file
+/usr/sbin/so-restart elastic-fleet $1
diff --git a/salt/common/tools/sbin/so-thehive-start b/salt/common/tools/sbin/so-elastic-fleet-start
similarity index 83%
rename from salt/common/tools/sbin/so-thehive-start
rename to salt/common/tools/sbin/so-elastic-fleet-start
index feeb5cafd..5ae7d21a1 100755
--- a/salt/common/tools/sbin/so-thehive-start
+++ b/salt/common/tools/sbin/so-elastic-fleet-start
@@ -9,4 +9,4 @@
 
 . /usr/sbin/so-common
 
-echo "TheHive and its components are no longer part of Security Onion"
\ No newline at end of file
+/usr/sbin/so-start elastic-fleet $1
diff --git a/salt/common/tools/sbin/so-cortex-start b/salt/common/tools/sbin/so-elastic-fleet-stop
similarity index 83%
rename from salt/common/tools/sbin/so-cortex-start
rename to salt/common/tools/sbin/so-elastic-fleet-stop
index 25b2c99c5..f3fc3b923 100755
--- a/salt/common/tools/sbin/so-cortex-start
+++ b/salt/common/tools/sbin/so-elastic-fleet-stop
@@ -9,4 +9,4 @@
 
 . /usr/sbin/so-common
 
-echo "TheHive and its components are no longer part of Security Onion"
+/usr/sbin/so-stop elastic-fleet $1
diff --git a/salt/common/tools/sbin/so-thehive-es-restart b/salt/common/tools/sbin/so-thehive-es-restart
deleted file mode 100755
index 036ab5689..000000000
--- a/salt/common/tools/sbin/so-thehive-es-restart
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/bash
-#
-# Copyright Security Onion Solutions LLC and/or licensed to Security Onion Solutions LLC under one
-# or more contributor license agreements. Licensed under the Elastic License 2.0 as shown at 
-# https://securityonion.net/license; you may not use this file except in compliance with the
-# Elastic License 2.0.
-
-
-
-. /usr/sbin/so-common
-
-echo "TheHive and its components are no longer part of Security Onion"
diff --git a/salt/common/tools/sbin/so-thehive-es-stop b/salt/common/tools/sbin/so-thehive-es-stop
deleted file mode 100755
index fe8193bf7..000000000
--- a/salt/common/tools/sbin/so-thehive-es-stop
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/bash
-#
-# Copyright Security Onion Solutions LLC and/or licensed to Security Onion Solutions LLC under one
-# or more contributor license agreements. Licensed under the Elastic License 2.0 as shown at 
-# https://securityonion.net/license; you may not use this file except in compliance with the
-# Elastic License 2.0.
-
-
-
-. /usr/sbin/so-common
-
-echo "TheHive and its components are no longer part of Security Onion"
\ No newline at end of file
diff --git a/salt/common/tools/sbin/so-thehive-restart b/salt/common/tools/sbin/so-thehive-restart
deleted file mode 100755
index fe8193bf7..000000000
--- a/salt/common/tools/sbin/so-thehive-restart
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/bash
-#
-# Copyright Security Onion Solutions LLC and/or licensed to Security Onion Solutions LLC under one
-# or more contributor license agreements. Licensed under the Elastic License 2.0 as shown at 
-# https://securityonion.net/license; you may not use this file except in compliance with the
-# Elastic License 2.0.
-
-
-
-. /usr/sbin/so-common
-
-echo "TheHive and its components are no longer part of Security Onion"
\ No newline at end of file
diff --git a/salt/common/tools/sbin/so-thehive-stop b/salt/common/tools/sbin/so-thehive-stop
deleted file mode 100755
index fe8193bf7..000000000
--- a/salt/common/tools/sbin/so-thehive-stop
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/bash
-#
-# Copyright Security Onion Solutions LLC and/or licensed to Security Onion Solutions LLC under one
-# or more contributor license agreements. Licensed under the Elastic License 2.0 as shown at 
-# https://securityonion.net/license; you may not use this file except in compliance with the
-# Elastic License 2.0.
-
-
-
-. /usr/sbin/so-common
-
-echo "TheHive and its components are no longer part of Security Onion"
\ No newline at end of file
diff --git a/salt/common/tools/sbin/so-thehive-user-add b/salt/common/tools/sbin/so-thehive-user-add
deleted file mode 100755
index fe8193bf7..000000000
--- a/salt/common/tools/sbin/so-thehive-user-add
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/bash
-#
-# Copyright Security Onion Solutions LLC and/or licensed to Security Onion Solutions LLC under one
-# or more contributor license agreements. Licensed under the Elastic License 2.0 as shown at 
-# https://securityonion.net/license; you may not use this file except in compliance with the
-# Elastic License 2.0.
-
-
-
-. /usr/sbin/so-common
-
-echo "TheHive and its components are no longer part of Security Onion"
\ No newline at end of file
diff --git a/salt/common/tools/sbin/so-thehive-user-enable b/salt/common/tools/sbin/so-thehive-user-enable
deleted file mode 100755
index fe8193bf7..000000000
--- a/salt/common/tools/sbin/so-thehive-user-enable
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/bash
-#
-# Copyright Security Onion Solutions LLC and/or licensed to Security Onion Solutions LLC under one
-# or more contributor license agreements. Licensed under the Elastic License 2.0 as shown at 
-# https://securityonion.net/license; you may not use this file except in compliance with the
-# Elastic License 2.0.
-
-
-
-. /usr/sbin/so-common
-
-echo "TheHive and its components are no longer part of Security Onion"
\ No newline at end of file
diff --git a/salt/common/tools/sbin/so-thehive-user-update b/salt/common/tools/sbin/so-thehive-user-update
deleted file mode 100755
index fe8193bf7..000000000
--- a/salt/common/tools/sbin/so-thehive-user-update
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/bash
-#
-# Copyright Security Onion Solutions LLC and/or licensed to Security Onion Solutions LLC under one
-# or more contributor license agreements. Licensed under the Elastic License 2.0 as shown at 
-# https://securityonion.net/license; you may not use this file except in compliance with the
-# Elastic License 2.0.
-
-
-
-. /usr/sbin/so-common
-
-echo "TheHive and its components are no longer part of Security Onion"
\ No newline at end of file
diff --git a/salt/elastic-fleet/init.sls b/salt/elastic-fleet/init.sls
index 9ba74d095..4b985c23f 100644
--- a/salt/elastic-fleet/init.sls
+++ b/salt/elastic-fleet/init.sls
@@ -66,6 +66,11 @@ so-elastic-fleet:
       - FLEET_CA=/etc/pki/intca.crt
   {% endif %}
 
+append_so-elastic-fleet_so-status.conf:
+  file.append:
+    - name: /opt/so/conf/so-status/so-status.conf
+    - text: so-elastic-fleet
+
 {% else %}
 
 {{sls}}_state_not_allowed: