diff --git a/profiles/desc/comm_queue.desc b/profiles/desc/comm_queue.desc
new file mode 100644
index 0000000000..2e0edd5e18
--- /dev/null
+++ b/profiles/desc/comm_queue.desc
@@ -0,0 +1,8 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# This file contains descriptions of COMM_QUEUE USE_EXPAND flags.
+
+ipc - Use ipc as the communication protocol between client library and active backend
+socket - Use socket as the communication protocol between client library and active backend
+thallium - Use thallium as the communication protocol between client library and active backend
diff --git a/sys-cluster/veloc/metadata.xml b/sys-cluster/veloc/metadata.xml
index 15c4fdb607..fd2726855c 100644
--- a/sys-cluster/veloc/metadata.xml
+++ b/sys-cluster/veloc/metadata.xml
@@ -14,8 +14,5 @@ VeloC is a collaboration between Argonne National Laboratory and Lawrence Liverm
   </longdescription>
   <use>
     <flag name="slurm">Use <pkg>sys-cluster/slurm</pkg> as resource manager</flag>
-    <flag name="comm-queue-ipc">Use ipc as the communication protocol between client library and active backend</flag>
-    <flag name="comm-queue-socket">Use socket as the communication protocol between client library and active backend</flag>
-    <!--<flag name="comm-queue-thallium">Use as the communication protocol between client library and active backend</flag>-->
   </use>
 </pkgmetadata>
diff --git a/sys-cluster/veloc/veloc-1.6.ebuild b/sys-cluster/veloc/veloc-1.6.ebuild
index 9132559a17..79255c572b 100644
--- a/sys-cluster/veloc/veloc-1.6.ebuild
+++ b/sys-cluster/veloc/veloc-1.6.ebuild
@@ -18,15 +18,15 @@ SLOT="0"
 KEYWORDS="~amd64"
 
 IUSE_COMM_QUEUE="
-	+comm-queue-ipc
-	comm-queue-socket
+	+comm_queue_ipc
+	comm_queue_socket
 "
-#	comm-queue-thallium
+#	comm_queue_thallium
 IUSE="${IUSE_COMM_QUEUE} python +slurm"
 
 # AXL is optional
 RDEPEND="
-	comm-queue-ipc? ( dev-libs/boost )
+	comm_queue_ipc? ( dev-libs/boost )
 	slurm? ( sys-cluster/slurm )
 
 	dev-libs/openssl
@@ -34,7 +34,7 @@ RDEPEND="
 	sys-cluster/er
 	virtual/mpi
 "
-#	comm-queue-thallium? ( thallium )
+#	comm_queue_thallium? ( thallium )
 DEPEND="${RDEPEND}"
 
 PATCHES=( "${FILESDIR}/${P}-strip-cflags.patch" )
@@ -54,9 +54,9 @@ src_configure() {
 	use slurm && resman="SLURM"
 
 	local queue
-	use comm-queue-ipc && queue="ipc_queue"
-	use comm-queue-socket && queue="socket_queue"
-#	use comm-queue-thallium && queue="thallium_queue"
+	use comm_queue_ipc && queue="ipc_queue"
+	use comm_queue_socket && queue="socket_queue"
+#	use comm_queue_thallium && queue="thallium_queue"
 
 	local mycmakeargs=(
 		-DCMAKE_INSTALL_LIBDIR="$(get_libdir)"