diff --git a/projects/rocprofiler-systems/external/timemory b/projects/rocprofiler-systems/external/timemory
index 69a6c7ad9d..05438aaf0f 160000
--- a/projects/rocprofiler-systems/external/timemory
+++ b/projects/rocprofiler-systems/external/timemory
@@ -1 +1 @@
-Subproject commit 69a6c7ad9df7c7fc6a1d275a506d6c0a71692c66
+Subproject commit 05438aaf0fd21aa75a237239f641d849e1d21bc0
diff --git a/projects/rocprofiler-systems/source/lib/omnitrace/library/components/category_region.hpp b/projects/rocprofiler-systems/source/lib/omnitrace/library/components/category_region.hpp
index b7c6699c09..140f3cc0c3 100644
--- a/projects/rocprofiler-systems/source/lib/omnitrace/library/components/category_region.hpp
+++ b/projects/rocprofiler-systems/source/lib/omnitrace/library/components/category_region.hpp
@@ -248,10 +248,10 @@ void
 category_region<CategoryT>::audit(const gotcha_data_t& _data, audit::incoming,
                                   Args&&... _args)
 {
-    start<OptsT...>(
-        _data.tool_id.c_str(), "args",
-        JOIN(", ",
-             JOIN('=', tim::try_demangle<std::remove_reference_t<Args>>(), _args)...));
+    start<OptsT...>(_data.tool_id.c_str(), [&](perfetto::EventContext ctx) {
+        OMNITRACE_FOLD_EXPRESSION(tracing::add_perfetto_annotation(
+            ctx, tim::try_demangle<std::remove_reference_t<Args>>(), _args));
+    });
 }
 
 template <typename CategoryT>
@@ -269,10 +269,10 @@ void
 category_region<CategoryT>::audit(std::string_view _name, audit::incoming,
                                   Args&&... _args)
 {
-    start<OptsT...>(
-        _name.data(), "args",
-        JOIN(", ",
-             JOIN('=', tim::try_demangle<std::remove_reference_t<Args>>(), _args)...));
+    start<OptsT...>(_name.data(), [&](perfetto::EventContext ctx) {
+        OMNITRACE_FOLD_EXPRESSION(tracing::add_perfetto_annotation(
+            ctx, tim::try_demangle<std::remove_reference_t<Args>>(), _args));
+    });
 }
 
 template <typename CategoryT>
diff --git a/projects/rocprofiler-systems/source/lib/omnitrace/library/concepts.hpp b/projects/rocprofiler-systems/source/lib/omnitrace/library/concepts.hpp
index 1440ec90f0..5b0dbf48bd 100644
--- a/projects/rocprofiler-systems/source/lib/omnitrace/library/concepts.hpp
+++ b/projects/rocprofiler-systems/source/lib/omnitrace/library/concepts.hpp
@@ -64,5 +64,22 @@ struct is_optional : std::false_type
 template <typename Tp>
 struct is_optional<std::optional<Tp>> : std::true_type
 {};
+
+template <typename Tp>
+struct can_stringify
+{
+private:
+    static constexpr auto sfinae(int)
+        -> decltype(std::declval<std::ostream&>() << std::declval<Tp>(), bool())
+    {
+        return true;
+    }
+
+    static constexpr auto sfinae(long) { return false; }
+
+public:
+    static constexpr bool value = sfinae(0);
+    constexpr auto        operator()() const { return sfinae(0); }
+};
 }  // namespace concepts
 }  // namespace tim
diff --git a/projects/rocprofiler-systems/source/lib/omnitrace/library/tracing.hpp b/projects/rocprofiler-systems/source/lib/omnitrace/library/tracing.hpp
index 9f5f4c1a67..c9773d1e42 100644
--- a/projects/rocprofiler-systems/source/lib/omnitrace/library/tracing.hpp
+++ b/projects/rocprofiler-systems/source/lib/omnitrace/library/tracing.hpp
@@ -23,6 +23,7 @@
 #pragma once
 
 #include "library/common.hpp"
