diff --git a/salt/allowed_states.map.jinja b/salt/allowed_states.map.jinja
index 192a52dd3..2f6cc60a0 100644
--- a/salt/allowed_states.map.jinja
+++ b/salt/allowed_states.map.jinja
@@ -37,7 +37,6 @@
           'soc',
           'kratos',
           'elastic-fleet',
-          'elastic-fleet-package-registry',
           'firewall',
           'idstools',
           'suricata.manager',
@@ -123,7 +122,6 @@
           'soc',
           'kratos',
           'elastic-fleet',
-          'elastic-fleet-package-registry',
           'firewall',
           'idstools',
           'suricata.manager',
@@ -144,7 +142,6 @@
           'soc',
           'kratos',
           'elastic-fleet',
-          'elastic-fleet-package-registry',
           'firewall',
           'manager',
           'idstools',
@@ -175,7 +172,6 @@
           'soc',
           'kratos',
           'elastic-fleet',
-          'elastic-fleet-package-registry',
           'firewall',
           'idstools',
           'suricata.manager',
diff --git a/salt/common/tools/sbin/so-image-common b/salt/common/tools/sbin/so-image-common
index 9ba66ced8..3851d8b4a 100755
--- a/salt/common/tools/sbin/so-image-common
+++ b/salt/common/tools/sbin/so-image-common
@@ -44,7 +44,6 @@ 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/elasticsearch/defaults.yaml b/salt/elasticsearch/defaults.yaml
index ff96d139b..f883503a0 100644
--- a/salt/elasticsearch/defaults.yaml
+++ b/salt/elasticsearch/defaults.yaml
@@ -57,6 +57,67 @@ elasticsearch:
         elasticsearch:
           deprecation: ERROR
   index_settings:
+    so-logs:
+      index_sorting: False
+      index_template:
+        index_patterns:
+          - "logs-*"
+        data_stream:
+          hidden: false
+          allow_custom_routing: false
+        template:
+          settings:
+            index:
+              number_of_replicas: 0
+              lifecycle:
+                name: logs
+              codec: best_compression
+              routing:
+                allocation:
+                  include:
+                    _tier_preferences: data_hot
+              query:
+                default_field:
+                - message
+          mappings:
+            dynamic_templates:
+            - match_ip:
+                match: ip
+                match_mapping_type: string
+                mapping:
+          allow_custom_routing: false
+        template:
+          settings:
+            index:
+              number_of_replicas: 0
+              lifecycle:
+                name: logs
+              codec: best_compression
+              routing:
+                allocation:
+                  include:
+                    _tier_preferences: data_hot
+              query:
+                default_field:
+                - message
+          mappings:
+            dynamic_templates:
+            - match_ip:
+                match: ip
+                match_mapping_type: string
+                mapping:
+                  type: ip
+            - match_message:
+                match: message
+                match_mapping_type: string
+                mapping:
+                  type: match_only_text
+            - strings_as_keyword:
+                match_mapping_type: string
+                mapping:
+                  ignore_above: 1024
+                  type: keyword
+        priority: 125
     so-logs-elastic_agent.apm_server:
       index_sorting: False
       index_template:
diff --git a/salt/kibana/defaults.yaml b/salt/kibana/defaults.yaml
index d854b3e17..159465508 100644
--- a/salt/kibana/defaults.yaml
+++ b/salt/kibana/defaults.yaml
@@ -33,7 +33,6 @@ kibana:
         kibanaServer:
           hostname: localhost
       fleet:
-        registryUrl: ""
         packages:
          - name: fleet_server
            version: latest
diff --git a/salt/top.sls b/salt/top.sls
index ada947ec8..e29d3b081 100644
--- a/salt/top.sls
+++ b/salt/top.sls
@@ -191,7 +191,6 @@ base:
     {%- if REDIS %}
     - redis
     {%- endif %}
-    - elastic-fleet-package-registry
     {%- if KIBANA %}
     - kibana.so_savedobjects_defaults
     {%- endif %}