diff --git a/level_zero/core/source/cmdlist/cmdlist.h b/level_zero/core/source/cmdlist/cmdlist.h
index f71388f33c..7021c717ae 100644
--- a/level_zero/core/source/cmdlist/cmdlist.h
+++ b/level_zero/core/source/cmdlist/cmdlist.h
@@ -81,8 +81,8 @@ struct CommandList : _ze_command_list_handle_t {
         void *pCommand = nullptr;
         CommandType type = Invalid;
     };
-    using CommandsToPatch = std::vector<CommandToPatch>;
-    using CmdListReturnPoints = std::vector<CmdListReturnPoint>;
+    using CommandsToPatch = StackVec<CommandToPatch, 16>;
+    using CmdListReturnPoints = StackVec<CmdListReturnPoint, 32>;
 
     virtual ze_result_t close() = 0;
     virtual ze_result_t destroy() = 0;