diff --git a/packages/azure_app_service/changelog.yml b/packages/azure_app_service/changelog.yml
index 7c6f0c0b8e4..4fb494ac21e 100644
--- a/packages/azure_app_service/changelog.yml
+++ b/packages/azure_app_service/changelog.yml
@@ -1,4 +1,9 @@
 # newer versions go on top
+- version: 0.1.0
+  changes:
+    - description: Update the package format_version to 3.0.0.
+      type: enhancement
+      link: https://github.com/elastic/integrations/pull/8216
 - version: "0.0.1"
   changes:
     - description: Initial release
diff --git a/packages/azure_app_service/data_stream/app_service_logs/fields/ecs.yml b/packages/azure_app_service/data_stream/app_service_logs/fields/ecs.yml
index 7cf456cbc90..89c1e6a5af4 100644
--- a/packages/azure_app_service/data_stream/app_service_logs/fields/ecs.yml
+++ b/packages/azure_app_service/data_stream/app_service_logs/fields/ecs.yml
@@ -95,22 +95,6 @@
   external: ecs
 - name: source.port
   external: ecs
-- name: geo.continent_name
-  external: ecs
-- name: geo.country_iso_code
-  external: ecs
-- name: geo.country_name
-  external: ecs
-- name: geo.location
-  external: ecs
-- name: geo.city_name
-  external: ecs
-- name: geo.region_name
-  external: ecs
-- name: geo.name
-  external: ecs
-- name: geo.region_iso_code
-  external: ecs
 - name: log.level
   external: ecs
 - name: rule.id
diff --git a/packages/azure_app_service/data_stream/app_service_logs/fields/fields.yml b/packages/azure_app_service/data_stream/app_service_logs/fields/fields.yml
index 6e5f014e767..5f5a200dba7 100644
--- a/packages/azure_app_service/data_stream/app_service_logs/fields/fields.yml
+++ b/packages/azure_app_service/data_stream/app_service_logs/fields/fields.yml
@@ -129,3 +129,34 @@
     - name: log
       type: keyword
       description: Details about the event depending on level
+# The following `geo` mappings are not allowed at root level in ECS, and are defined here for backward compatibility.
+# See: https://github.com/elastic/integrations/pull/8050
+- name: geo
+  type: group
+  description: 'Geo fields can carry data about a specific location related to an event. This geolocation information can be derived from techniques such as Geo IP, or be user-supplied.'
+  fields:
+    - name: continent_name
+      type: keyword
+      description: Name of the continent.
+    - name: country_iso_code
+      type: keyword
+      description: Country ISO code.
+    - name: country_name
+      type: keyword
+      description: Country name.
+    - name: location
+      type: geo_point
+      description: Longitude and latitude.
+    - name: city_name
+      type: keyword
+      description: City name.
+    - name: region_name
+      type: keyword
+      description: Region name.
+    - name: name
+      type: keyword
+      description: 'User-defined description of a location, at the level of granularity they care about. Could be the name of their data centers, the floor number, if this describes a local physical entity, city names. Not typically used in automated geolocation.'
+      level: extended
+    - name: region_iso_code
+      type: keyword
+      description: Region ISO code.
diff --git a/packages/azure_app_service/manifest.yml b/packages/azure_app_service/manifest.yml
index 35759dc3edd..b8d9735e0de 100644
--- a/packages/azure_app_service/manifest.yml
+++ b/packages/azure_app_service/manifest.yml
@@ -1,7 +1,7 @@
-format_version: 2.8.0
+format_version: "3.0.0"
 name: azure_app_service
 title: "Azure App Service"
-version: 0.0.1
+version: "0.1.0"
 source:
   license: "Elastic-2.0"
 description: "Collect logs and metrics from Azure App Service with Elastic Agent."
@@ -10,8 +10,10 @@ categories:
   - azure
   - cloud
 conditions:
-  kibana.version: "^8.7.1"
-  elastic.subscription: "basic"
+  kibana:
+    version: "^8.7.1"
+  elastic:
+    subscription: "basic"
 vars:
   - name: eventhub
     type: text
@@ -76,3 +78,4 @@ policy_templates:
         input_group: logs
 owner:
   github: elastic/obs-infraobs-integrations
+  type: elastic
diff --git a/packages/citrix_adc/changelog.yml b/packages/citrix_adc/changelog.yml
index 44e354f669e..efa65c8b9f0 100644
--- a/packages/citrix_adc/changelog.yml
+++ b/packages/citrix_adc/changelog.yml
@@ -1,4 +1,9 @@
 # newer versions go on top
+- version: 1.1.0
+  changes:
+    - description: Update the package format_version to 3.0.0.
+      type: enhancement
+      link: https://github.com/elastic/integrations/pull/8216
 - version: "1.0.1"
   changes:
     - description: Add null check and ignore_missing check to the rename processor
diff --git a/packages/citrix_adc/data_stream/interface/fields/ecs.yml b/packages/citrix_adc/data_stream/interface/fields/ecs.yml
index 7d58f2030d8..faa4f380cbf 100644
--- a/packages/citrix_adc/data_stream/interface/fields/ecs.yml
+++ b/packages/citrix_adc/data_stream/interface/fields/ecs.yml
@@ -16,7 +16,5 @@
   name: event.type
 - external: ecs
   name: host.ip
-- external: ecs
-  name: interface.id
 - external: ecs
   name: tags
diff --git a/packages/citrix_adc/data_stream/interface/fields/fields.yml b/packages/citrix_adc/data_stream/interface/fields/fields.yml
index 7c13069daf6..0a4a1d08750 100644
--- a/packages/citrix_adc/data_stream/interface/fields/fields.yml
+++ b/packages/citrix_adc/data_stream/interface/fields/fields.yml
@@ -227,3 +227,11 @@
                   description: Number of bytes transmitted by an interface since the NetScaler appliance was started or the interface statistics were cleared.
                   metric_type: counter
                   unit: byte
