diff --git a/source/include/rocprofiler-sdk/hip/api_args.h b/source/include/rocprofiler-sdk/hip/api_args.h
index b86105c77d..75808bd2dc 100644
--- a/source/include/rocprofiler-sdk/hip/api_args.h
+++ b/source/include/rocprofiler-sdk/hip/api_args.h
@@ -2778,12 +2778,17 @@ typedef union rocprofiler_hip_api_args_t
     } hipGetStreamDeviceId;
     struct
     {
-        hipGraphNode_t*               phGraphNode;
-        hipGraph_t                    hGraph;
-        const hipGraphNode_t*         dependencies;
-        size_t                        numDependencies;
+        hipGraphNode_t*       phGraphNode;
+        hipGraph_t            hGraph;
+        const hipGraphNode_t* dependencies;
+        size_t                numDependencies;
+#if HIP_RUNTIME_API_TABLE_STEP_VERSION < 12
         const HIP_MEMSET_NODE_PARAMS* memsetParams;
-        hipCtx_t                      ctx;
+#endif
+#if HIP_RUNTIME_API_TABLE_STEP_VERSION >= 12
+        const hipMemsetParams* memsetParams;
+#endif
+        hipCtx_t ctx;
     } hipDrvGraphAddMemsetNode;
     struct
     {
@@ -2964,10 +2969,15 @@ typedef union rocprofiler_hip_api_args_t
     } hipDrvGraphExecMemcpyNodeSetParams;
     struct
     {
-        hipGraphExec_t                hGraphExec;
-        hipGraphNode_t                hNode;
+        hipGraphExec_t hGraphExec;
+        hipGraphNode_t hNode;
+#    if HIP_RUNTIME_API_TABLE_STEP_VERSION < 12
         const HIP_MEMSET_NODE_PARAMS* memsetParams;
-        hipCtx_t                      ctx;
+#    endif
+#    if HIP_RUNTIME_API_TABLE_STEP_VERSION >= 12
+        const hipMemsetParams* memsetParams;
+#    endif
+        hipCtx_t ctx;
     } hipDrvGraphExecMemsetNodeSetParams;
     struct
     {
diff --git a/source/lib/rocprofiler-sdk/hip/details/format.hpp b/source/lib/rocprofiler-sdk/hip/details/format.hpp
index 6ddd1d5cb7..e91b3169c3 100644
--- a/source/lib/rocprofiler-sdk/hip/details/format.hpp
+++ b/source/lib/rocprofiler-sdk/hip/details/format.hpp
@@ -152,6 +152,7 @@ ROCP_SDK_HIP_FORMATTER(hipGraphEdgeData,
                        v.to_port,
                        v.type,
                        '}')
+#if HIP_RUNTIME_API_TABLE_STEP_VERSION < 12
 ROCP_SDK_HIP_FORMATTER(HIP_MEMSET_NODE_PARAMS,
                        "{}dst={}, pitch={}, value={}, elementSize={}, width={}, height={}{}",
                        '{',
@@ -162,6 +163,7 @@ ROCP_SDK_HIP_FORMATTER(HIP_MEMSET_NODE_PARAMS,
                        v.width,
                        v.height,
                        '}')
+#endif
 ROCP_SDK_HIP_FORMATTER(hipMemLocation, "{}type={}, id={}{}", '{', v.type, v.id, '}')
 #if HIP_RUNTIME_API_TABLE_STEP_VERSION >= 7
 ROCP_SDK_HIP_FORMATTER(