diff --git a/qa/rolling-upgrade/src/test/java/org/elasticsearch/upgrades/IndexingIT.java b/qa/rolling-upgrade/src/test/java/org/elasticsearch/upgrades/IndexingIT.java
index d204244b3ca4f..21367aba17978 100644
--- a/qa/rolling-upgrade/src/test/java/org/elasticsearch/upgrades/IndexingIT.java
+++ b/qa/rolling-upgrade/src/test/java/org/elasticsearch/upgrades/IndexingIT.java
@@ -201,7 +201,7 @@ public void testDateNanosFormatUpgrade() throws IOException {
                 Request index = new Request("POST", "/" + indexName + "/_doc/");
                 XContentBuilder doc = XContentBuilder.builder(XContentType.JSON.xContent())
                     .startObject()
-                    .field("date", "2015-01-01T12:10:30.123Z")
+                    .field("date", "2015-01-01T12:10:30.123456789Z")
                     .field("date_nanos", "2015-01-01T12:10:30.123456789Z")
                     .endObject();
                 index.addParameter("refresh", "true");
diff --git a/qa/smoke-test-ingest-with-all-dependencies/src/test/resources/rest-api-spec/test/ingest/60_pipeline_timestamp_date_mapping.yml b/qa/smoke-test-ingest-with-all-dependencies/src/test/resources/rest-api-spec/test/ingest/60_pipeline_timestamp_date_mapping.yml
index a096814689a64..0f514f2213492 100644
--- a/qa/smoke-test-ingest-with-all-dependencies/src/test/resources/rest-api-spec/test/ingest/60_pipeline_timestamp_date_mapping.yml
+++ b/qa/smoke-test-ingest-with-all-dependencies/src/test/resources/rest-api-spec/test/ingest/60_pipeline_timestamp_date_mapping.yml
@@ -9,7 +9,7 @@
         index: timetest
         body:
           mappings:
-            "properties": { "my_time": {"type": "date_nanos", "format": "strict_date_optional_time_nanos"}}
+            "properties": { "my_time": {"type": "date", "format": "strict_date_optional_time_nanos"}}
 
   - do:
       ingest.put_pipeline:
diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/search.aggregation/49_range_timezone_bug.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/search.aggregation/49_range_timezone_bug.yml
index ddba9d20e83d3..481c32f688be6 100644
--- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/search.aggregation/49_range_timezone_bug.yml
+++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/search.aggregation/49_range_timezone_bug.yml
@@ -8,7 +8,7 @@ setup:
                 mappings:
                     properties:
                         mydate:
-                            type: date_nanos
+                            type: date
                             format: "uuuu-MM-dd'T'HH:mm:ss.SSSSSSSSSZZZZZ"
 
     - do:
diff --git a/server/src/main/java/org/elasticsearch/index/IndexMode.java b/server/src/main/java/org/elasticsearch/index/IndexMode.java
index 1e1064a4a915b..3c7227a7db575 100644
--- a/server/src/main/java/org/elasticsearch/index/IndexMode.java
+++ b/server/src/main/java/org/elasticsearch/index/IndexMode.java
@@ -117,8 +117,7 @@ public void completeMappings(MappingParserContext context, Map<String, Object> m
                         DateFieldMapper.DEFAULT_DATE_TIME_FORMATTER,
                         context.scriptCompiler(),
                         DateFieldMapper.IGNORE_MALFORMED_SETTING.get(context.getSettings()),
-                        context.getIndexSettings().getIndexVersionCreated(),
-                        context.getIndexSettings().getIndex().getName()
+                        context.getIndexSettings().getIndexVersionCreated()
                     )
                 );
             }