+# The following `interface` mappings are not allowed at root level in ECS, and are defined here for backward compatibility.
+# See: https://github.com/elastic/integrations/pull/8050
+- name: interface
+  type: group
+  fields:
+    - name: id
+      type: keyword
+      description: Interface ID as reported by an observer (typically SNMP interface ID).
diff --git a/packages/citrix_adc/manifest.yml b/packages/citrix_adc/manifest.yml
index 239d9a41c67..abc1228fbef 100644
--- a/packages/citrix_adc/manifest.yml
+++ b/packages/citrix_adc/manifest.yml
@@ -1,15 +1,17 @@
-format_version: 2.0.0
+format_version: "3.0.0"
 name: citrix_adc
 title: Citrix ADC
-version: "1.0.1"
+version: "1.1.0"
 description: This Elastic integration collects metrics from Citrix ADC product.
 type: integration
 categories:
   - observability
   - network
 conditions:
-  kibana.version: ^8.7.1
-  elastic.subscription: basic
+  kibana:
+    version: ^8.7.1
+  elastic:
+    subscription: basic
 icons:
   - src: /img/citrix_adc-logo.svg
     title: Citrix ADC logo
@@ -109,3 +111,4 @@ policy_templates:
               #    -----END CERTIFICATE-----
 owner:
   github: elastic/obs-infraobs-integrations
+  type: elastic
diff --git a/packages/citrix_adc/validation.yml b/packages/citrix_adc/validation.yml
new file mode 100644
index 00000000000..bcc8f74ac3a
--- /dev/null
+++ b/packages/citrix_adc/validation.yml
@@ -0,0 +1,3 @@
+errors:
+  exclude_checks:
+    - SVR00002
diff --git a/packages/redis/changelog.yml b/packages/redis/changelog.yml
index 1a5b4afbe21..578e8b5f4f7 100644
--- a/packages/redis/changelog.yml
+++ b/packages/redis/changelog.yml
@@ -1,4 +1,9 @@
 # newer versions go on top
+- version: 1.12.0
+  changes:
+    - description: Update the package format_version to 3.0.0.
+      type: enhancement
+      link: https://github.com/elastic/integrations/pull/8216
 - version: "1.11.1"
   changes:
     - description: Add null check and ignore_missing check to the rename processor
diff --git a/packages/redis/data_stream/info/fields/ecs.yml b/packages/redis/data_stream/info/fields/ecs.yml
index bac048bdf11..565c72240b9 100644
--- a/packages/redis/data_stream/info/fields/ecs.yml
+++ b/packages/redis/data_stream/info/fields/ecs.yml
@@ -1,7 +1,5 @@
 - external: ecs
   name: os
-- external: ecs
-  name: os.full
 - external: ecs
   name: process
 - external: ecs
@@ -10,6 +8,7 @@
   name: ecs.version
 - external: ecs
   name: service.address
+  # Reason for adding as dimension field : A connection string to the server.
   dimension: true
 - external: ecs
   name: service.type
diff --git a/packages/redis/data_stream/info/fields/fields.yml b/packages/redis/data_stream/info/fields/fields.yml
index fcd865b2ec0..867126ea4ef 100644
--- a/packages/redis/data_stream/info/fields/fields.yml
+++ b/packages/redis/data_stream/info/fields/fields.yml
@@ -524,11 +524,13 @@
       metric_type: gauge
       description: |
         Count of slow operations
-- name: service.address
-  type: keyword
-  # Reason for adding as dimension field : A connection string to the server.
-  dimension: true
-  description: Client address
-- name: service.version
-  type: keyword
-  description: Version of the service the data was collected from
+- name: os
+  type: group
+  description: The OS fields contain information about the operating system.
+  fields:
+    - name: full
+      type: keyword
+      description: Operating system name, including the version or code name.
+      multi_fields:
+        - name: text
+          type: match_only_text
diff --git a/packages/redis/data_stream/info/manifest.yml b/packages/redis/data_stream/info/manifest.yml
index 658b0e63e1e..d6b849303a6 100644
--- a/packages/redis/data_stream/info/manifest.yml
+++ b/packages/redis/data_stream/info/manifest.yml
@@ -13,4 +13,4 @@ streams:
     title: Redis info metrics
     description: Collect Redis info metrics
 elasticsearch:
-  index_mode: "time_series"
\ No newline at end of file
+  index_mode: "time_series"
diff --git a/packages/redis/data_stream/key/manifest.yml b/packages/redis/data_stream/key/manifest.yml
index a5b129f68db..1ede0068d4c 100644
--- a/packages/redis/data_stream/key/manifest.yml
+++ b/packages/redis/data_stream/key/manifest.yml
@@ -22,4 +22,4 @@ streams:
     title: Redis key metrics
     description: Collect Redis key metrics
 elasticsearch:
-  index_mode: "time_series"
\ No newline at end of file
+  index_mode: "time_series"
diff --git a/packages/redis/data_stream/keyspace/manifest.yml b/packages/redis/data_stream/keyspace/manifest.yml
index a10e1961e27..130c4a4aca4 100644
--- a/packages/redis/data_stream/keyspace/manifest.yml
+++ b/packages/redis/data_stream/keyspace/manifest.yml
@@ -13,4 +13,4 @@ streams:
     title: Redis keyspace metrics
     description: Collect Redis keyspace metrics
 elasticsearch:
-  index_mode: "time_series"
\ No newline at end of file
+  index_mode: "time_series"
diff --git a/packages/redis/data_stream/log/_dev/test/pipeline/test-common-config.yml b/packages/redis/data_stream/log/_dev/test/pipeline/test-common-config.yml
index 1bc358504a7..f22852f5863 100644
--- a/packages/redis/data_stream/log/_dev/test/pipeline/test-common-config.yml
+++ b/packages/redis/data_stream/log/_dev/test/pipeline/test-common-config.yml
@@ -1,5 +1,5 @@
 dynamic_fields:
-  event.ingested: ".*"
+  "event.ingested": ".*"
   "@timestamp": "^[0-9]{4}(-[0-9]{2}){2}T[0-9]{2}(:[0-9]{2}){2}\\.[0-9]{3}Z$"
 fields:
   "@timestamp": "2020-04-28T11:07:58.223Z"
