diff --git a/salt/allowed_states.map.jinja b/salt/allowed_states.map.jinja
index 9f652e389..a5559dfa8 100644
--- a/salt/allowed_states.map.jinja
+++ b/salt/allowed_states.map.jinja
@@ -119,6 +119,7 @@
           'soc',
           'kratos',
           'elasticfleet',
+          'elastic-fleet-package-registry',
           'firewall',
           'idstools',
           'suricata.manager',
@@ -137,6 +138,7 @@
           'influxdb',
           'soc',
           'kratos',
+          'elastic-fleet-package-registry',
           'elasticfleet',
           'firewall',
           'manager',
@@ -166,6 +168,7 @@
           'influxdb',
           'soc',
           'kratos',
+          'elastic-fleet-package-registry',
           'elasticfleet',
           'firewall',
           'idstools',
diff --git a/salt/common/tools/sbin/so-image-common b/salt/common/tools/sbin/so-image-common
index d18a8a71f..11d2d6366 100755
--- a/salt/common/tools/sbin/so-image-common
+++ b/salt/common/tools/sbin/so-image-common
@@ -38,6 +38,7 @@ container_list() {
       "so-zeek"
       "so-elastic-agent"
       "so-elastic-agent-builder"
+      "so-elastic-fleet-package-registry"
     )
   elif [ $MANAGERCHECK != 'so-helix' ]; then
     TRUSTED_CONTAINERS=(
@@ -45,6 +46,7 @@ container_list() {
       "so-elastalert"
       "so-elastic-agent"
       "so-elastic-agent-builder"
+      "so-elastic-fleet-package-registry"
       "so-elasticsearch"
       "so-idh"
       "so-idstools"
diff --git a/salt/kibana/config.map.jinja b/salt/kibana/config.map.jinja
index 9b460e86f..9ad1012f7 100644
--- a/salt/kibana/config.map.jinja
+++ b/salt/kibana/config.map.jinja
@@ -7,6 +7,7 @@
 
 {% do KIBANACONFIG.kibana.config.elasticsearch.update({'username': salt['pillar.get']('elasticsearch:auth:users:so_kibana_user:user'), 'password': salt['pillar.get']('elasticsearch:auth:users:so_kibana_user:pass')}) %}
 
+{% do KIBANACONFIG.kibana.config.xpack.fleet.update({'registryUrl': 'http://' ~ GLOBALS.manager_ip ~ ':8080'}) %}
 
 {% if salt['pillar.get']('kibana:secrets') %}
   {% do KIBANACONFIG.kibana.config.xpack.update({'encryptedSavedObjects': {'encryptionKey': pillar['kibana']['secrets']['encryptedSavedObjects']['encryptionKey']}}) %}
diff --git a/salt/kibana/defaults.yaml b/salt/kibana/defaults.yaml
index 45dacd1da..c0e279ca9 100644
--- a/salt/kibana/defaults.yaml
+++ b/salt/kibana/defaults.yaml
@@ -30,4 +30,6 @@ kibana:
         secureCookies: true
       reporting:
         kibanaServer:
-          hostname: localhost
\ No newline at end of file
+          hostname: localhost
+      fleet:
+        registryUrl: ""
\ No newline at end of file
diff --git a/salt/top.sls b/salt/top.sls
index 0459a6da4..bfe3f55ee 100644
--- a/salt/top.sls
+++ b/salt/top.sls
@@ -176,6 +176,7 @@ base:
     - redis
     {%- endif %}
     {%- if KIBANA %}
+    - elastic-fleet-package-registry
     - kibana.so_savedobjects_defaults
     {%- endif %}
     - pcap