diff --git a/ecs/command/fields/custom/command.yml b/ecs/command/fields/custom/command.yml
index 77d3427b2b7c4..fdf4054ccb492 100644
--- a/ecs/command/fields/custom/command.yml
+++ b/ecs/command/fields/custom/command.yml
@@ -68,12 +68,12 @@
       description: >
         Result data returned by the target.
     - name: request_id
-      type: short
+      type: keyword
       level: custom
       description: >
-        Unique identifier generated by the Command Manager. Auto-incremental.
+        Unique identifier generated by the Command Manager. UUID.
     - name: order_id
-      type: short
+      type: keyword
       level: custom
       description: >
-        Unique identifier generated by the Command Manager. Auto-incremental within the same Command Request ID.
+        Unique identifier generated by the Command Manager. UUID.