diff --git a/packages/redis/data_stream/log/_dev/test/pipeline/test-redis-5-0-3.log-expected.json b/packages/redis/data_stream/log/_dev/test/pipeline/test-redis-5-0-3.log-expected.json
index 33fb0693319..a1704277a88 100644
--- a/packages/redis/data_stream/log/_dev/test/pipeline/test-redis-5-0-3.log-expected.json
+++ b/packages/redis/data_stream/log/_dev/test/pipeline/test-redis-5-0-3.log-expected.json
@@ -7,7 +7,7 @@
             },
             "event": {
                 "created": "2020-04-28T11:07:58.223Z",
-                "ingested": "2023-01-19T10:58:02.691822429Z",
+                "ingested": "2023-10-16T18:52:12.465349054Z",
                 "original": "26571:M 27 Dec 2018 11:19:18.874 * Synchronization with replica 10.114.208.18:6023 succeeded"
             },
             "log": {
diff --git a/packages/redis/data_stream/log/_dev/test/pipeline/test-redis-darwin-3-0-2.log-expected.json b/packages/redis/data_stream/log/_dev/test/pipeline/test-redis-darwin-3-0-2.log-expected.json
index f3b4e2f229f..25c03d4e6a2 100644
--- a/packages/redis/data_stream/log/_dev/test/pipeline/test-redis-darwin-3-0-2.log-expected.json
+++ b/packages/redis/data_stream/log/_dev/test/pipeline/test-redis-darwin-3-0-2.log-expected.json
@@ -7,7 +7,7 @@
             },
             "event": {
                 "created": "2020-04-28T11:07:58.223Z",
-                "ingested": "2023-01-19T10:58:02.743919929Z",
+                "ingested": "2023-10-16T18:52:12.503487221Z",
                 "original": "4961:M 30 May 12:50:13.457 * Increased maximum number of open files to 10032 (it was originally set to 4864)."
             },
             "log": {
@@ -33,7 +33,7 @@
             },
             "event": {
                 "created": "2020-04-28T11:07:58.223Z",
-                "ingested": "2023-01-19T10:58:02.743928971Z",
+                "ingested": "2023-10-16T18:52:12.503493054Z",
                 "original": "4961:M 30 May 12:50:13.463 # Server started, Redis version 3.0.2"
             },
             "log": {
@@ -59,7 +59,7 @@
             },
             "event": {
                 "created": "2020-04-28T11:07:58.223Z",
-                "ingested": "2023-01-19T10:58:02.743930179Z",
+                "ingested": "2023-10-16T18:52:12.503494012Z",
                 "original": "4961:M 30 May 12:50:13.464 * DB loaded from disk: 0.001 seconds"
             },
             "log": {
@@ -85,7 +85,7 @@
             },
             "event": {
                 "created": "2020-04-28T11:07:58.223Z",
-                "ingested": "2023-01-19T10:58:02.743931304Z",
+                "ingested": "2023-10-16T18:52:12.503494804Z",
                 "original": "4961:M 30 May 12:50:13.464 * The server is now ready to accept connections on port 6379"
             },
             "log": {
@@ -111,7 +111,7 @@
             },
             "event": {
                 "created": "2020-04-28T11:07:58.223Z",
-                "ingested": "2023-01-19T10:58:02.743932263Z",
+                "ingested": "2023-10-16T18:52:12.503495554Z",
                 "original": "4961:signal-handler (1496141561) Received SIGINT scheduling shutdown..."
             },
             "message": "Received SIGINT scheduling shutdown...",
@@ -132,7 +132,7 @@
             },
             "event": {
                 "created": "2020-04-28T11:07:58.223Z",
-                "ingested": "2023-01-19T10:58:02.743933138Z",
+                "ingested": "2023-10-16T18:52:12.503496262Z",
                 "original": "4961:M 30 May 12:52:41.448 # User requested shutdown..."
             },
             "log": {
@@ -158,7 +158,7 @@
             },
             "event": {
                 "created": "2020-04-28T11:07:58.223Z",
-                "ingested": "2023-01-19T10:58:02.743934054Z",
+                "ingested": "2023-10-16T18:52:12.503496971Z",
                 "original": "4961:M 30 May 12:52:41.448 * Saving the final RDB snapshot before exiting."
             },
             "log": {
@@ -184,7 +184,7 @@
             },
             "event": {
                 "created": "2020-04-28T11:07:58.223Z",
-                "ingested": "2023-01-19T10:58:02.743934971Z",
+                "ingested": "2023-10-16T18:52:12.503497721Z",
                 "original": "4961:M 30 May 12:52:41.452 * DB saved on disk"
             },
             "log": {
@@ -210,7 +210,7 @@
             },
             "event": {
                 "created": "2020-04-28T11:07:58.223Z",
-                "ingested": "2023-01-19T10:58:02.743935888Z",
+                "ingested": "2023-10-16T18:52:12.503498429Z",
                 "original": "4961:M 30 May 12:52:41.452 # Redis is now ready to exit, bye bye..."
             },
             "log": {
@@ -236,7 +236,7 @@
             },
             "event": {
                 "created": "2020-04-28T11:07:58.223Z",
-                "ingested": "2023-01-19T10:58:02.743936846Z",
+                "ingested": "2023-10-16T18:52:12.503499137Z",
                 "original": "5092:M 30 May 12:52:42.131 * Increased maximum number of open files to 10032 (it was originally set to 4864)."
             },
             "log": {
@@ -262,7 +262,7 @@
             },
             "event": {
                 "created": "2020-04-28T11:07:58.223Z",
-                "ingested": "2023-01-19T10:58:02.743937763Z",
+                "ingested": "2023-10-16T18:52:12.503499846Z",
                 "original": "5092:M 30 May 12:52:42.133 # Server started, Redis version 3.0.2"
             },
             "log": {
@@ -288,7 +288,7 @@
             },
             "event": {
                 "created": "2020-04-28T11:07:58.223Z",
-                "ingested": "2023-01-19T10:58:02.743938846Z",
+                "ingested": "2023-10-16T18:52:12.503505679Z",
                 "original": "5092:M 30 May 12:52:42.133 * DB loaded from disk: 0.000 seconds"
             },
             "log": {
@@ -314,7 +314,7 @@
             },
             "event": {
                 "created": "2020-04-28T11:07:58.223Z",
-                "ingested": "2023-01-19T10:58:02.743939721Z",
+                "ingested": "2023-10-16T18:52:12.503506429Z",
                 "original": "5092:M 30 May 12:52:42.133 * The server is now ready to accept connections on port 6379"
             },
             "log": {
@@ -340,7 +340,7 @@
             },
             "event": {
                 "created": "2020-04-28T11:07:58.223Z",
-                "ingested": "2023-01-19T10:58:02.743940638Z",
+                "ingested": "2023-10-16T18:52:12.503507179Z",
                 "original": "5092:signal-handler (1496141844) Received SIGINT scheduling shutdown..."
             },
             "message": "Received SIGINT scheduling shutdown...",
