diff --git a/salt/elastic-fleet-package-registry/defaults.yaml b/salt/elastic-fleet-package-registry/defaults.yaml
index 947ef103c..4f14e168b 100644
--- a/salt/elastic-fleet-package-registry/defaults.yaml
+++ b/salt/elastic-fleet-package-registry/defaults.yaml
@@ -1,2 +1,2 @@
-elastic-fleet-package-registry:
+elastic_fleet_package_registry:
   enabled: False
diff --git a/salt/elastic-fleet-package-registry/map.jinja b/salt/elastic-fleet-package-registry/map.jinja
index 00b421490..54cdedd75 100644
--- a/salt/elastic-fleet-package-registry/map.jinja
+++ b/salt/elastic-fleet-package-registry/map.jinja
@@ -3,5 +3,5 @@
    https://securityonion.net/license; you may not use this file except in compliance with the
    Elastic License 2.0. #}
 
-{% import_yaml 'elastic-fleet-package-registry/defaults.yaml' as ELASTICFLEETPACKAGEREGISTRYDEFAULTS with context %}
-{% set ELASTICFLEETPACKAGEREGISTRYMERGED = salt['pillar.get']('elastic-fleet-package-registry', ELASTICFLEETPACKAGEREGISTRYDEFAULTS.elastic-fleet-package-registry, merge=True) %}
+{% import_yaml 'elastic-fleet-package-registry/defaults.yaml' as ELASTICFLEETPACKAGEREGISTRYDEFAULTS %}
+{% set ELASTICFLEETPACKAGEREGISTRYMERGED = salt['pillar.get']('elastic_fleet_package_registry', ELASTICFLEETPACKAGEREGISTRYDEFAULTS.elastic_fleet_package_registry, merge=True) %}
diff --git a/salt/elastic-fleet-package-registry/soc_elastic-fleet-package-registry.yaml b/salt/elastic-fleet-package-registry/soc_elastic-fleet-package-registry.yaml
index 531789571..70886c447 100644
--- a/salt/elastic-fleet-package-registry/soc_elastic-fleet-package-registry.yaml
+++ b/salt/elastic-fleet-package-registry/soc_elastic-fleet-package-registry.yaml
@@ -1,4 +1,4 @@
-elastic-fleet-package-registry:
+elastic_fleet_package_registry:
   enabled:
     description: You can enable or disable Elastic Fleet Package Registry.
     advanced: True
diff --git a/salt/manager/tools/sbin/so-minion b/salt/manager/tools/sbin/so-minion
index d2dae2d74..69d77a9cf 100755
--- a/salt/manager/tools/sbin/so-minion
+++ b/salt/manager/tools/sbin/so-minion
@@ -353,9 +353,9 @@ function add_idstools_to_minion() {
 	"  " >> $PILLARFILE
 }
 
-function add_elastic-fleet-package-registry_to_minion() {
+function add_elastic_fleet_package_registry_to_minion() {
     printf '%s\n'\
-    "elastic-fleet-package-registry:"\
+    "elastic_fleet_package_registry:"\
     "  enabled: True"\
 	"  " >> $PILLARFILE
 }
@@ -419,7 +419,7 @@ function createEVAL() {
 	add_mysql_to_minion
 	add_kratos_to_minion
 	add_idstools_to_minion
-	add_elastic-fleet-package-registry_to_minion
+	add_elastic_fleet_package_registry_to_minion
 }
 
 function createSTANDALONE() {
@@ -441,7 +441,7 @@ function createSTANDALONE() {
 	add_mysql_to_minion
 	add_kratos_to_minion
 	add_idstools_to_minion
-	add_elastic-fleet-package-registry_to_minion
+	add_elastic_fleet_package_registry_to_minion
 }
 
 function createMANAGER() {
@@ -461,7 +461,7 @@ function createMANAGER() {
 	add_mysql_to_minion
 	add_kratos_to_minion
 	add_idstools_to_minion
-	add_elastic-fleet-package-registry_to_minion
+	add_elastic_fleet_package_registry_to_minion
 }
 
 function createMANAGERSEARCH() {
@@ -481,7 +481,7 @@ function createMANAGERSEARCH() {
 	add_mysql_to_minion
 	add_kratos_to_minion
 	add_idstools_to_minion
-	add_elastic-fleet-package-registry_to_minion
+	add_elastic_fleet_package_registry_to_minion
 }
 
 function createIMPORT() {
@@ -495,7 +495,7 @@ function createIMPORT() {
 	add_registry_to_minion
 	add_kratos_to_minion
 	add_idstools_to_minion
-	add_elastic-fleet-package-registry_to_minion
+	add_elastic_fleet_package_registry_to_minion
 }
 
 function createFLEET() {