+#include "library/concepts.hpp"
 #include "library/config.hpp"
 #include "library/debug.hpp"
 #include "library/defines.hpp"
@@ -34,6 +35,8 @@
 
 #include <timemory/components/timing/backends.hpp>
 
+#include <type_traits>
+
 namespace omnitrace
 {
 namespace tracing
@@ -194,13 +197,74 @@ pop_timemory(CategoryT, const char* name, Args&&... args)
     }
 }
 
+template <typename Np, typename Tp>
+auto
+add_perfetto_annotation(perfetto::EventContext& ctx, Np&& _name, Tp&& _val)
+{
+    using named_type = std::remove_reference_t<std::remove_cv_t<std::decay_t<Np>>>;
+    using value_type = std::remove_reference_t<std::remove_cv_t<std::decay_t<Tp>>>;
+
+    static_assert(concepts::is_string_type<named_type>::value,
+                  "Error! name is not a string type");
+
+    auto _get_dbg = [&]() {
+        auto* _dbg = ctx.event()->add_debug_annotations();
+        _dbg->set_name(std::string_view{ std::forward<Np>(_name) }.data());
+        return _dbg;
+    };
+
+    if constexpr(std::is_same<value_type, std::string_view>::value)
+    {
+        _get_dbg()->set_string_value(_val.data());
+    }
+    else if constexpr(concepts::is_string_type<value_type>::value)
+    {
+        _get_dbg()->set_string_value(std::forward<Tp>(_val));
+    }
+    else if constexpr(std::is_same<value_type, bool>::value)
+    {
+        _get_dbg()->set_bool_value(std::forward<Tp>(_val));
+    }
+    else if constexpr(std::is_enum<value_type>::value)
+    {
+        _get_dbg()->set_int_value(static_cast<int64_t>(std::forward<Tp>(_val)));
+    }
+    else if constexpr(std::is_floating_point<value_type>::value)
+    {
+        _get_dbg()->set_double_value(std::forward<Tp>(_val));
+    }
+    else if constexpr(std::is_integral<value_type>::value)
+    {
+        if constexpr(std::is_unsigned<value_type>::value)
+        {
+            _get_dbg()->set_uint_value(std::forward<Tp>(_val));
+        }
+        else
+        {
+            _get_dbg()->set_int_value(std::forward<Tp>(_val));
+        }
+    }
+    else if constexpr(std::is_pointer<value_type>::value)
+    {
+        _get_dbg()->set_pointer_value(reinterpret_cast<uint64_t>(std::forward<Tp>(_val)));
+    }
+    else if constexpr(concepts::can_stringify<value_type>::value)
+    {
+        _get_dbg()->set_string_value(JOIN("", std::forward<Tp>(_val)));
+    }
+    else
+    {
+        static_assert(std::is_empty<value_type>::value, "Error! unsupported data type");
+    }
+}
+
 template <typename CategoryT, typename... Args>
 inline void
 push_perfetto(CategoryT, const char* name, Args&&... args)
 {
     uint64_t _ts = comp::wall_clock::record();
     TRACE_EVENT_BEGIN(trait::name<CategoryT>::value, perfetto::StaticString(name), _ts,
-                      std::forward<Args>(args)..., "begin_ns", _ts);
+                      "begin_ns", _ts, std::forward<Args>(args)...);
 }
 
 template <typename CategoryT, typename... Args>
@@ -208,8 +272,8 @@ inline void
 pop_perfetto(CategoryT, const char*, Args&&... args)
 {
     uint64_t _ts = comp::wall_clock::record();
-    TRACE_EVENT_END(trait::name<CategoryT>::value, _ts, std::forward<Args>(args)...,
-                    "end_ns", _ts);
+    TRACE_EVENT_END(trait::name<CategoryT>::value, _ts, "end_ns", _ts,
+                    std::forward<Args>(args)...);
 }
 
 template <typename CategoryT, typename... Args>