@@ -361,7 +361,7 @@
             },
             "event": {
                 "created": "2020-04-28T11:07:58.223Z",
-                "ingested": "2023-01-19T10:58:02.743941638Z",
+                "ingested": "2023-10-16T18:52:12.503507887Z",
                 "original": "5092:M 30 May 12:57:24.231 # User requested shutdown..."
             },
             "log": {
@@ -387,7 +387,7 @@
             },
             "event": {
                 "created": "2020-04-28T11:07:58.223Z",
-                "ingested": "2023-01-19T10:58:02.743942513Z",
+                "ingested": "2023-10-16T18:52:12.503508596Z",
                 "original": "5092:M 30 May 12:57:24.231 * Saving the final RDB snapshot before exiting."
             },
             "log": {
@@ -413,7 +413,7 @@
             },
             "event": {
                 "created": "2020-04-28T11:07:58.223Z",
-                "ingested": "2023-01-19T10:58:02.743943429Z",
+                "ingested": "2023-10-16T18:52:12.503509346Z",
                 "original": "5092:M 30 May 12:57:24.234 * DB saved on disk"
             },
             "log": {
@@ -439,7 +439,7 @@
             },
             "event": {
                 "created": "2020-04-28T11:07:58.223Z",
-                "ingested": "2023-01-19T10:58:02.743944304Z",
+                "ingested": "2023-10-16T18:52:12.503510054Z",
                 "original": "5092:M 30 May 12:57:24.234 # Redis is now ready to exit, bye bye..."
             },
             "log": {
diff --git a/packages/redis/data_stream/log/_dev/test/pipeline/test-redis-debian-1-2-6.log-expected.json b/packages/redis/data_stream/log/_dev/test/pipeline/test-redis-debian-1-2-6.log-expected.json
index 795c2e1cb23..7380a240d03 100644
--- a/packages/redis/data_stream/log/_dev/test/pipeline/test-redis-debian-1-2-6.log-expected.json
+++ b/packages/redis/data_stream/log/_dev/test/pipeline/test-redis-debian-1-2-6.log-expected.json
@@ -7,7 +7,7 @@
             },
             "event": {
                 "created": "2020-04-28T11:07:58.223Z",
-                "ingested": "2023-01-19T10:58:02.791362971Z",
+                "ingested": "2023-10-16T18:52:12.546332679Z",
                 "original": "30 May 10:03:19 - Server started, Redis version 1.2.6"
             },
             "log": {
@@ -28,7 +28,7 @@
             },
             "event": {
                 "created": "2020-04-28T11:07:58.223Z",
-                "ingested": "2023-01-19T10:58:02.791374221Z",
+                "ingested": "2023-10-16T18:52:12.546341429Z",
                 "original": "30 May 10:03:19 * WARNING overcommit_memory is set to 0! Background save may fail under low condition memory. To fix this issue add 'vm.overcommit_memory = 1' to /etc/sysctl.conf and then reboot or run the command 'sysctl vm.overcommit_memory=1' for this to take effect."
             },
             "log": {
@@ -49,7 +49,7 @@
             },
             "event": {
                 "created": "2020-04-28T11:07:58.223Z",
-                "ingested": "2023-01-19T10:58:02.791375429Z",
+                "ingested": "2023-10-16T18:52:12.546342554Z",
                 "original": "30 May 10:03:19 - The server is now ready to accept connections on port 6379"
             },
             "log": {
@@ -70,7 +70,7 @@
             },
             "event": {
                 "created": "2020-04-28T11:07:58.223Z",
-                "ingested": "2023-01-19T10:58:02.791376638Z",
+                "ingested": "2023-10-16T18:52:12.546343512Z",
                 "original": "30 May 10:04:14 - Server started, Redis version 1.2.6"
             },
             "log": {
@@ -91,7 +91,7 @@
             },
             "event": {
                 "created": "2020-04-28T11:07:58.223Z",
-                "ingested": "2023-01-19T10:58:02.791377596Z",
+                "ingested": "2023-10-16T18:52:12.546344304Z",
                 "original": "30 May 10:04:14 * WARNING overcommit_memory is set to 0! Background save may fail under low condition memory. To fix this issue add 'vm.overcommit_memory = 1' to /etc/sysctl.conf and then reboot or run the command 'sysctl vm.overcommit_memory=1' for this to take effect."
             },
             "log": {
@@ -112,7 +112,7 @@
             },
             "event": {
                 "created": "2020-04-28T11:07:58.223Z",
-                "ingested": "2023-01-19T10:58:02.791378679Z",
+                "ingested": "2023-10-16T18:52:12.546345054Z",
                 "original": "30 May 10:04:14 - The server is now ready to accept connections on port 6379"
             },
             "log": {
@@ -133,7 +133,7 @@
             },
             "event": {
                 "created": "2020-04-28T11:07:58.223Z",
-                "ingested": "2023-01-19T10:58:02.791379596Z",
+                "ingested": "2023-10-16T18:52:12.546345804Z",
                 "original": "30 May 10:04:45 - Server started, Redis version 1.2.6"
             },
             "log": {
@@ -154,7 +154,7 @@
             },
             "event": {
                 "created": "2020-04-28T11:07:58.223Z",
-                "ingested": "2023-01-19T10:58:02.791380513Z",
+                "ingested": "2023-10-16T18:52:12.546346637Z",
                 "original": "30 May 10:04:45 * WARNING overcommit_memory is set to 0! Background save may fail under low condition memory. To fix this issue add 'vm.overcommit_memory = 1' to /etc/sysctl.conf and then reboot or run the command 'sysctl vm.overcommit_memory=1' for this to take effect."
             },
             "log": {
@@ -175,7 +175,7 @@
             },
             "event": {
                 "created": "2020-04-28T11:07:58.223Z",
-                "ingested": "2023-01-19T10:58:02.791381429Z",
+                "ingested": "2023-10-16T18:52:12.546347387Z",
                 "original": "30 May 10:04:45 - The server is now ready to accept connections on port 6379"
             },
             "log": {
@@ -196,7 +196,7 @@
             },
             "event": {
                 "created": "2020-04-28T11:07:58.223Z",
-                "ingested": "2023-01-19T10:58:02.791382513Z",
+                "ingested": "2023-10-16T18:52:12.546348137Z",
                 "original": "30 May 10:04:45 . 0 clients connected (0 slaves), 618932 bytes in use, 0 shared objects"
             },
             "log": {
@@ -217,7 +217,7 @@
             },
             "event": {
                 "created": "2020-04-28T11:07:58.223Z",
-                "ingested": "2023-01-19T10:58:02.791383429Z",
+                "ingested": "2023-10-16T18:52:12.546348971Z",
                 "original": "30 May 10:04:50 . 0 clients connected (0 slaves), 618932 bytes in use, 0 shared objects"
             },
             "log": {
@@ -238,7 +238,7 @@
             },
             "event": {
                 "created": "2020-04-28T11:07:58.223Z",
-                "ingested": "2023-01-19T10:58:02.791384513Z",
+                "ingested": "2023-10-16T18:52:12.546351512Z",
                 "original": "30 May 10:05:37 . Accepted 127.0.0.1:56742"
             },
             "log": {
@@ -259,7 +259,7 @@
             },
             "event": {
                 "created": "2020-04-28T11:07:58.223Z",
-                "ingested": "2023-01-19T10:58:02.791385429Z",
+                "ingested": "2023-10-16T18:52:12.546352346Z",
                 "original": "30 May 10:05:40 . 1 clients connected (0 slaves), 619381 bytes in use, 0 shared objects"
             },
             "log": {
@@ -280,7 +280,7 @@
             },
             "event": {
                 "created": "2020-04-28T11:07:58.223Z",
-                "ingested": "2023-01-19T10:58:02.791386304Z",
+                "ingested": "2023-10-16T18:52:12.546353096Z",
                 "original": "30 May 10:05:45 . 1 clients connected (0 slaves), 619381 bytes in use, 0 shared objects"
             },
             "log": {
diff --git a/packages/redis/data_stream/log/_dev/test/pipeline/test-redis-windows-2-4-6.log-expected.json b/packages/redis/data_stream/log/_dev/test/pipeline/test-redis-windows-2-4-6.log-expected.json
index ed4aad9f603..13e7d663505 100644
--- a/packages/redis/data_stream/log/_dev/test/pipeline/test-redis-windows-2-4-6.log-expected.json
+++ b/packages/redis/data_stream/log/_dev/test/pipeline/test-redis-windows-2-4-6.log-expected.json
@@ -7,7 +7,7 @@
             },
             "event": {
                 "created": "2020-04-28T11:07:58.223Z",
-                "ingested": "2023-01-19T10:58:02.834639304Z",
+                "ingested": "2023-10-16T18:52:12.585758137Z",
                 "original": "[2932] 31 May 04:32:08 * Server started, Redis version 2.4.6"
             },
             "log": {
@@ -28,7 +28,7 @@
             },
             "event": {
                 "created": "2020-04-28T11:07:58.223Z",
-                "ingested": "2023-01-19T10:58:02.834650096Z",
+                "ingested": "2023-10-16T18:52:12.585767762Z",
                 "original": "[2932] 31 May 04:32:08 # Open data file dump.rdb: No such file or directory"
             },
             "log": {
@@ -49,7 +49,7 @@
             },
             "event": {
                 "created": "2020-04-28T11:07:58.223Z",
-                "ingested": "2023-01-19T10:58:02.834651263Z",
+                "ingested": "2023-10-16T18:52:12.585768804Z",
                 "original": "[2932] 31 May 04:32:08 * The server is now ready to accept connections on port 6379"
             },
             "log": {
@@ -70,7 +70,7 @@
             },
             "event": {
                 "created": "2020-04-28T11:07:58.223Z",
-                "ingested": "2023-01-19T10:58:02.834652221Z",
+                "ingested": "2023-10-16T18:52:12.585769762Z",
                 "original": "[2932] 31 May 04:32:08 - 0 clients connected (0 slaves), 1179968 bytes in use"
             },
             "log": {
@@ -91,7 +91,7 @@
             },
             "event": {
                 "created": "2020-04-28T11:07:58.223Z",
-                "ingested": "2023-01-19T10:58:02.834653138Z",
+                "ingested": "2023-10-16T18:52:12.585770637Z",
                 "original": "[2932] 31 May 04:32:13 - 0 clients connected (0 slaves), 1179968 bytes in use"
             },
             "log": {
@@ -112,7 +112,7 @@
             },
             "event": {
                 "created": "2020-04-28T11:07:58.223Z",
-                "ingested": "2023-01-19T10:58:02.834654013Z",
+                "ingested": "2023-10-16T18:52:12.585771429Z",
                 "original": "[2932] 31 May 04:32:19 - 0 clients connected (0 slaves), 1179968 bytes in use"
             },
             "log": {
@@ -133,7 +133,7 @@
             },
             "event": {
                 "created": "2020-04-28T11:07:58.223Z",
-                "ingested": "2023-01-19T10:58:02.834654971Z",
+                "ingested": "2023-10-16T18:52:12.585772179Z",
                 "original": "[2932] 31 May 04:32:24 - 0 clients connected (0 slaves), 1179968 bytes in use"
             },
             "log": {
@@ -154,7 +154,7 @@
             },
             "event": {
                 "created": "2020-04-28T11:07:58.223Z",
-                "ingested": "2023-01-19T10:58:02.834655846Z",
+                "ingested": "2023-10-16T18:52:12.585772929Z",
                 "original": "[2932] 31 May 04:32:30 - 0 clients connected (0 slaves), 1179968 bytes in use"
             },
             "log": {
@@ -175,7 +175,7 @@
             },
             "event": {
                 "created": "2020-04-28T11:07:58.223Z",
-                "ingested": "2023-01-19T10:58:02.834656721Z",
+                "ingested": "2023-10-16T18:52:12.585773721Z",
                 "original": "[2932] 31 May 04:32:35 - 0 clients connected (0 slaves), 1179968 bytes in use"
             },
             "log": {
@@ -196,7 +196,7 @@
             },
             "event": {
                 "created": "2020-04-28T11:07:58.223Z",
-                "ingested": "2023-01-19T10:58:02.834657804Z",
+                "ingested": "2023-10-16T18:52:12.585774512Z",
                 "original": "[2932] 31 May 04:32:41 - 0 clients connected (0 slaves), 1179968 bytes in use"
             },
             "log": {
@@ -217,7 +217,7 @@
             },
             "event": {
                 "created": "2020-04-28T11:07:58.223Z",
-                "ingested": "2023-01-19T10:58:02.834658679Z",
+                "ingested": "2023-10-16T18:52:12.585775262Z",
                 "original": "[2932] 31 May 04:32:46 - 0 clients connected (0 slaves), 1179968 bytes in use"
             },
             "log": {
@@ -238,7 +238,7 @@
             },
             "event": {
                 "created": "2020-04-28T11:07:58.223Z",
-                "ingested": "2023-01-19T10:58:02.834660013Z",
+                "ingested": "2023-10-16T18:52:12.585776096Z",
                 "original": "[2932] 31 May 04:32:52 - 0 clients connected (0 slaves), 1179968 bytes in use"
             },
             "log": {
@@ -259,7 +259,7 @@
             },
             "event": {
                 "created": "2020-04-28T11:07:58.223Z",
-                "ingested": "2023-01-19T10:58:02.834661054Z",
+                "ingested": "2023-10-16T18:52:12.585776887Z",
                 "original": "[2932] 31 May 04:32:57 - 0 clients connected (0 slaves), 1179968 bytes in use"
             },
             "log": {
@@ -280,7 +280,7 @@
             },
             "event": {
                 "created": "2020-04-28T11:07:58.223Z",
-                "ingested": "2023-01-19T10:58:02.834666846Z",
+                "ingested": "2023-10-16T18:52:12.585777637Z",
                 "original": "[2932] 31 May 04:33:03 - 0 clients connected (0 slaves), 1179968 bytes in use"
             },
             "log": {
@@ -301,7 +301,7 @@
             },
             "event": {
                 "created": "2020-04-28T11:07:58.223Z",
-                "ingested": "2023-01-19T10:58:02.834667929Z",
+                "ingested": "2023-10-16T18:52:12.585778429Z",
                 "original": "[2932] 31 May 04:33:08 - 0 clients connected (0 slaves), 1179968 bytes in use"
             },
             "log": {
@@ -322,7 +322,7 @@
             },
             "event": {
                 "created": "2020-04-28T11:07:58.223Z",
-                "ingested": "2023-01-19T10:58:02.834668888Z",
+                "ingested": "2023-10-16T18:52:12.585779179Z",
                 "original": "[2932] 31 May 04:33:13 - 0 clients connected (0 slaves), 1179968 bytes in use"
             },
             "log": {
@@ -343,7 +343,7 @@
             },
             "event": {
                 "created": "2020-04-28T11:07:58.223Z",
-                "ingested": "2023-01-19T10:58:02.834669929Z",
+                "ingested": "2023-10-16T18:52:12.585780012Z",
                 "original": "[2932] 31 May 04:33:19 - 0 clients connected (0 slaves), 1179968 bytes in use"
             },
             "log": {
@@ -364,7 +364,7 @@
             },
             "event": {
                 "created": "2020-04-28T11:07:58.223Z",
-                "ingested": "2023-01-19T10:58:02.834670804Z",
+                "ingested": "2023-10-16T18:52:12.585780721Z",
                 "original": "[2932] 31 May 04:33:24 - 0 clients connected (0 slaves), 1179968 bytes in use"
             },
             "log": {
@@ -385,7 +385,7 @@
             },
             "event": {
                 "created": "2020-04-28T11:07:58.223Z",
-                "ingested": "2023-01-19T10:58:02.834671679Z",
+                "ingested": "2023-10-16T18:52:12.585781512Z",
                 "original": "[2932] 31 May 04:33:30 - 0 clients connected (0 slaves), 1179968 bytes in use"
             },
             "log": {
@@ -406,7 +406,7 @@
             },
             "event": {
                 "created": "2020-04-28T11:07:58.223Z",
-                "ingested": "2023-01-19T10:58:02.834672679Z",
+                "ingested": "2023-10-16T18:52:12.585782304Z",
                 "original": "[2932] 31 May 04:33:35 - 0 clients connected (0 slaves), 1179968 bytes in use"
             },
             "log": {
@@ -427,7 +427,7 @@
             },
             "event": {
                 "created": "2020-04-28T11:07:58.223Z",
-                "ingested": "2023-01-19T10:58:02.834673679Z",
+                "ingested": "2023-10-16T18:52:12.585783096Z",
                 "original": "[2932] 31 May 04:33:41 - 0 clients connected (0 slaves), 1179968 bytes in use"
             },
             "log": {
@@ -448,7 +448,7 @@
             },
             "event": {
                 "created": "2020-04-28T11:07:58.223Z",
-                "ingested": "2023-01-19T10:58:02.834674721Z",
+                "ingested": "2023-10-16T18:52:12.585783887Z",
                 "original": "[2932] 31 May 04:33:46 - 0 clients connected (0 slaves), 1179968 bytes in use"
             },
             "log": {
@@ -469,7 +469,7 @@
             },
             "event": {
                 "created": "2020-04-28T11:07:58.223Z",
-                "ingested": "2023-01-19T10:58:02.834675763Z",
+                "ingested": "2023-10-16T18:52:12.585784762Z",
                 "original": "[2932] 31 May 04:33:52 - 0 clients connected (0 slaves), 1179968 bytes in use"
             },
             "log": {
@@ -490,7 +490,7 @@
             },
             "event": {
                 "created": "2020-04-28T11:07:58.223Z",
-                "ingested": "2023-01-19T10:58:02.834676679Z",
+                "ingested": "2023-10-16T18:52:12.585785554Z",
                 "original": "[2932] 31 May 04:33:57 - 0 clients connected (0 slaves), 1179968 bytes in use"
             },
             "log": {
@@ -511,7 +511,7 @@
             },
             "event": {
                 "created": "2020-04-28T11:07:58.223Z",
-                "ingested": "2023-01-19T10:58:02.834677596Z",
+                "ingested": "2023-10-16T18:52:12.585786387Z",
                 "original": "[2932] 31 May 04:34:03 - 0 clients connected (0 slaves), 1179968 bytes in use"
             },
             "log": {
@@ -532,7 +532,7 @@
             },
             "event": {
                 "created": "2020-04-28T11:07:58.223Z",
-                "ingested": "2023-01-19T10:58:02.834678429Z",
+                "ingested": "2023-10-16T18:52:12.585787179Z",
                 "original": "[2932] 31 May 04:34:08 - 0 clients connected (0 slaves), 1179968 bytes in use"
             },
             "log": {
@@ -553,7 +553,7 @@
             },
             "event": {
                 "created": "2020-04-28T11:07:58.223Z",
-                "ingested": "2023-01-19T10:58:02.834679263Z",
+                "ingested": "2023-10-16T18:52:12.585788012Z",
                 "original": "[2932] 31 May 04:34:14 - 0 clients connected (0 slaves), 1179968 bytes in use"
             },
             "log": {
@@ -574,7 +574,7 @@
             },
             "event": {
                 "created": "2020-04-28T11:07:58.223Z",
-                "ingested": "2023-01-19T10:58:02.834680138Z",
+                "ingested": "2023-10-16T18:52:12.585788804Z",
                 "original": "[2932] 31 May 04:34:19 - 0 clients connected (0 slaves), 1179968 bytes in use"
             },
             "log": {
@@ -595,7 +595,7 @@
             },
             "event": {
                 "created": "2020-04-28T11:07:58.223Z",
-                "ingested": "2023-01-19T10:58:02.834680929Z",
+                "ingested": "2023-10-16T18:52:12.585789596Z",
                 "original": "[2932] 31 May 04:34:25 - 0 clients connected (0 slaves), 1179968 bytes in use"
             },
             "log": {
@@ -616,7 +616,7 @@
             },
             "event": {
                 "created": "2020-04-28T11:07:58.223Z",
-                "ingested": "2023-01-19T10:58:02.834681846Z",
+                "ingested": "2023-10-16T18:52:12.585790346Z",
                 "original": "[2932] 31 May 04:34:30 - 0 clients connected (0 slaves), 1179968 bytes in use"
             },
             "log": {
@@ -637,7 +637,7 @@
             },
             "event": {
                 "created": "2020-04-28T11:07:58.223Z",
-                "ingested": "2023-01-19T10:58:02.834682679Z",
+                "ingested": "2023-10-16T18:52:12.585791096Z",
                 "original": "[2932] 31 May 04:34:36 - 0 clients connected (0 slaves), 1179968 bytes in use"
             },
             "log": {
@@ -658,7 +658,7 @@
             },
             "event": {
                 "created": "2020-04-28T11:07:58.223Z",
-                "ingested": "2023-01-19T10:58:02.834683513Z",
+                "ingested": "2023-10-16T18:52:12.585791846Z",
                 "original": "[2932] 31 May 04:34:41 - 0 clients connected (0 slaves), 1179968 bytes in use"
             },
             "log": {
@@ -679,7 +679,7 @@
             },
             "event": {
                 "created": "2020-04-28T11:07:58.223Z",
-                "ingested": "2023-01-19T10:58:02.834684346Z",
+                "ingested": "2023-10-16T18:52:12.585792596Z",
                 "original": "[2932] 31 May 04:34:46 - 0 clients connected (0 slaves), 1179968 bytes in use"
             },
             "log": {
@@ -700,7 +700,7 @@
             },
             "event": {
                 "created": "2020-04-28T11:07:58.223Z",
-                "ingested": "2023-01-19T10:58:02.834685179Z",
+                "ingested": "2023-10-16T18:52:12.585793346Z",
                 "original": "[2932] 31 May 04:34:52 - 0 clients connected (0 slaves), 1179968 bytes in use"
             },
             "log": {
diff --git a/packages/redis/data_stream/log/_dev/test/pipeline/test-redis.log-expected.json b/packages/redis/data_stream/log/_dev/test/pipeline/test-redis.log-expected.json
index 9c0816317aa..34ee3e40618 100644
--- a/packages/redis/data_stream/log/_dev/test/pipeline/test-redis.log-expected.json
+++ b/packages/redis/data_stream/log/_dev/test/pipeline/test-redis.log-expected.json
@@ -7,7 +7,7 @@
             },
             "event": {
                 "created": "2020-04-28T11:07:58.223Z",
-                "ingested": "2023-01-19T10:58:02.883428804Z",
+                "ingested": "2023-10-16T18:52:12.629621679Z",
                 "original": "98738:M 30 May 12:23:52.442 * Saving the final RDB snapshot before exiting."
             },
             "log": {
@@ -33,7 +33,7 @@
             },
             "event": {
                 "created": "2020-04-28T11:07:58.223Z",
-                "ingested": "2023-01-19T10:58:02.883439013Z",
+                "ingested": "2023-10-16T18:52:12.629627429Z",
                 "original": "30 May 10:05:20 . 0 clients connected (0 slaves), 618932 bytes in use, 0 shared objects."
             },
             "log": {
@@ -54,7 +54,7 @@
             },
             "event": {
                 "created": "2020-04-28T11:07:58.223Z",
-                "ingested": "2023-01-19T10:58:02.883440263Z",
+                "ingested": "2023-10-16T18:52:12.629628471Z",
                 "original": "[2932] 31 May 04:32:08 * The server is now ready to accept connections on port 6379\""
             },
             "log": {
@@ -75,7 +75,7 @@
             },
             "event": {
                 "created": "2020-04-28T11:07:58.223Z",
-                "ingested": "2023-01-19T10:58:02.883441263Z",
+                "ingested": "2023-10-16T18:52:12.629629346Z",
                 "original": "5092:signal-handler (1496141844) Received SIGINT scheduling shutdown..."
             },
             "message": "Received SIGINT scheduling shutdown...",
