diff --git a/x-pack/plugins/fleet/server/constants/fleet_es_assets.ts b/x-pack/plugins/fleet/server/constants/fleet_es_assets.ts
index 859a25a0ec7c7..56aaf450d46e9 100644
--- a/x-pack/plugins/fleet/server/constants/fleet_es_assets.ts
+++ b/x-pack/plugins/fleet/server/constants/fleet_es_assets.ts
@@ -8,9 +8,8 @@
 import { getESAssetMetadata } from '../services/epm/elasticsearch/meta';
 
 const meta = getESAssetMetadata();
-export const MAPPINGS_TEMPLATE_SUFFIX = '@mappings';
 
-export const SETTINGS_TEMPLATE_SUFFIX = '@settings';
+export const PACKAGE_TEMPLATE_SUFFIX = '@package';
 
 export const USER_SETTINGS_TEMPLATE_SUFFIX = '@custom';
 
diff --git a/x-pack/plugins/fleet/server/constants/index.ts b/x-pack/plugins/fleet/server/constants/index.ts
index ec7a4a2664882..813f381ecc4fc 100644
--- a/x-pack/plugins/fleet/server/constants/index.ts
+++ b/x-pack/plugins/fleet/server/constants/index.ts
@@ -66,7 +66,6 @@ export {
   FLEET_FINAL_PIPELINE_ID,
   FLEET_FINAL_PIPELINE_CONTENT,
   FLEET_FINAL_PIPELINE_VERSION,
-  MAPPINGS_TEMPLATE_SUFFIX,
-  SETTINGS_TEMPLATE_SUFFIX,
   USER_SETTINGS_TEMPLATE_SUFFIX,
+  PACKAGE_TEMPLATE_SUFFIX,
 } from './fleet_es_assets';
diff --git a/x-pack/plugins/fleet/server/services/epm/elasticsearch/template/install.ts b/x-pack/plugins/fleet/server/services/epm/elasticsearch/template/install.ts
index f30971c0e7d5e..a77f843aef2d3 100644
--- a/x-pack/plugins/fleet/server/services/epm/elasticsearch/template/install.ts
+++ b/x-pack/plugins/fleet/server/services/epm/elasticsearch/template/install.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { merge, cloneDeep } from 'lodash';
+import { merge } from 'lodash';
 import Boom from '@hapi/boom';
 import type { ElasticsearchClient, Logger, SavedObjectsClientContract } from 'src/core/server';
 
@@ -29,8 +29,7 @@ import { getAsset, getPathParts } from '../../archive';
 import { removeAssetTypesFromInstalledEs, saveInstalledEsRefs } from '../../packages/install';
 import {
   FLEET_COMPONENT_TEMPLATES,
-  MAPPINGS_TEMPLATE_SUFFIX,
-  SETTINGS_TEMPLATE_SUFFIX,
+  PACKAGE_TEMPLATE_SUFFIX,
   USER_SETTINGS_TEMPLATE_SUFFIX,
 } from '../../../../constants';
 
