diff --git a/sys-cluster/nanos6/metadata.xml b/sys-cluster/nanos6/metadata.xml
index 0245bbc23a..586d1fd6f3 100644
--- a/sys-cluster/nanos6/metadata.xml
+++ b/sys-cluster/nanos6/metadata.xml
@@ -10,12 +10,12 @@
 		<remote-id type="github">bsc-pm/nanos6</remote-id>
 	</upstream>
 	<use>
+		<flag name="ctf2prv">Build ctf2prv fast converter</flag>
 		<!--<flag name="cuda">enable CUDA</flag>-->
 		<flag name="debug">enable extra assertions and checks in debug - may cause significant slowdown</flag>
 		<flag name="dlb">enable dynamic management and sharing of computing resources</flag>
 		<flag name="execution-workflow">Enable execution using the Execution Workflow</flag>
 		<flag name="extrae">to generate execution traces for offline performance analysis with paraver</flag>
-		<!--<flag name="jemalloc">use jemalloc as the default memory allocator, providing better performance than the default glibc implementation</flag>-->
 		<flag name="memkind">Add support for <pkg>dev-libs/memkind</pkg> in memory allocator</flag>
 		<flag name="mercurium">Enable <pkg>sys-cluster/mcxx</pkg> support</flag>
 		<flag name="papi">enable <pkg>dev-libs/papi</pkg> support</flag>
diff --git a/sys-cluster/nanos6/nanos6-2.6-r4.ebuild b/sys-cluster/nanos6/nanos6-2.6-r4.ebuild
index dca1a609a7..0def7bb68a 100644
--- a/sys-cluster/nanos6/nanos6-2.6-r4.ebuild
+++ b/sys-cluster/nanos6/nanos6-2.6-r4.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}/${PN}-version-${PV}"
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64"
-IUSE="babeltrace debug dlb execution-workflow extrae memkind mercurium papi pqos test unwind"
+IUSE="ctf2prv debug dlb execution-workflow extrae memkind mercurium papi pqos test unwind"
 #jemalloc require custom jemalloc
 #TODO: cuda
 #TODO: llvm-libunwind
@@ -24,7 +24,7 @@ RDEPEND="
 	sys-process/numactl
 	virtual/libelf
 
-	babeltrace? ( dev-util/babeltrace2 )
+	ctf2prv? ( dev-util/babeltrace2 )
 	dlb? ( sys-cluster/dlb )
 	extrae? ( sys-cluster/extrae[nanos] )
 	memkind? ( dev-libs/memkind )
@@ -39,7 +39,6 @@ PATCHES=( "${FILESDIR}/${P}-include-string.patch" )
 RESTRICT="!test? ( test )"
 REQUIRED_USE="test? ( !mercurium )" # https://github.com/bsc-pm/nanos6/issues/3
 
-
 src_prepare() {
 	default
 	eautoreconf
@@ -68,7 +67,7 @@ src_configure() {
 	use memkind && myconf+=( "--with-memkind=${EPREFIX}/usr" )
 	use pqos && myconf+=( "--with-pqos=${EPREFIX}/usr" )
 
-	if use babeltrace; then
+	if use ctf2prv; then
 		myconf+=( "--with-babeltrace2=${EPREFIX}/usr" )
 	else
 		myconf+=( "--without-babeltrace2" )