diff --git a/packages/redis/docs/README.md b/packages/redis/docs/README.md
index 689c684cab6..5c9628bb8e0 100644
--- a/packages/redis/docs/README.md
+++ b/packages/redis/docs/README.md
@@ -468,9 +468,9 @@ An example event for `info` looks as following:
 | redis.info.stats.sync.full | The number of full resyncs with slaves | long | gauge |
 | redis.info.stats.sync.partial.err | The number of denied partial resync requests | long | gauge |
 | redis.info.stats.sync.partial.ok | The number of accepted partial resync requests | long | gauge |
-| service.address | Client address | keyword |  |
+| service.address | Address where data about this service was collected from. This should be a URI, network address (ipv4:port or [ipv6]:port) or a resource path (sockets). | keyword |  |
 | service.type | The type of the service data is collected from. The type can be used to group and correlate logs and metrics from one service type. Example: If logs or metrics are collected from Elasticsearch, `service.type` would be `elasticsearch`. | keyword |  |
-| service.version | Version of the service the data was collected from | keyword |  |
+| service.version | Version of the service the data was collected from. This allows to look at a data set only for a specific version of a service. | keyword |  |
 
 
 ### key
diff --git a/packages/redis/manifest.yml b/packages/redis/manifest.yml
index 428bfd2ef38..364f8720d01 100644
--- a/packages/redis/manifest.yml
+++ b/packages/redis/manifest.yml
@@ -1,16 +1,17 @@
-format_version: 1.0.0
+format_version: "3.0.0"
 name: redis
 title: Redis
