diff --git a/xprof/xprof.rb.in b/xprof/xprof.rb.in
index e66015e4..7857b9a1 100755
--- a/xprof/xprof.rb.in
+++ b/xprof/xprof.rb.in
@@ -448,7 +448,6 @@ def enable_events_ze(channel_name, tracing_mode: 'default', profiling: true)
     #   https://lttng.org/man/1/lttng-enable-event/v2.8/#doc-_understanding_event_rule_conditions
     # Disable-event doesn't have wildcards
     # So we enable and disable on the same line
-    exec("#{lttng_enable} lttng_ust_ze_build:log*")
     exec("#{lttng_enable} lttng_ust_ze_profiling:*") if profiling
     exec("#{lttng_enable} lttng_ust_zex:*")
     exec("#{lttng_enable} lttng_ust_ze_properties:*")
@@ -474,10 +473,10 @@ def enable_events_cl(channel_name, tracing_mode: 'default', profiling: true)
     exec("#{lttng_enable} lttng_ust_opencl_arguments:*")
     exec("#{lttng_enable} lttng_ust_opencl_build:infos*")
   when 'default'
-    exec("#{lttng_enable} lttng_ust_opencl_profiling:*") if profiling
-    exec("#{lttng_enable} lttng_ust_opencl_devices:*")
-    exec("#{lttng_enable} lttng_ust_opencl_arguments:*")
-    exec("#{lttng_enable} lttng_ust_opencl_build:infos*")
+    if profiling
+      exec("#{lttng_enable} lttng_ust_opencl_profiling:*")
+      exec("#{lttng_enable} lttng_ust_opencl_arguments:kernel_info")
+    end
     # Wildcard using the * character are supported at the end of tracepoint names.
     #   https://lttng.org/man/1/lttng-enable-event/v2.8/#doc-_understanding_event_rule_conditions
     # Disable-event doesn't have wildcards