diff --git a/x-pack/plugins/apm/common/agent_configuration/runtime_types/duration_rt.test.ts b/x-pack/plugins/apm/common/agent_configuration/runtime_types/duration_rt.test.ts
index 6b81031542c34..a83ee9262cad6 100644
--- a/x-pack/plugins/apm/common/agent_configuration/runtime_types/duration_rt.test.ts
+++ b/x-pack/plugins/apm/common/agent_configuration/runtime_types/duration_rt.test.ts
@@ -25,7 +25,7 @@ describe('durationRt', () => {
   });
 
   describe('It should accept', () => {
-    ['1s', '2m', '3h'].map(input => {
+    ['1000ms', '2s', '3m'].map(input => {
       it(`${JSON.stringify(input)}`, () => {
         expect(isRight(durationRt.decode(input))).toBe(true);
       });
diff --git a/x-pack/plugins/apm/common/agent_configuration/runtime_types/duration_rt.ts b/x-pack/plugins/apm/common/agent_configuration/runtime_types/duration_rt.ts
index 99e6a57089dee..383fd69be9a78 100644
--- a/x-pack/plugins/apm/common/agent_configuration/runtime_types/duration_rt.ts
+++ b/x-pack/plugins/apm/common/agent_configuration/runtime_types/duration_rt.ts
@@ -8,7 +8,7 @@ import * as t from 'io-ts';
 import { either } from 'fp-ts/lib/Either';
 import { amountAndUnitToObject } from '../amount_and_unit';
 
-export const DURATION_UNITS = ['s', 'm', 'h'];
+export const DURATION_UNITS = ['ms', 's', 'm'];
 
 export const durationRt = new t.Type<string, string, unknown>(
   'durationRt',
diff --git a/x-pack/plugins/apm/common/agent_configuration/setting_definitions/__snapshots__/index.test.ts.snap b/x-pack/plugins/apm/common/agent_configuration/setting_definitions/__snapshots__/index.test.ts.snap
index 0c585bec22f6c..81adf76ac4ce9 100644
--- a/x-pack/plugins/apm/common/agent_configuration/setting_definitions/__snapshots__/index.test.ts.snap
+++ b/x-pack/plugins/apm/common/agent_configuration/setting_definitions/__snapshots__/index.test.ts.snap
@@ -17,9 +17,9 @@ Array [
     "key": "api_request_time",
     "type": "duration",
     "units": Array [
+      "ms",
       "s",
       "m",
-      "h",
     ],
     "validationError": "Please specify an integer and a unit",
     "validationName": "durationRt",
@@ -82,9 +82,9 @@ Array [
     "key": "profiling_inferred_spans_min_duration",
     "type": "duration",
     "units": Array [
+      "ms",
       "s",
       "m",
-      "h",
     ],
     "validationError": "Please specify an integer and a unit",
     "validationName": "durationRt",
@@ -93,9 +93,9 @@ Array [
     "key": "profiling_inferred_spans_sampling_interval",
     "type": "duration",
     "units": Array [
+      "ms",
       "s",
       "m",
-      "h",
     ],
     "validationError": "Please specify an integer and a unit",
     "validationName": "durationRt",
@@ -109,9 +109,9 @@ Array [
     "key": "server_timeout",
     "type": "duration",
     "units": Array [
+      "ms",
       "s",
       "m",
-      "h",
     ],
     "validationError": "Please specify an integer and a unit",
     "validationName": "durationRt",
@@ -120,9 +120,9 @@ Array [
     "key": "span_frames_min_duration",
     "type": "duration",
     "units": Array [
+      "ms",
       "s",
       "m",
-      "h",
     ],
     "validationError": "Please specify an integer and a unit",
     "validationName": "durationRt",
@@ -137,9 +137,9 @@ Array [
     "key": "stress_monitor_cpu_duration_threshold",
     "type": "duration",
     "units": Array [
+      "ms",
       "s",
       "m",
-      "h",
     ],
     "validationError": "Please specify an integer and a unit",
     "validationName": "durationRt",