-version: "1.11.1"
-license: basic
+version: "1.12.0"
 description: Collect logs and metrics from Redis servers with Elastic Agent.
 type: integration
 categories:
   - datastore
   - observability
-release: ga
 conditions:
-  kibana.version: "^8.8.0"
+  kibana:
+    version: "^8.8.0"
+  elastic:
+    subscription: basic
 screenshots:
   - src: /img/kibana-redis.png
     title: kibana redis
@@ -82,3 +83,4 @@ policy_templates:
         description: Collecting info, key and keyspace metrics from Redis instances
 owner:
   github: elastic/obs-infraobs-integrations
+  type: elastic
diff --git a/packages/redis/validation.yml b/packages/redis/validation.yml
new file mode 100644
index 00000000000..99999428b3f
--- /dev/null
+++ b/packages/redis/validation.yml
@@ -0,0 +1,4 @@
+errors:
+  exclude_checks:
+    - SVR00002
+    - SVR00004
diff --git a/packages/tomcat/changelog.yml b/packages/tomcat/changelog.yml
index 37f0bc733b5..3e2a4a240a0 100644
--- a/packages/tomcat/changelog.yml
+++ b/packages/tomcat/changelog.yml
@@ -1,4 +1,9 @@
 # newer versions go on top
+- version: 1.10.0
+  changes:
+    - description: Update the package format_version to 3.0.0.
+      type: enhancement
+      link: https://github.com/elastic/integrations/pull/8216
 - version: "1.9.0"
   changes:
     - description: Rename ownership from obs-service-integrations to obs-infraobs-integrations
