diff --git a/x-pack/platform/plugins/shared/streams/server/lib/streams/component_templates/generate_layer.test.ts b/x-pack/platform/plugins/shared/streams/server/lib/streams/component_templates/generate_layer.test.ts
index 6ea527c666a32..7dc80a90a187a 100644
--- a/x-pack/platform/plugins/shared/streams/server/lib/streams/component_templates/generate_layer.test.ts
+++ b/x-pack/platform/plugins/shared/streams/server/lib/streams/component_templates/generate_layer.test.ts
@@ -94,10 +94,8 @@ describe('generateLayer', () => {
               "body": Object {
                 "properties": Object {
                   "structured": Object {
-                    "type": "flattened",
-                  },
-                  "text": Object {
-                    "type": "match_only_text",
+                    "subobjects": false,
+                    "type": "object",
                   },
                 },
                 "type": "object",
diff --git a/x-pack/platform/plugins/shared/streams/server/lib/streams/component_templates/logs_layer.ts b/x-pack/platform/plugins/shared/streams/server/lib/streams/component_templates/logs_layer.ts
index 95a1577ff4feb..6f9bada374246 100644
--- a/x-pack/platform/plugins/shared/streams/server/lib/streams/component_templates/logs_layer.ts
+++ b/x-pack/platform/plugins/shared/streams/server/lib/streams/component_templates/logs_layer.ts
@@ -80,9 +80,6 @@ export const baseFields: FieldDefinition = {
   'scope.version': {
     type: 'keyword',
   },
-  observed_timestamp: {
-    type: 'date',
-  },
   trace_id: {
     type: 'keyword',
   },
@@ -104,6 +101,9 @@ export const baseFields: FieldDefinition = {
   'resource.attributes.host.name': {
     type: 'keyword',
   },
+  'resource.attributes.service.name': {
+    type: 'keyword',
+  },
 };
 
 export const baseMappings: Record<string, MappingProperty> = {
@@ -111,10 +111,8 @@ export const baseMappings: Record<string, MappingProperty> = {
     type: 'object',
     properties: {
       structured: {
-        type: 'flattened',
-      },
-      text: {
-        type: 'match_only_text',
+        type: 'object',
+        subobjects: false,
       },
     },
   },
diff --git a/x-pack/platform/test/api_integration_deployment_agnostic/apis/streams/helpers/create_streams.ts b/x-pack/platform/test/api_integration_deployment_agnostic/apis/streams/helpers/create_streams.ts
index b995397ba6707..81626d234a96c 100644
--- a/x-pack/platform/test/api_integration_deployment_agnostic/apis/streams/helpers/create_streams.ts
+++ b/x-pack/platform/test/api_integration_deployment_agnostic/apis/streams/helpers/create_streams.ts
@@ -47,9 +47,6 @@ const streams: StreamPutItem[] = [
             'scope.version': {
               type: 'keyword',
             },
-            observed_timestamp: {
-              type: 'date',
-            },
             trace_id: {
               type: 'keyword',
             },
@@ -71,6 +68,9 @@ const streams: StreamPutItem[] = [
             'resource.attributes.host.name': {
               type: 'keyword',
             },
+            'resource.attributes.service.name': {
+              type: 'keyword',
+            },
             'stream.name': {
               type: 'system',
             },
diff --git a/x-pack/platform/test/api_integration_deployment_agnostic/apis/streams/root_stream.ts b/x-pack/platform/test/api_integration_deployment_agnostic/apis/streams/root_stream.ts
index f006fba5545f0..7ddccc5e65adf 100644
--- a/x-pack/platform/test/api_integration_deployment_agnostic/apis/streams/root_stream.ts
+++ b/x-pack/platform/test/api_integration_deployment_agnostic/apis/streams/root_stream.ts
@@ -48,9 +48,6 @@ const rootStreamDefinition: Streams.WiredStream.Definition = {
         'scope.version': {
           type: 'keyword',
         },
-        observed_timestamp: {
-          type: 'date',
-        },
         trace_id: {
           type: 'keyword',
         },
@@ -72,6 +69,9 @@ const rootStreamDefinition: Streams.WiredStream.Definition = {
         'resource.attributes.host.name': {
           type: 'keyword',
         },
+        'resource.attributes.service.name': {
+          type: 'keyword',
+        },
         'stream.name': {
           type: 'system',
         },