@@ -245,34 +244,28 @@ function buildComponentTemplates(params: {
   defaultSettings: IndexTemplate['template']['settings'];
 }) {
   const { templateName, registryElasticsearch, packageName, defaultSettings, mappings } = params;
-  const mappingsTemplateName = `${templateName}${MAPPINGS_TEMPLATE_SUFFIX}`;
-  const settingsTemplateName = `${templateName}${SETTINGS_TEMPLATE_SUFFIX}`;
+  const packageTemplateName = `${templateName}${PACKAGE_TEMPLATE_SUFFIX}`;
   const userSettingsTemplateName = `${templateName}${USER_SETTINGS_TEMPLATE_SUFFIX}`;
 
   const templatesMap: TemplateMap = {};
   const _meta = getESAssetMetadata({ packageName });
 
   const indexTemplateSettings = registryElasticsearch?.['index_template.settings'] ?? {};
-  // @ts-expect-error no property .mapping (yes there is)
-  const indexTemplateMappingSettings = indexTemplateSettings?.index?.mapping;
-  const indexTemplateSettingsForTemplate = cloneDeep(indexTemplateSettings);
-
-  // index.mapping settings must go on the mapping component template otherwise
-  // the template may be rejected e.g if nested_fields.limit has been increased
-  if (indexTemplateMappingSettings) {
-    // @ts-expect-error no property .mapping
-    delete indexTemplateSettingsForTemplate.index.mapping;
-  }
 
-  templatesMap[mappingsTemplateName] = {
+  const templateSettings = merge(defaultSettings, indexTemplateSettings);
+
+  templatesMap[packageTemplateName] = {
     template: {
       settings: {
+        ...templateSettings,
         index: {
+          ...templateSettings.index,
           mapping: {
+            ...templateSettings?.mapping,
             total_fields: {
+              ...templateSettings?.mapping?.total_fields,
               limit: '10000',
             },
-            ...indexTemplateMappingSettings,
           },
         },
       },
@@ -281,13 +274,6 @@ function buildComponentTemplates(params: {
     _meta,
   };
 
-  templatesMap[settingsTemplateName] = {
-    template: {
-      settings: merge(defaultSettings, indexTemplateSettingsForTemplate),
-    },
-    _meta,
-  };
-
   // return empty/stub template
   templatesMap[userSettingsTemplateName] = {
     template: {
diff --git a/x-pack/test/fleet_api_integration/apis/epm/__snapshots__/install_by_upload.snap b/x-pack/test/fleet_api_integration/apis/epm/__snapshots__/install_by_upload.snap
deleted file mode 100644
index 421a5fbdf1744..0000000000000
--- a/x-pack/test/fleet_api_integration/apis/epm/__snapshots__/install_by_upload.snap
+++ /dev/null
@@ -1,735 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`Fleet Endpoints EPM Endpoints installs packages from direct upload should install a zip archive correctly and package info should return correctly after validation 1`] = `
-Object {
-  "assets": Object {
-    "elasticsearch": Object {
-      "ingest_pipeline": Array [
-        Object {
-          "dataset": "access",
-          "file": "default.yml",
-          "path": "apache-0.1.4/data_stream/access/elasticsearch/ingest_pipeline/default.yml",
-          "pkgkey": "apache-0.1.4",
-          "service": "elasticsearch",
-          "type": "ingest_pipeline",
-        },
-        Object {
-          "dataset": "error",
-          "file": "default.yml",
-          "path": "apache-0.1.4/data_stream/error/elasticsearch/ingest_pipeline/default.yml",
-          "pkgkey": "apache-0.1.4",
-          "service": "elasticsearch",
-          "type": "ingest_pipeline",
-        },
-      ],
-    },
-    "kibana": Object {
-      "dashboard": Array [
-        Object {
-          "file": "apache-Logs-Apache-Dashboard-ecs.json",
-          "path": "apache-0.1.4/kibana/dashboard/apache-Logs-Apache-Dashboard-ecs.json",
-          "pkgkey": "apache-0.1.4",
-          "service": "kibana",
-          "type": "dashboard",
-        },
-        Object {
-          "file": "apache-Metrics-Apache-HTTPD-server-status-ecs.json",
-          "path": "apache-0.1.4/kibana/dashboard/apache-Metrics-Apache-HTTPD-server-status-ecs.json",
-          "pkgkey": "apache-0.1.4",
-          "service": "kibana",
-          "type": "dashboard",
-        },
-      ],
-      "search": Array [
-        Object {
-          "file": "Apache-HTTPD-ecs.json",
-          "path": "apache-0.1.4/kibana/search/Apache-HTTPD-ecs.json",
-          "pkgkey": "apache-0.1.4",
-          "service": "kibana",
-          "type": "search",
-        },
-        Object {
-          "file": "Apache-access-logs-ecs.json",
-          "path": "apache-0.1.4/kibana/search/Apache-access-logs-ecs.json",
-          "pkgkey": "apache-0.1.4",
-          "service": "kibana",
-          "type": "search",
-        },
-        Object {
-          "file": "Apache-errors-log-ecs.json",
-          "path": "apache-0.1.4/kibana/search/Apache-errors-log-ecs.json",
-          "pkgkey": "apache-0.1.4",
-          "service": "kibana",
-          "type": "search",
-        },
-      ],
-      "visualization": Array [
-        Object {
-          "file": "Apache-HTTPD-CPU-ecs.json",
-          "path": "apache-0.1.4/kibana/visualization/Apache-HTTPD-CPU-ecs.json",
-          "pkgkey": "apache-0.1.4",
-          "service": "kibana",
-          "type": "visualization",
-        },
-        Object {
-          "file": "Apache-HTTPD-Hostname-list-ecs.json",
-          "path": "apache-0.1.4/kibana/visualization/Apache-HTTPD-Hostname-list-ecs.json",
-          "pkgkey": "apache-0.1.4",
-          "service": "kibana",
-          "type": "visualization",
-        },
-        Object {
-          "file": "Apache-HTTPD-Load1-slash-5-slash-15-ecs.json",
-          "path": "apache-0.1.4/kibana/visualization/Apache-HTTPD-Load1-slash-5-slash-15-ecs.json",
-          "pkgkey": "apache-0.1.4",
-          "service": "kibana",
-          "type": "visualization",
-        },
-        Object {
-          "file": "Apache-HTTPD-Scoreboard-ecs.json",
-          "path": "apache-0.1.4/kibana/visualization/Apache-HTTPD-Scoreboard-ecs.json",
-          "pkgkey": "apache-0.1.4",
-          "service": "kibana",
-          "type": "visualization",
-        },
-        Object {
-          "file": "Apache-HTTPD-Total-accesses-and-kbytes-ecs.json",
-          "path": "apache-0.1.4/kibana/visualization/Apache-HTTPD-Total-accesses-and-kbytes-ecs.json",
-          "pkgkey": "apache-0.1.4",
-          "service": "kibana",
-          "type": "visualization",
-        },
-        Object {
-          "file": "Apache-HTTPD-Uptime-ecs.json",
-          "path": "apache-0.1.4/kibana/visualization/Apache-HTTPD-Uptime-ecs.json",
-          "pkgkey": "apache-0.1.4",
-          "service": "kibana",
-          "type": "visualization",
-        },
-        Object {
-          "file": "Apache-HTTPD-Workers-ecs.json",
-          "path": "apache-0.1.4/kibana/visualization/Apache-HTTPD-Workers-ecs.json",
-          "pkgkey": "apache-0.1.4",
-          "service": "kibana",
-          "type": "visualization",
-        },
-        Object {
-          "file": "Apache-access-unique-IPs-map-ecs.json",
-          "path": "apache-0.1.4/kibana/visualization/Apache-access-unique-IPs-map-ecs.json",
-          "pkgkey": "apache-0.1.4",
-          "service": "kibana",
-          "type": "visualization",
-        },
-        Object {
-          "file": "Apache-browsers-ecs.json",
-          "path": "apache-0.1.4/kibana/visualization/Apache-browsers-ecs.json",
-          "pkgkey": "apache-0.1.4",
-          "service": "kibana",
-          "type": "visualization",
-        },
-        Object {
-          "file": "Apache-error-logs-over-time-ecs.json",
-          "path": "apache-0.1.4/kibana/visualization/Apache-error-logs-over-time-ecs.json",
-          "pkgkey": "apache-0.1.4",
-          "service": "kibana",
-          "type": "visualization",
-        },
-        Object {
-          "file": "Apache-operating-systems-ecs.json",
-          "path": "apache-0.1.4/kibana/visualization/Apache-operating-systems-ecs.json",
-          "pkgkey": "apache-0.1.4",
-          "service": "kibana",
-          "type": "visualization",
-        },
-        Object {
-          "file": "Apache-response-codes-of-top-URLs-ecs.json",
-          "path": "apache-0.1.4/kibana/visualization/Apache-response-codes-of-top-URLs-ecs.json",
-          "pkgkey": "apache-0.1.4",
-          "service": "kibana",
-          "type": "visualization",
-        },
-        Object {
-          "file": "Apache-response-codes-over-time-ecs.json",
-          "path": "apache-0.1.4/kibana/visualization/Apache-response-codes-over-time-ecs.json",
-          "pkgkey": "apache-0.1.4",
-          "service": "kibana",
-          "type": "visualization",
-        },
-      ],
-    },
-  },
-  "categories": Array [
-    "web",
-  ],
-  "conditions": Object {
-    "kibana": Object {
-      "version": "^7.9.0",
-    },
-  },
-  "data_streams": Array [
-    Object {
-      "dataset": "apache.access",
-      "ingest_pipeline": "default",
-      "package": "apache",
-      "path": "access",
-      "release": "experimental",
-      "streams": Array [
-        Object {
-          "description": "Collect Apache access logs",
-          "enabled": true,
-          "input": "logfile",
-          "template_path": "log.yml.hbs",
-          "title": "Apache access logs",
-          "vars": Array [
-            Object {
-              "default": Array [
-                "/var/log/apache2/access.log*",
-                "/var/log/apache2/other_vhosts_access.log*",
-                "/var/log/httpd/access_log*",
-              ],
-              "multi": true,
-              "name": "paths",
-              "required": true,
-              "show_user": true,
-              "title": "Paths",
-              "type": "text",
-            },
-          ],
-        },
-      ],
-      "title": "Apache access logs",
-      "type": "logs",
-    },
-    Object {
-      "dataset": "apache.error",
-      "ingest_pipeline": "default",
-      "package": "apache",
-      "path": "error",
-      "release": "experimental",
-      "streams": Array [
-        Object {
-          "description": "Collect Apache error logs",
-          "enabled": true,
-          "input": "logfile",
-          "template_path": "log.yml.hbs",
-          "title": "Apache error logs",
-          "vars": Array [
-            Object {
-              "default": Array [
-                "/var/log/apache2/error.log*",
-                "/var/log/httpd/error_log*",
-              ],
-              "multi": true,
-              "name": "paths",
-              "required": true,
-              "show_user": true,
-              "title": "Paths",
-              "type": "text",
-            },
-          ],
-        },
-      ],
-      "title": "Apache error logs",
-      "type": "logs",
-    },
-    Object {
-      "dataset": "apache.status",
-      "package": "apache",
-      "path": "status",
-      "release": "experimental",
-      "streams": Array [
-        Object {
-          "description": "Collect Apache status metrics",
-          "enabled": true,
-          "input": "apache/metrics",
-          "template_path": "stream.yml.hbs",
-          "title": "Apache status metrics",
-          "vars": Array [
-            Object {
-              "default": "10s",
-              "multi": false,
-              "name": "period",
-              "required": true,
-              "show_user": true,
-              "title": "Period",
-              "type": "text",
-            },
-            Object {
-              "default": "/server-status",
-              "multi": false,
-              "name": "server_status_path",
-              "required": true,
-              "show_user": false,
-              "title": "Server Status Path",
-              "type": "text",
-            },
-          ],
-        },
-      ],
-      "title": "Apache status metrics",
-      "type": "metrics",
-    },
-  ],
-  "description": "Apache Integration",
-  "download": "/epr/apache/apache-0.1.4.zip",
-  "format_version": "1.0.0",
-  "icons": Array [
-    Object {
-      "path": "/package/apache/0.1.4/img/logo_apache.svg",
-      "size": "32x32",
-      "src": "/img/logo_apache.svg",
-      "title": "Apache Logo",
-      "type": "image/svg+xml",
-    },
-  ],
-  "keepPoliciesUpToDate": false,
-  "license": "basic",
-  "name": "apache",
-  "owner": Object {
-    "github": "elastic/integrations-services",
-  },
-  "path": "/package/apache/0.1.4",
-  "policy_templates": Array [
-    Object {
-      "description": "Collect logs and metrics from Apache instances",
-      "inputs": Array [
-        Object {
-          "description": "Collecting Apache access and error logs",
-          "title": "Collect logs from Apache instances",
-          "type": "logfile",
-        },
-        Object {
-          "description": "Collecting Apache status metrics",
-          "title": "Collect metrics from Apache instances",
-          "type": "apache/metrics",
-          "vars": Array [
-            Object {
-              "default": Array [
-                "http://127.0.0.1",
-              ],
-              "multi": true,
-              "name": "hosts",
-              "required": true,
-              "show_user": true,
-              "title": "Hosts",
-              "type": "text",
-            },
-          ],
-        },
-      ],
-      "multiple": true,
-      "name": "apache",
-      "title": "Apache logs and metrics",
-    },
-  ],
-  "readme": "/package/apache/0.1.4/docs/README.md",
-  "release": "experimental",
-  "removable": true,
-  "savedObject": Object {
-    "attributes": Object {
-      "es_index_patterns": Object {
-        "access": "logs-apache.access-*",
-        "error": "logs-apache.error-*",
-        "status": "metrics-apache.status-*",
-      },
-      "install_source": "upload",
-      "install_status": "installed",
-      "install_version": "0.1.4",
-      "installed_es": Array [
-        Object {
-          "id": "logs-apache.access-0.1.4-default",
-          "type": "ingest_pipeline",
-        },
-        Object {
-          "id": "logs-apache.error-0.1.4-default",
-          "type": "ingest_pipeline",
-        },
-        Object {
-          "id": "logs-apache.access",
-          "type": "index_template",
-        },
-        Object {
-          "id": "logs-apache.access@mappings",
-          "type": "component_template",
-        },
-        Object {
-          "id": "logs-apache.access@settings",
-          "type": "component_template",
-        },
-        Object {
-          "id": "logs-apache.access@custom",
-          "type": "component_template",
-        },
-        Object {
-          "id": "metrics-apache.status",
-          "type": "index_template",
-        },
-        Object {
-          "id": "metrics-apache.status@mappings",
-          "type": "component_template",
-        },
-        Object {
-          "id": "metrics-apache.status@settings",
-          "type": "component_template",
-        },
-        Object {
-          "id": "metrics-apache.status@custom",
-          "type": "component_template",
-        },
-        Object {
-          "id": "logs-apache.error",
-          "type": "index_template",
-        },
-        Object {
-          "id": "logs-apache.error@mappings",
-          "type": "component_template",
-        },
-        Object {
-          "id": "logs-apache.error@settings",
-          "type": "component_template",
-        },
-        Object {
-          "id": "logs-apache.error@custom",
-          "type": "component_template",
-        },
-      ],
-      "installed_kibana": Array [
-        Object {
-          "id": "apache-Logs-Apache-Dashboard-ecs",
-          "type": "dashboard",
-        },
-        Object {
-          "id": "apache-Metrics-Apache-HTTPD-server-status-ecs",
-          "type": "dashboard",
-        },
-        Object {
-          "id": "Apache-access-unique-IPs-map-ecs",
-          "type": "visualization",
-        },
-        Object {
-          "id": "Apache-HTTPD-CPU-ecs",
-          "type": "visualization",
-        },
-        Object {
-          "id": "Apache-HTTPD-Load1-slash-5-slash-15-ecs",
-          "type": "visualization",
-        },
-        Object {
-          "id": "Apache-response-codes-over-time-ecs",
-          "type": "visualization",
-        },
-        Object {
-          "id": "Apache-HTTPD-Workers-ecs",
-          "type": "visualization",
-        },
-        Object {
-          "id": "Apache-HTTPD-Hostname-list-ecs",
-          "type": "visualization",
-        },
-        Object {
-          "id": "Apache-error-logs-over-time-ecs",
-          "type": "visualization",
-        },
-        Object {
-          "id": "Apache-HTTPD-Scoreboard-ecs",
-          "type": "visualization",
-        },
-        Object {
-          "id": "Apache-HTTPD-Uptime-ecs",
-          "type": "visualization",
-        },
-        Object {
-          "id": "Apache-operating-systems-ecs",
-          "type": "visualization",
-        },
-        Object {
-          "id": "Apache-HTTPD-Total-accesses-and-kbytes-ecs",
-          "type": "visualization",
-        },
-        Object {
-          "id": "Apache-browsers-ecs",
-          "type": "visualization",
-        },
-        Object {
-          "id": "Apache-response-codes-of-top-URLs-ecs",
-          "type": "visualization",
-        },
-        Object {
-          "id": "Apache-access-logs-ecs",
-          "type": "search",
-        },
-        Object {
-          "id": "Apache-errors-log-ecs",
-          "type": "search",
-        },
-        Object {
-          "id": "Apache-HTTPD-ecs",
-          "type": "search",
-        },
-      ],
-      "installed_kibana_space_id": "default",
-      "name": "apache",
-      "package_assets": Array [
-        Object {
-          "id": "2f1ab9c0-8cf6-5e83-afcd-0d12851c8108",
-          "type": "epm-packages-assets",
-        },
-        Object {
-          "id": "841166f1-6db0-5f7a-a8d9-768e88ddf984",
-          "type": "epm-packages-assets",
-        },
-        Object {
-          "id": "b12ae5e1-daf2-51a7-99d8-0888d1f13b5b",
-          "type": "epm-packages-assets",
-        },
-        Object {
-          "id": "2f263b24-c36a-5ea8-a707-76d1f274c888",
-          "type": "epm-packages-assets",
-        },
-        Object {
-          "id": "bd5ff9ad-ba4a-5215-b5af-cef58a3aa886",
-          "type": "epm-packages-assets",
-        },
-        Object {
-          "id": "5fc59aa9-1d7e-50ae-8ce5-b875ab44cfc5",
-          "type": "epm-packages-assets",
-        },
-        Object {
-          "id": "7c850453-346b-5010-a946-28b83fc69e48",
-          "type": "epm-packages-assets",
-        },
-        Object {
-          "id": "f02f8adb-3e0c-5f2f-b4f2-a04dc645b713",
-          "type": "epm-packages-assets",
-        },
-        Object {
-          "id": "889d88db-6214-5836-aeff-1a87f8513b27",
-          "type": "epm-packages-assets",
-        },
-        Object {
-          "id": "06a6b940-a745-563c-abf4-83eb3335926b",
-          "type": "epm-packages-assets",
-        },
-        Object {
-          "id": "e68fd7ac-302e-5b75-bbbb-d69b441c8848",
-          "type": "epm-packages-assets",
-        },
-        Object {
-          "id": "2c57fe0f-3b1a-57da-a63b-28f9b9e82bce",
-          "type": "epm-packages-assets",
-        },
-        Object {
-          "id": "13db43e8-f8f9-57f0-b131-a171c2f2070f",
-          "type": "epm-packages-assets",
-        },
-        Object {
-          "id": "e8750081-1c0b-5c55-bcab-fa6d47f01a85",
-          "type": "epm-packages-assets",
-        },
-        Object {
-          "id": "71af57fe-25c4-5935-9879-ca4a2fba730e",
-          "type": "epm-packages-assets",
-        },
-        Object {
-          "id": "cc287718-9573-5c56-a9ed-6dfef6589506",
-          "type": "epm-packages-assets",
-        },
-        Object {
-          "id": "8badd8ba-289a-5e60-a1c0-f3d39e15cda3",
-          "type": "epm-packages-assets",
-        },
-        Object {
-          "id": "20300efc-10eb-5fac-ba90-f6aa9b467e84",
-          "type": "epm-packages-assets",
-        },
-        Object {
-          "id": "047c89df-33c2-5d74-b0a4-8b441879761c",
-          "type": "epm-packages-assets",
-        },
-        Object {
-          "id": "9838a13f-1b89-5c54-844e-978620d66a1d",
-          "type": "epm-packages-assets",
-        },
-        Object {
-          "id": "e105414b-221d-5433-8b24-452625f59b7c",
-          "type": "epm-packages-assets",
-        },
-        Object {
-          "id": "eb166c25-843b-5271-8d43-6fb005d2df5a",
-          "type": "epm-packages-assets",
-        },
-        Object {
-          "id": "342dbf4d-d88d-53e8-b365-d3639ebbbb14",
-          "type": "epm-packages-assets",
-        },
-        Object {
-          "id": "f98c44a3-eaea-505f-8598-3b7f1097ef59",
-          "type": "epm-packages-assets",
-        },
-        Object {
-          "id": "12da8c6c-d0e3-589c-9244-88d857ea76b6",
-          "type": "epm-packages-assets",
-        },
-        Object {
-          "id": "e2d151ed-709c-542d-b797-cb95f353b9b3",
-          "type": "epm-packages-assets",
-        },
-        Object {
-          "id": "f434cffe-0b00-59de-a17f-c1e71bd4ab0f",
-          "type": "epm-packages-assets",
-        },
-        Object {
-          "id": "5bd0c25f-04a5-5fd0-8298-ba9aa2f6fe5e",
-          "type": "epm-packages-assets",
-        },
-        Object {
-          "id": "279da3a3-8e9b-589b-86e0-bd7364821bab",
-          "type": "epm-packages-assets",
-        },
-        Object {
-          "id": "b8758fcb-08bf-50fa-89bd-24398955298a",
-          "type": "epm-packages-assets",
-        },
-        Object {
-          "id": "96e4eb36-03c3-5856-af44-559fd5133f2b",
-          "type": "epm-packages-assets",
-        },
-        Object {
-          "id": "a59a79c3-66bd-5cfc-91f5-ee84f7227855",
-          "type": "epm-packages-assets",
-        },
-        Object {
-          "id": "395143f9-54bf-5b46-b1be-a7b2a6142ad9",
-          "type": "epm-packages-assets",
-        },
-        Object {
-          "id": "3449b8d2-ffd5-5aec-bb32-4245f2fbcde4",
-          "type": "epm-packages-assets",
-        },
-        Object {
-          "id": "ab44094e-6c9d-50b8-b5c4-2e518d89912e",
-          "type": "epm-packages-assets",
-        },
-        Object {
-          "id": "b093bfc0-6e98-5a1b-a502-e838a36f6568",
-          "type": "epm-packages-assets",
-        },
-        Object {
-          "id": "03d86823-b756-5b91-850d-7ad231d33546",
-          "type": "epm-packages-assets",
-        },
-        Object {
-          "id": "a76af2f0-049b-5be1-8d20-e87c9d1c2709",
-          "type": "epm-packages-assets",
-        },
-        Object {
-          "id": "bc2f0c1e-992e-5407-9435-fedb39ff74ea",
-          "type": "epm-packages-assets",
-        },
-        Object {
-          "id": "84668ac1-d5ef-545b-88f3-1e49f8f1c8ad",
-          "type": "epm-packages-assets",
-        },
-        Object {
-          "id": "69b41271-91a0-5a2e-a62c-60364d5a9c8f",
-          "type": "epm-packages-assets",
-        },
-        Object {
-          "id": "8e4ec555-5fbf-55d3-bea3-3af12c9aca3f",
-          "type": "epm-packages-assets",
-        },
-        Object {
-          "id": "aa18f3f9-f62a-5ab8-9b34-75696efa5c48",
-          "type": "epm-packages-assets",
-        },
-        Object {
-          "id": "71c8c6b1-2116-5817-b65f-7a87ef5ef2b7",
-          "type": "epm-packages-assets",
-        },
-        Object {
-          "id": "8f6d7a1f-1e7f-5a60-8fe7-ce19115ed460",
-          "type": "epm-packages-assets",
-        },
-        Object {
-          "id": "c115dbbf-edad-59f2-b046-c65a0373a81c",
-          "type": "epm-packages-assets",
-        },
-        Object {
-          "id": "b7d696c3-8106-585c-9ecc-94a75cf1e3da",
-          "type": "epm-packages-assets",
-        },
-        Object {
-          "id": "639e6a78-59d8-5ce8-9687-64e8f9af7e71",
-          "type": "epm-packages-assets",
-        },
-        Object {
-          "id": "ae60c853-7a90-58d2-ab6c-04d3be5f1847",
-          "type": "epm-packages-assets",
-        },
-        Object {
-          "id": "0cd33163-2ae4-57eb-96f6-c50af6685cab",
-          "type": "epm-packages-assets",
-        },
-        Object {
-          "id": "39e0f78f-1172-5e61-9446-65ef3c0cb46c",
-          "type": "epm-packages-assets",
-        },
-        Object {
-          "id": "b08f10ee-6afd-5e89-b9b4-569064fbdd9f",
-          "type": "epm-packages-assets",
-        },
-        Object {
-          "id": "efcbe1c6-b2d5-521c-b27a-2146f08a604d",
-          "type": "epm-packages-assets",
-        },
-        Object {
-          "id": "f9422c02-d43f-5ebb-b7c5-9e32f9b77c21",
-          "type": "epm-packages-assets",
-        },
-        Object {
-          "id": "c276e880-3ba8-58e7-a5d5-c07707dba6b7",
-          "type": "epm-packages-assets",
-        },
-        Object {
-          "id": "561a3711-c386-541c-9a77-2d0fa256caf6",
-          "type": "epm-packages-assets",
-        },
-        Object {
-          "id": "1378350d-2e2b-52dd-ab3a-d8b9a09df92f",
-          "type": "epm-packages-assets",
-        },
-        Object {
-          "id": "94e40729-4aea-59c8-86ba-075137c000dc",
-          "type": "epm-packages-assets",
-        },
-      ],
-      "removable": true,
-      "version": "0.1.4",
-    },
-    "id": "apache",
-    "namespaces": Array [],
-    "references": Array [],
-    "type": "epm-packages",
-  },
-  "screenshots": Array [
-    Object {
-      "path": "/package/apache/0.1.4/img/kibana-apache.png",
-      "size": "1215x1199",
-      "src": "/img/kibana-apache.png",
-      "title": "Apache Integration",
-      "type": "image/png",
-    },
-    Object {
-      "path": "/package/apache/0.1.4/img/apache_httpd_server_status.png",
-      "size": "1919x1079",
-      "src": "/img/apache_httpd_server_status.png",
-      "title": "Apache HTTPD Server Status",
-      "type": "image/png",
-    },
-  ],
-  "status": "installed",
-  "title": "Apache",
-  "type": "integration",
-  "version": "0.1.4",
-}
-`;
diff --git a/x-pack/test/fleet_api_integration/apis/epm/install_by_upload.ts b/x-pack/test/fleet_api_integration/apis/epm/install_by_upload.ts
index 68cac70e8fed8..28b68609ce15e 100644
--- a/x-pack/test/fleet_api_integration/apis/epm/install_by_upload.ts
+++ b/x-pack/test/fleet_api_integration/apis/epm/install_by_upload.ts
@@ -75,7 +75,7 @@ export default function (providerContext: FtrProviderContext) {
         .type('application/gzip')
         .send(buf)
         .expect(200);
-      expect(res.body.items.length).to.be(32);
+      expect(res.body.items.length).to.be(29);
     });
 
     it('should install a zip archive correctly and package info should return correctly after validation', async function () {
@@ -86,7 +86,7 @@ export default function (providerContext: FtrProviderContext) {
         .type('application/zip')
         .send(buf)
         .expect(200);
-      expect(res.body.items.length).to.be(32);
+      expect(res.body.items.length).to.be(29);
     });
 
     it('should throw an error if the archive is zip but content type is gzip', async function () {
diff --git a/x-pack/test/fleet_api_integration/apis/epm/install_overrides.ts b/x-pack/test/fleet_api_integration/apis/epm/install_overrides.ts
index eee9525a4f062..834de2432d7c8 100644
--- a/x-pack/test/fleet_api_integration/apis/epm/install_overrides.ts
+++ b/x-pack/test/fleet_api_integration/apis/epm/install_overrides.ts
@@ -52,8 +52,7 @@ export default function (providerContext: FtrProviderContext) {
       // the index template composed_of has the correct component templates in the correct order
       const indexTemplate = indexTemplateResponse.index_templates[0].index_template;
       expect(indexTemplate.composed_of).to.eql([
-        `${templateName}@mappings`,
-        `${templateName}@settings`,
+        `${templateName}@package`,
         `${templateName}@custom`,
         '.fleet_globals-1',
         '.fleet_agent_id_verification-1',
@@ -62,25 +61,17 @@ export default function (providerContext: FtrProviderContext) {
       ({ body } = await es.transport.request(
         {
           method: 'GET',
-          path: `/_component_template/${templateName}@mappings`,
+          path: `/_component_template/${templateName}@package`,
         },
         {
           meta: true,
         }
       ));
 
-      // The mappings override provided in the package is set in the mappings component template
+      // The mappings override provided in the package is set in the package component template
       expect(body.component_templates[0].component_template.template.mappings.dynamic).to.be(false);
 
-      ({ body } = await es.transport.request(
-        {
-          method: 'GET',
-          path: `/_component_template/${templateName}@settings`,
-        },
-        { meta: true }
-      ));
-
-      // The settings override provided in the package is set in the settings component template
+      // The settings override provided in the package is set in the package component template
       expect(
         body.component_templates[0].component_template.template.settings.index.lifecycle.name
       ).to.be('reference');
@@ -122,11 +113,7 @@ export default function (providerContext: FtrProviderContext) {
           // body: indexTemplate, // I *think* this should work, but it doesn't
           body: {
             index_patterns: [`${templateName}-*`],
-            composed_of: [
-              `${templateName}@mappings`,
-              `${templateName}@settings`,
-              `${templateName}@custom`,
-            ],
+            composed_of: [`${templateName}@package`, `${templateName}@custom`],
           },
         },
         { meta: true }
diff --git a/x-pack/test/fleet_api_integration/apis/epm/install_remove_assets.ts b/x-pack/test/fleet_api_integration/apis/epm/install_remove_assets.ts
index 4212ca46fc3c9..34cebed5b5d5a 100644
--- a/x-pack/test/fleet_api_integration/apis/epm/install_remove_assets.ts
+++ b/x-pack/test/fleet_api_integration/apis/epm/install_remove_assets.ts
@@ -91,29 +91,17 @@ export default function (providerContext: FtrProviderContext) {
         expect(resMetricsTemplate.statusCode).equal(404);
       });
       it('should have uninstalled the component templates', async function () {
-        const resMappings = await es.transport.request(
+        const resPackage = await es.transport.request(
           {
             method: 'GET',
-            path: `/_component_template/${logsTemplateName}@mappings`,
+            path: `/_component_template/${logsTemplateName}@package`,
           },
           {
             ignore: [404],
             meta: true,
           }
         );
-        expect(resMappings.statusCode).equal(404);
-
-        const resSettings = await es.transport.request(
-          {
-            method: 'GET',
-            path: `/_component_template/${logsTemplateName}@settings`,
-          },
-          {
-            ignore: [404],
-            meta: true,
-          }
-        );
-        expect(resSettings.statusCode).equal(404);
+        expect(resPackage.statusCode).equal(404);
 
         const resUserSettings = await es.transport.request(
           {
@@ -382,22 +370,15 @@ const expectAssetsInstalled = ({
     expect(res.statusCode).equal(200);
   });
   it('should have installed the component templates', async function () {
-    const resMappings = await es.transport.request(
+    const resPackage = await es.transport.request(
       {
         method: 'GET',
-        path: `/_component_template/${logsTemplateName}@mappings`,
+        path: `/_component_template/${logsTemplateName}@package`,
       },
       { meta: true }
     );
-    expect(resMappings.statusCode).equal(200);
-    const resSettings = await es.transport.request(
-      {
-        method: 'GET',
-        path: `/_component_template/${logsTemplateName}@settings`,
-      },
-      { meta: true }
-    );
-    expect(resSettings.statusCode).equal(200);
+    expect(resPackage.statusCode).equal(200);
+
     const resUserSettings = await es.transport.request(
       {
         method: 'GET',
@@ -565,11 +546,7 @@ const expectAssetsInstalled = ({
       installed_kibana_space_id: 'default',
       installed_es: [
         {
-          id: 'logs-all_assets.test_logs@mappings',
-          type: 'component_template',
-        },
-        {
-          id: 'logs-all_assets.test_logs@settings',
+          id: 'logs-all_assets.test_logs@package',
           type: 'component_template',
         },
         {
@@ -577,11 +554,7 @@ const expectAssetsInstalled = ({
           type: 'component_template',
         },
         {
-          id: 'metrics-all_assets.test_metrics@mappings',
-          type: 'component_template',
-        },
-        {
-          id: 'metrics-all_assets.test_metrics@settings',
+          id: 'metrics-all_assets.test_metrics@package',
           type: 'component_template',
         },
         {
diff --git a/x-pack/test/fleet_api_integration/apis/epm/update_assets.ts b/x-pack/test/fleet_api_integration/apis/epm/update_assets.ts
index 7a69d5635f9ac..b73ca9537990c 100644
--- a/x-pack/test/fleet_api_integration/apis/epm/update_assets.ts
+++ b/x-pack/test/fleet_api_integration/apis/epm/update_assets.ts
@@ -122,16 +122,16 @@ export default function (providerContext: FtrProviderContext) {
       });
     });
     it('should have populated the new component template with the correct mapping', async () => {
-      const resMappings = await es.transport.request<any>(
+      const resPackage = await es.transport.request<any>(
         {
           method: 'GET',
-          path: `/_component_template/${logsTemplateName2}@mappings`,
+          path: `/_component_template/${logsTemplateName2}@package`,
         },
         { meta: true }
       );
-      expect(resMappings.statusCode).equal(200);
+      expect(resPackage.statusCode).equal(200);
       expect(
-        resMappings.body.component_templates[0].component_template.template.mappings.properties
+        resPackage.body.component_templates[0].component_template.template.mappings.properties
       ).eql({
         '@timestamp': {
           type: 'date',
@@ -204,24 +204,31 @@ export default function (providerContext: FtrProviderContext) {
       expect(resPipeline2.statusCode).equal(404);
     });
     it('should have updated the logs component templates', async function () {
-      const resMappings = await es.transport.request<any>(
+      const resPackage = await es.transport.request<any>(
         {
           method: 'GET',
-          path: `/_component_template/${logsTemplateName}@mappings`,
+          path: `/_component_template/${logsTemplateName}@package`,
         },
         { meta: true }
       );
-      expect(resMappings.statusCode).equal(200);
-      expect(resMappings.body.component_templates[0].component_template.template.settings).eql({
+      expect(resPackage.statusCode).equal(200);
+      expect(resPackage.body.component_templates[0].component_template.template.settings).eql({
         index: {
+          codec: 'best_compression',
+          lifecycle: {
+            name: 'reference2',
+          },
           mapping: {
             total_fields: {
               limit: '10000',
             },
           },
+          query: {
+            default_field: ['logs_test_name', 'new_field_name'],
+          },
         },
       });
-      expect(resMappings.body.component_templates[0].component_template.template.mappings).eql({
+      expect(resPackage.body.component_templates[0].component_template.template.mappings).eql({
         dynamic: true,
         properties: {
           '@timestamp': {
@@ -249,23 +256,7 @@ export default function (providerContext: FtrProviderContext) {
           },
         },
       });
-      const resSettings = await es.transport.request<any>(
-        {
-          method: 'GET',
-          path: `/_component_template/${logsTemplateName}@settings`,
-        },
-        { meta: true }
-      );
-      expect(resSettings.statusCode).equal(200);
-      expect(resSettings.body.component_templates[0].component_template.template.settings).eql({
-        index: {
-          lifecycle: { name: 'reference2' },
-          codec: 'best_compression',
-          query: {
-            default_field: ['logs_test_name', 'new_field_name'],
-          },
-        },
-      });
+
       const resUserSettings = await es.transport.request<any>(
         {
           method: 'GET',
@@ -295,16 +286,16 @@ export default function (providerContext: FtrProviderContext) {
       });
     });
     it('should have updated the metrics mapping component template', async function () {
-      const resMappings = await es.transport.request<any>(
+      const resPackage = await es.transport.request<any>(
         {
           method: 'GET',
-          path: `/_component_template/${metricsTemplateName}@mappings`,
+          path: `/_component_template/${metricsTemplateName}@package`,
         },
         { meta: true }
       );
-      expect(resMappings.statusCode).equal(200);
+      expect(resPackage.statusCode).equal(200);
       expect(
-        resMappings.body.component_templates[0].component_template.template.mappings.properties
+        resPackage.body.component_templates[0].component_template.template.mappings.properties
       ).eql({
         '@timestamp': {
           type: 'date',
@@ -432,11 +423,7 @@ export default function (providerContext: FtrProviderContext) {
             type: 'index_template',
           },
           {
-            id: 'logs-all_assets.test_logs@mappings',
-            type: 'component_template',
-          },
-          {
-            id: 'logs-all_assets.test_logs@settings',
+            id: 'logs-all_assets.test_logs@package',
             type: 'component_template',
           },
           {
@@ -448,11 +435,7 @@ export default function (providerContext: FtrProviderContext) {
             type: 'index_template',
           },
           {
-            id: 'logs-all_assets.test_logs2@mappings',
-            type: 'component_template',
-          },
-          {
-            id: 'logs-all_assets.test_logs2@settings',
+            id: 'logs-all_assets.test_logs2@package',
             type: 'component_template',
           },
           {
@@ -464,11 +447,7 @@ export default function (providerContext: FtrProviderContext) {
             type: 'index_template',
           },
           {
-            id: 'metrics-all_assets.test_metrics@mappings',
-            type: 'component_template',
-          },
-          {
-            id: 'metrics-all_assets.test_metrics@settings',
+            id: 'metrics-all_assets.test_metrics@package',
             type: 'component_template',
           },
           {