diff --git a/packages/tomcat/data_stream/log/_dev/test/pipeline/test-common-config.yml b/packages/tomcat/data_stream/log/_dev/test/pipeline/test-common-config.yml
index 5622947e4b8..a06dda74051 100644
--- a/packages/tomcat/data_stream/log/_dev/test/pipeline/test-common-config.yml
+++ b/packages/tomcat/data_stream/log/_dev/test/pipeline/test-common-config.yml
@@ -1,5 +1,5 @@
 dynamic_fields:
-  event.ingested: ".*"
+  "event.ingested": ".*"
 fields:
   tags:
     - preserve_original_event
diff --git a/packages/tomcat/data_stream/log/fields/ecs.yml b/packages/tomcat/data_stream/log/fields/ecs.yml
index b9bbc724f76..0966e639a52 100644
--- a/packages/tomcat/data_stream/log/fields/ecs.yml
+++ b/packages/tomcat/data_stream/log/fields/ecs.yml
@@ -84,14 +84,6 @@
   name: file.size
 - external: ecs
   name: file.type
-- external: ecs
-  name: geo.city_name
-- external: ecs
-  name: geo.country_name
-- external: ecs
-  name: geo.name
-- external: ecs
-  name: geo.region_name
 - external: ecs
   name: group.id
 - external: ecs
