diff --git a/salt/common/tools/sbin/so-image-common b/salt/common/tools/sbin/so-image-common
index a7fc19801..cfc4ff4ab 100755
--- a/salt/common/tools/sbin/so-image-common
+++ b/salt/common/tools/sbin/so-image-common
@@ -42,6 +42,7 @@ container_list() {
       "so-elastalert"
       "so-elastic-agent"
       "so-elastic-agent-builder"
+      "so-elastic-fleet-package-registry"
       "so-elasticsearch"
       "so-filebeat"
       "so-grafana"
diff --git a/salt/elastic-fleet-package-registry/init.sls b/salt/elastic-fleet-package-registry/init.sls
index fd29c84b0..f14ad47c7 100644
--- a/salt/elastic-fleet-package-registry/init.sls
+++ b/salt/elastic-fleet-package-registry/init.sls
@@ -22,8 +22,7 @@ elastic-agent-pr:
 
 so-elastic-fleet-package-registry:
   docker_container.running:
-    #- image: {{ GLOBALS.registry_host }}:5000/{{ GLOBALS.image_repo }}/so-elastic-agent:{{ GLOBALS.so_version }}
-    - image: docker.elastic.co/package-registry/distribution:8.4.1
+    - image: {{ GLOBALS.registry_host }}:5000/{{ GLOBALS.image_repo }}/so-elastic-fleet-package-registry:{{ GLOBALS.so_version }}
     - name: so-elastic-fleet-package-registry
     - hostname: Fleet-package-reg-{{ GLOBALS.hostname }}
     - detach: True
diff --git a/salt/top.sls b/salt/top.sls
index 973978537..d9653fca1 100644
--- a/salt/top.sls
+++ b/salt/top.sls
@@ -191,6 +191,7 @@ base:
     {%- if REDIS %}
     - redis
     {%- endif %}
+    - elastic-fleet-package-registry
     {%- if KIBANA %}
     - kibana.so_savedobjects_defaults
     {%- endif %}