diff --git a/server/src/main/java/org/elasticsearch/index/mapper/DateFieldMapper.java b/server/src/main/java/org/elasticsearch/index/mapper/DateFieldMapper.java
index e1176647f19ad..4e07b9bcfb1b1 100644
--- a/server/src/main/java/org/elasticsearch/index/mapper/DateFieldMapper.java
+++ b/server/src/main/java/org/elasticsearch/index/mapper/DateFieldMapper.java
@@ -74,7 +74,6 @@ public final class DateFieldMapper extends FieldMapper {
         "strict_date_optional_time_nanos||epoch_millis"
     );
     private static final DateMathParser EPOCH_MILLIS_PARSER = DateFormatter.forPattern("epoch_millis").toDateMathParser();
-    private final String indexName;
 
     public enum Resolution {
         MILLISECONDS(CONTENT_TYPE, NumericType.DATE) {
@@ -238,7 +237,6 @@ public static class Builder extends FieldMapper.Builder {
         private final Parameter<String> nullValue = Parameter.stringParam("null_value", false, m -> toType(m).nullValueAsString, null)
             .acceptsNull();
         private final Parameter<Boolean> ignoreMalformed;
-        private String indexName;
 
         private final Parameter<Script> script = Parameter.scriptParam(m -> toType(m).script);
         private final Parameter<String> onScriptError = Parameter.onScriptErrorParam(m -> toType(m).onScriptError, script);
@@ -253,15 +251,13 @@ public Builder(
             DateFormatter dateFormatter,
             ScriptCompiler scriptCompiler,
             boolean ignoreMalformedByDefault,
-            Version indexCreatedVersion,
-            String indexName
+            Version indexCreatedVersion
         ) {
             super(name);
             this.resolution = resolution;
             this.indexCreatedVersion = indexCreatedVersion;
             this.scriptCompiler = Objects.requireNonNull(scriptCompiler);
             this.ignoreMalformed = Parameter.boolParam("ignore_malformed", true, m -> toType(m).ignoreMalformed, ignoreMalformedByDefault);
-            this.indexName = indexName;
 
             this.script.precludesParameters(nullValue, ignoreMalformed);
             addScriptValidation(script, index, docValues);
@@ -301,13 +297,12 @@ protected List<Parameter<?>> getParameters() {
             return List.of(index, docValues, store, format, locale, nullValue, ignoreMalformed, script, onScriptError, meta);
         }
 
-        private Long parseNullValue(DateFieldType fieldType, String indexName) {
+        private Long parseNullValue(DateFieldType fieldType) {
             if (nullValue.getValue() == null) {
                 return null;
             }
             try {
-                final String fieldName = fieldType.name();
-                return fieldType.parseNullValueWithDeprecation(nullValue.getValue(), fieldName, indexName);
+                return fieldType.parse(nullValue.getValue());
             } catch (Exception e) {
                 if (indexCreatedVersion.onOrAfter(Version.V_8_0_0)) {
                     throw new MapperParsingException("Error parsing [null_value] on field [" + name() + "]: " + e.getMessage(), e);
@@ -340,7 +335,7 @@ public DateFieldMapper build(MapperBuilderContext context) {
                 meta.getValue()
             );
 
-            Long nullTimestamp = parseNullValue(ft, indexName);
+            Long nullTimestamp = parseNullValue(ft);
             return new DateFieldMapper(name, ft, multiFieldsBuilder.build(this, context), copyTo.build(), nullTimestamp, resolution, this);
         }
     }
@@ -353,8 +348,7 @@ public DateFieldMapper build(MapperBuilderContext context) {
             c.getDateFormatter(),
             c.scriptCompiler(),
             ignoreMalformedByDefault,
-            c.indexVersionCreated(),
-            c.getIndexSettings() != null ? c.getIndexSettings().getIndex().getName() : null
+            c.indexVersionCreated()
         );
     });
 
@@ -366,8 +360,7 @@ public DateFieldMapper build(MapperBuilderContext context) {
             c.getDateFormatter(),
             c.scriptCompiler(),
             ignoreMalformedByDefault,
-            c.indexVersionCreated(),
-            c.getIndexSettings() != null ? c.getIndexSettings().getIndex().getName() : null
+            c.indexVersionCreated()
         );
     });
 
@@ -432,42 +425,7 @@ protected DateMathParser dateMathParser() {
 
         // Visible for testing.
         public long parse(String value) {
-            final Instant instant = getInstant(value);
-            return resolution.convert(instant);
-        }
-
-        public long parseWithDeprecation(String value, String fieldName, String indexName) {
-            final Instant instant = getInstant(value);
-            if (resolution == Resolution.MILLISECONDS && instant.getNano() % 1000000 != 0) {
-                DEPRECATION_LOGGER.warn(
-                    DeprecationCategory.MAPPINGS,
-                    "date_field_with_nanos",
-                    "You are attempting to store a nanosecond resolution on a field [{}] of type date on index [{}]. "
-                        + "The nanosecond part was lost. Use date_nanos field type.",
-                    fieldName,
-                    indexName
-                );
-            }
-            return resolution.convert(instant);
-        }
-
-        public long parseNullValueWithDeprecation(String value, String fieldName, String indexName) {
-            final Instant instant = getInstant(value);
-            if (resolution == Resolution.MILLISECONDS && instant.getNano() % 1000000 != 0) {
-                DEPRECATION_LOGGER.warn(
-                    DeprecationCategory.MAPPINGS,
-                    "date_field_with_nanos",
-                    "You are attempting to set null_value with a nanosecond resolution on a field [{}] of type date on index [{}]. "
-                        + "The nanosecond part was lost. Use date_nanos field type.",
-                    fieldName,
-                    indexName
-                );
-            }
-            return resolution.convert(instant);
-        }
-
-        private Instant getInstant(String value) {
-            return DateFormatters.from(dateTimeFormatter().parse(value), dateTimeFormatter().locale()).toInstant();
+            return resolution.convert(DateFormatters.from(dateTimeFormatter().parse(value), dateTimeFormatter().locale()).toInstant());
         }
 
         /**
@@ -783,14 +741,11 @@ private DateFieldMapper(
         this.script = builder.script.get();
         this.scriptCompiler = builder.scriptCompiler;
         this.scriptValues = builder.scriptValues();
-        this.indexName = builder.indexName;
     }
 
     @Override
     public FieldMapper.Builder getMergeBuilder() {
-        return new Builder(simpleName(), resolution, null, scriptCompiler, ignoreMalformedByDefault, indexCreatedVersion, indexName).init(
-            this
-        );
+        return new Builder(simpleName(), resolution, null, scriptCompiler, ignoreMalformedByDefault, indexCreatedVersion).init(this);
     }
 
     @Override
@@ -815,9 +770,7 @@ protected void parseCreateField(DocumentParserContext context) throws IOExceptio
             timestamp = nullValue;
         } else {
             try {
-                final String fieldName = fieldType().name();
-                final String indexName = context.indexSettings().getIndex().getName();
-                timestamp = fieldType().parseWithDeprecation(dateAsString, fieldName, indexName);
+                timestamp = fieldType().parse(dateAsString);
             } catch (IllegalArgumentException | ElasticsearchParseException | DateTimeException | ArithmeticException e) {
                 if (ignoreMalformed) {
                     context.addIgnoredField(mappedFieldType.name());
diff --git a/server/src/main/java/org/elasticsearch/index/mapper/DynamicFieldsBuilder.java b/server/src/main/java/org/elasticsearch/index/mapper/DynamicFieldsBuilder.java
index 63e7bfdfc97d6..15b0e7a3b2406 100644
--- a/server/src/main/java/org/elasticsearch/index/mapper/DynamicFieldsBuilder.java
+++ b/server/src/main/java/org/elasticsearch/index/mapper/DynamicFieldsBuilder.java
@@ -362,8 +362,7 @@ public void newDynamicDateField(DocumentParserContext context, String name, Date
                     dateTimeFormatter,
                     ScriptCompiler.NONE,
                     ignoreMalformed,
-                    context.indexSettings().getIndexVersionCreated(),
-                    context.indexSettings().getIndex().getName()
+                    context.indexSettings().getIndexVersionCreated()
                 ),
                 context
             );
diff --git a/server/src/test/java/org/elasticsearch/action/admin/indices/rollover/MetadataRolloverServiceTests.java b/server/src/test/java/org/elasticsearch/action/admin/indices/rollover/MetadataRolloverServiceTests.java
index 14d620f88068e..179eee7ed1604 100644
--- a/server/src/test/java/org/elasticsearch/action/admin/indices/rollover/MetadataRolloverServiceTests.java
+++ b/server/src/test/java/org/elasticsearch/action/admin/indices/rollover/MetadataRolloverServiceTests.java
@@ -672,8 +672,7 @@ public void testRolloverClusterStateForDataStream() throws Exception {
                 null,
                 ScriptCompiler.NONE,
                 false,
-                Version.CURRENT,
-                "indexName"
+                Version.CURRENT
             ).build(MapperBuilderContext.ROOT);
             ClusterService clusterService = ClusterServiceUtils.createClusterService(testThreadPool);
             Environment env = mock(Environment.class);
@@ -688,8 +687,7 @@ public void testRolloverClusterStateForDataStream() throws Exception {
                     DateFieldMapper.DEFAULT_DATE_TIME_FORMATTER,
                     ScriptCompiler.NONE,
                     true,
-                    Version.CURRENT,
-                    "indexName"
+                    Version.CURRENT
                 )
             );
             MetadataFieldMapper dtfm = getDataStreamTimestampFieldMapper();
diff --git a/server/src/test/java/org/elasticsearch/index/mapper/DateFieldMapperTests.java b/server/src/test/java/org/elasticsearch/index/mapper/DateFieldMapperTests.java
index c1036a946a88f..8f79ab289794d 100644
--- a/server/src/test/java/org/elasticsearch/index/mapper/DateFieldMapperTests.java
+++ b/server/src/test/java/org/elasticsearch/index/mapper/DateFieldMapperTests.java
@@ -8,7 +8,6 @@
 
 package org.elasticsearch.index.mapper;
 
-import org.apache.logging.log4j.Level;
 import org.apache.lucene.index.DocValuesType;
 import org.apache.lucene.index.IndexableField;
 import org.elasticsearch.Version;
@@ -140,22 +139,6 @@ public void testIgnoreMalformed() throws IOException {
         testIgnoreMalformedForValue("-522000000", "long overflow", "date_optional_time");
     }
 
-    public void testResolutionLossDeprecation() throws Exception {
-        DocumentMapper mapper = createDocumentMapper(fieldMapping(b -> b.field("type", "date")));
-
-        ParsedDocument doc = mapper.parse(source(b -> b.field("field", "2018-10-03T14:42:44.123456+0000")));
-
-        assertWarnings(
-            true,
-            new DeprecationWarning(
-                Level.WARN,
-                "You are attempting to store a nanosecond resolution "
-                    + "on a field [field] of type date on index [index]. "
-                    + "The nanosecond part was lost. Use date_nanos field type."
-            )
-        );
-    }
-
     private void testIgnoreMalformedForValue(String value, String expectedCause, String dateFormat) throws IOException {
 
         DocumentMapper mapper = createDocumentMapper(fieldMapping((builder) -> dateFieldMapping(builder, dateFormat)));
@@ -419,11 +402,11 @@ public void testFetchMillisFromIso8601() throws IOException {
     }
 
     public void testFetchMillisFromIso8601Nanos() throws IOException {
-        assertFetch(dateNanosMapperService(), "field", randomIs8601Nanos(MAX_NANOS), null);
+        assertFetch(dateMapperService(), "field", randomIs8601Nanos(MAX_ISO_DATE), null);
     }
 
     public void testFetchMillisFromIso8601NanosFormatted() throws IOException {
-        assertFetch(dateNanosMapperService(), "field", randomIs8601Nanos(MAX_NANOS), "strict_date_optional_time_nanos");
+        assertFetch(dateMapperService(), "field", randomIs8601Nanos(MAX_ISO_DATE), "strict_date_optional_time_nanos");
     }
 
     /**
@@ -434,8 +417,7 @@ public void testFetchMillisFromIso8601NanosFormatted() throws IOException {
      * way.
      */
     public void testFetchMillisFromRoundedNanos() throws IOException {
-        assertFetch(dateMapperService(), "field", randomDecimalMillis(MAX_ISO_DATE), null);
-        assertFetch(dateNanosMapperService(), "field", randomDecimalNanos(MAX_NANOS), null);
+        assertFetch(dateMapperService(), "field", randomDecimalNanos(MAX_ISO_DATE), null);
     }
 
     /**
@@ -543,7 +525,7 @@ protected Object generateRandomInputValue(MappedFieldType ft) {
         switch (((DateFieldType) ft).resolution()) {
             case MILLISECONDS:
                 if (randomBoolean()) {
-                    return randomDecimalMillis(MAX_ISO_DATE);
+                    return randomIs8601Nanos(MAX_ISO_DATE);
                 }
                 return randomLongBetween(0, Long.MAX_VALUE);
             case NANOSECONDS:
@@ -576,10 +558,6 @@ private String randomDecimalNanos(long maxMillis) {
         return Long.toString(randomLongBetween(0, maxMillis)) + "." + between(0, 999999);
     }
 
-    private String randomDecimalMillis(long maxMillis) {
-        return Long.toString(randomLongBetween(0, maxMillis));
-    }
-
     public void testScriptAndPrecludedParameters() {
         {
             Exception e = expectThrows(MapperParsingException.class, () -> createDocumentMapper(fieldMapping(b -> {
diff --git a/x-pack/plugin/data-streams/qa/rest/src/yamlRestTest/java/org/elasticsearch/xpack/datastreams/AutoCreateDataStreamIT.java b/x-pack/plugin/data-streams/qa/rest/src/yamlRestTest/java/org/elasticsearch/xpack/datastreams/AutoCreateDataStreamIT.java
index ed8106b3c119c..5ed96c5633200 100644
--- a/x-pack/plugin/data-streams/qa/rest/src/yamlRestTest/java/org/elasticsearch/xpack/datastreams/AutoCreateDataStreamIT.java
+++ b/x-pack/plugin/data-streams/qa/rest/src/yamlRestTest/java/org/elasticsearch/xpack/datastreams/AutoCreateDataStreamIT.java
@@ -14,7 +14,6 @@
 import org.elasticsearch.client.ResponseException;
 import org.elasticsearch.common.Strings;
 import org.elasticsearch.common.io.Streams;
-import org.elasticsearch.common.time.DateFormatter;
 import org.elasticsearch.test.rest.ESRestTestCase;
 import org.elasticsearch.xcontent.XContentBuilder;
 import org.elasticsearch.xcontent.json.JsonXContent;
@@ -102,9 +101,7 @@ private void createTemplateWithAllowAutoCreate(Boolean allowAutoCreate) throws I
 
     private Response indexDocument() throws IOException {
         final Request indexDocumentRequest = new Request("POST", "recipe_kr/_doc");
-        final Instant now = Instant.now();
-        final String time = DateFormatter.forPattern("strict_date_optional_time").format(now);
-        indexDocumentRequest.setJsonEntity("{ \"@timestamp\": \"" + time + "\", \"name\": \"Kimchi\" }");
+        indexDocumentRequest.setJsonEntity("{ \"@timestamp\": \"" + Instant.now() + "\", \"name\": \"Kimchi\" }");
         return client().performRequest(indexDocumentRequest);
     }
 }
diff --git a/x-pack/plugin/ml/qa/single-node-tests/src/javaRestTest/java/org/elasticsearch/xpack/ml/transforms/PainlessDomainSplitIT.java b/x-pack/plugin/ml/qa/single-node-tests/src/javaRestTest/java/org/elasticsearch/xpack/ml/transforms/PainlessDomainSplitIT.java
index 6fc65c99cd7ab..b26d9f5dd6405 100644
--- a/x-pack/plugin/ml/qa/single-node-tests/src/javaRestTest/java/org/elasticsearch/xpack/ml/transforms/PainlessDomainSplitIT.java
+++ b/x-pack/plugin/ml/qa/single-node-tests/src/javaRestTest/java/org/elasticsearch/xpack/ml/transforms/PainlessDomainSplitIT.java
@@ -12,7 +12,6 @@
 import org.elasticsearch.cluster.metadata.IndexMetadata;
 import org.elasticsearch.common.Strings;
 import org.elasticsearch.common.settings.Settings;
-import org.elasticsearch.common.time.DateFormatter;
 import org.elasticsearch.test.rest.ESRestTestCase;
 
 import java.time.ZoneOffset;
@@ -309,7 +308,7 @@ public void testHRDSplit() throws Exception {
 
         for (int i = 1; i <= 100; i++) {
             ZonedDateTime time = baseTime.plusHours(i);
-            String formattedTime = DateFormatter.forPattern("strict_date_optional_time").format(time);
+            String formattedTime = time.format(DateTimeFormatter.ISO_DATE_TIME);
             if (i % 50 == 0) {
                 // Anomaly has 100 docs, but we don't care about the value
                 for (int j = 0; j < 100; j++) {
diff --git a/x-pack/plugin/transform/qa/multi-cluster-tests-with-security/src/test/resources/rest-api-spec/test/multi_cluster/80_transform.yml b/x-pack/plugin/transform/qa/multi-cluster-tests-with-security/src/test/resources/rest-api-spec/test/multi_cluster/80_transform.yml
index 4bf9247fdf9d0..cafa1fc384d06 100644
--- a/x-pack/plugin/transform/qa/multi-cluster-tests-with-security/src/test/resources/rest-api-spec/test/multi_cluster/80_transform.yml
+++ b/x-pack/plugin/transform/qa/multi-cluster-tests-with-security/src/test/resources/rest-api-spec/test/multi_cluster/80_transform.yml
@@ -210,8 +210,8 @@ teardown:
             test_alias: {}
           mappings:
             properties:
-              date:
-                type: date_nanos
+              time:
+                type: date
               user:
                 type: keyword
               stars:
diff --git a/x-pack/plugin/transform/qa/multi-cluster-tests-with-security/src/test/resources/rest-api-spec/test/remote_cluster/80_transform.yml b/x-pack/plugin/transform/qa/multi-cluster-tests-with-security/src/test/resources/rest-api-spec/test/remote_cluster/80_transform.yml
index 1cc9112508dfd..c550f148f956b 100644
--- a/x-pack/plugin/transform/qa/multi-cluster-tests-with-security/src/test/resources/rest-api-spec/test/remote_cluster/80_transform.yml
+++ b/x-pack/plugin/transform/qa/multi-cluster-tests-with-security/src/test/resources/rest-api-spec/test/remote_cluster/80_transform.yml
@@ -48,8 +48,8 @@ teardown:
             test_alias: {}
           mappings:
             properties:
-              date:
-                type: date_nanos
+              time:
+                type: date
               user:
                 type: keyword
               stars:
@@ -107,8 +107,8 @@ teardown:
             test_alias: {}
           mappings:
             properties:
-              date:
-                type: date_nanos
+              time:
+                type: date
               user:
                 type: keyword
               stars:
diff --git a/x-pack/plugin/transform/qa/multi-node-tests/src/javaRestTest/java/org/elasticsearch/xpack/transform/integration/continuous/TransformContinuousIT.java b/x-pack/plugin/transform/qa/multi-node-tests/src/javaRestTest/java/org/elasticsearch/xpack/transform/integration/continuous/TransformContinuousIT.java
index 65ce62f35dd22..a195cd8afeba4 100644
--- a/x-pack/plugin/transform/qa/multi-node-tests/src/javaRestTest/java/org/elasticsearch/xpack/transform/integration/continuous/TransformContinuousIT.java
+++ b/x-pack/plugin/transform/qa/multi-node-tests/src/javaRestTest/java/org/elasticsearch/xpack/transform/integration/continuous/TransformContinuousIT.java
@@ -34,7 +34,6 @@
 import org.elasticsearch.common.Strings;
 import org.elasticsearch.common.bytes.BytesReference;
 import org.elasticsearch.common.settings.Settings;
-import org.elasticsearch.common.time.DateFormatter;
 import org.elasticsearch.common.util.concurrent.ThreadContext;
 import org.elasticsearch.common.xcontent.support.XContentMapValues;
 import org.elasticsearch.core.TimeValue;
@@ -193,7 +192,8 @@ public void testContinousEvents() throws Exception {
         for (int i = 0; i < 100; i++) {
             dates.add(
                 // create a random date between 1/1/2001 and 1/1/2006
-                formatTimestmap(dateType).format(Instant.ofEpochMilli(randomLongBetween(978307200000L, 1136073600000L)))
+                ContinuousTestCase.STRICT_DATE_OPTIONAL_TIME_PRINTER_NANOS.withZone(ZoneId.of("UTC"))
+                    .format(Instant.ofEpochMilli(randomLongBetween(978307200000L, 1136073600000L)))
             );
         }
 
@@ -247,18 +247,16 @@ public void testContinousEvents() throws Exception {
                 }
 
                 // simulate a different timestamp that is off from the timestamp used for sync, so it can fall into the previous bucket
-                String metricDateString = formatTimestmap(dateType).format(
-                    runDate.minusSeconds(randomIntBetween(0, 2)).plusNanos(randomIntBetween(0, 999999))
-                );
+                String metricDateString = ContinuousTestCase.STRICT_DATE_OPTIONAL_TIME_PRINTER_NANOS.withZone(ZoneId.of("UTC"))
+                    .format(runDate.minusSeconds(randomIntBetween(0, 2)).plusNanos(randomIntBetween(0, 999999)));
                 source.append("\"metric-timestamp\":\"").append(metricDateString).append("\",");
 
-                final Instant timestamp = runDate.plusNanos(randomIntBetween(0, 999999));
-                String dateString = formatTimestmap(dateType).format(timestamp);
+                String dateString = ContinuousTestCase.STRICT_DATE_OPTIONAL_TIME_PRINTER_NANOS.withZone(ZoneId.of("UTC"))
+                    .format(runDate.plusNanos(randomIntBetween(0, 999999)));
 
                 source.append("\"timestamp\":\"").append(dateString).append("\",");
                 // for data streams
-                // dynamic field results in a date type
-                source.append("\"@timestamp\":\"").append(formatTimestmap("date").format(timestamp)).append("\",");
+                source.append("\"@timestamp\":\"").append(dateString).append("\",");
                 source.append("\"run\":").append(run);
                 source.append("}");
 
@@ -301,14 +299,6 @@ public void testContinousEvents() throws Exception {
         }
     }
 
-    private DateFormatter formatTimestmap(String dateType) {
-        if (dateType == "date_nanos") {
-            return DateFormatter.forPattern("strict_date_optional_time_nanos").withZone(ZoneId.of("UTC"));
-        } else {
-            return DateFormatter.forPattern("strict_date_optional_time").withZone(ZoneId.of("UTC"));
-        }
-    }
-
     /**
      * Create the transform source index with randomized settings to increase test coverage, for example
      * index sorting, triggers query optimizations.