diff --git a/packages/tomcat/data_stream/log/fields/fields.yml b/packages/tomcat/data_stream/log/fields/fields.yml
index 8cadeee90a7..749124b983e 100644
--- a/packages/tomcat/data_stream/log/fields/fields.yml
+++ b/packages/tomcat/data_stream/log/fields/fields.yml
@@ -1764,3 +1764,22 @@
 - name: log.source.address
   description: Source address from which the log event was read / sent from.
   type: keyword
+# The following `geo` mappings are not allowed at root level in ECS, and are defined here for backward compatibility.
+# See: https://github.com/elastic/integrations/pull/8050
+- name: geo
+  type: group
+  description: 'Geo fields can carry data about a specific location related to an event. This geolocation information can be derived from techniques such as Geo IP, or be user-supplied.'
+  fields:
+    - name: city_name
+      type: keyword
+      description: City name.
+    - name: country_name
+      type: keyword
+      description: Country name.
+    - name: name
+      type: keyword
+      description: 'User-defined description of a location, at the level of granularity they care about. Could be the name of their data centers, the floor number, if this describes a local physical entity, city names. Not typically used in automated geolocation.'
+      level: extended
+    - name: region_name
+      type: keyword
+      description: Region name.
diff --git a/packages/tomcat/manifest.yml b/packages/tomcat/manifest.yml
index fbefac704ae..ee0841b4e34 100644
--- a/packages/tomcat/manifest.yml
+++ b/packages/tomcat/manifest.yml
@@ -1,14 +1,15 @@
-format_version: 1.0.0
+format_version: "3.0.0"
 name: tomcat
 title: Tomcat NetWitness Logs
-version: "1.9.0"
+version: "1.10.0"
 description: Collect and parse logs from Apache Tomcat servers with Elastic Agent.
 categories: ["web", "observability"]
-release: ga
-license: basic
 type: integration
 conditions:
-  kibana.version: "^7.14.1 || ^8.0.0"
+  kibana:
+    version: "^7.14.1 || ^8.0.0"
+  elastic:
+    subscription: basic
 policy_templates:
   - name: log
     title: Apache Tomcat
@@ -30,3 +31,4 @@ icons:
     type: image/svg+xml
 owner:
   github: elastic/obs-infraobs-integrations
+  type: elastic