diff --git a/sys-cluster/TCL/TCL-1.0.ebuild b/sys-cluster/TCL/TCL-1.0.ebuild
index a09aeaf0eb..b4eb7020d0 100644
--- a/sys-cluster/TCL/TCL-1.0.ebuild
+++ b/sys-cluster/TCL/TCL-1.0.ebuild
@@ -12,7 +12,13 @@ SRC_URI="https://github.com/bsc-pm/TCL/archive/refs/tags/v${PV}.tar.gz -> ${P}.t
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64"
-IUSE="debug fti instrumentation scr veloc"
+IUSE_TCL="
+	tcl-debug
+	tcl-instrumentation
+	tcl-instrumentation-debug
+"
+USE_EXPAND="TCL"
+IUSE="${IUSE_TCL} fti scr veloc"
 
 RDEPEND="
 	virtual/mpi
@@ -22,7 +28,11 @@ RDEPEND="
 	veloc? ( sys-cluster/veloc )
 "
 DEPEND="${RDEPEND}"
-REQUIRED_USE="|| ( fti scr veloc )"
+
+REQUIRED_USE="
+	|| ( fti scr veloc )
+	|| ( ${IUSE_TCL//+/} )
+"
 
 src_prepare() {
 	default
@@ -36,15 +46,11 @@ src_configure() {
 		--includedir="${EPREFIX}/usr/include/TCL"
 		--with-mpi="${EPREFIX}/usr"
 
-		$(use_enable debug)
-		$(use_enable instrumentation)
+		$(use_enable tcl-debug debug)
+		$(use_enable tcl-instrumentation instrumentation)
+		$(use_enable tcl-instrumentation-debug instrumentation-debug)
 	)
 
-	if use debug && use instrumentation; then
-		myconf+=( "--enable-instrumentation-debug" )
-	else
-		myconf+=( "--disable-instrumentation-debug" )
-	fi
 	if use fti; then
 		myconf+=( "--with-fti=${EPREFIX}/usr" )
 	else
diff --git a/sys-cluster/TCL/metadata.xml b/sys-cluster/TCL/metadata.xml
index c3967643fc..14a2d4da22 100644
--- a/sys-cluster/TCL/metadata.xml
+++ b/sys-cluster/TCL/metadata.xml
@@ -11,8 +11,10 @@
 	</upstream>
 	<use>
 		<flag name="fti">Enable <pkg>sys-cluster/fti</pkg> backend</flag>
-		<flag name="instrumentation">Build the instrumentation version</flag>
 		<flag name="scr">Enable <pkg>sys-cluster/scr</pkg> backend</flag>
+		<flag name="tcl-debug">Build the debug version</flag>
+		<flag name="tcl-instrumentation">Build the instrumentation version</flag>
+		<flag name="tcl-instrumentation-debug">Build the instrumentation-debug version</flag>
 		<flag name="veloc">Enable <pkg>sys-cluster/veloc</pkg> backend</flag>
 	</use>
 </pkgmetadata>