diff --git a/Libraries/ucx/build b/Libraries/ucx/build
index 40b0483..15448ce 100755
--- a/Libraries/ucx/build
+++ b/Libraries/ucx/build
@@ -8,7 +8,7 @@ declare -rx CC=gcc
 declare -rx CPP=/usr/bin/cpp
 
 pbuild::pre_configure() {
-  #pbuild::add_configure_args "--disable-shared"
+  # pbuild::add_configure_args "--disable-shared"
   pbuild::add_configure_args "--with-pic"
 
   pbuild::add_configure_args "--enable-optimizations" # Recommended when compiled from source
@@ -24,15 +24,18 @@ pbuild::pre_configure() {
   pbuild::add_configure_args "--enable-cma"
   pbuild::add_configure_args "--enable-mt"
   pbuild::add_configure_args "--with-verbs"
+
   if [[ -n "${CUDA_VERSION}" ]]; then
     pbuild::add_configure_args "--with-cuda=$CUDA_HOME"
   fi
 
-  # if pbuild::use_flag slurm || pbuild::use_flag dgx; then
-  pbuild::add_configure_args "--without-gdrcopy"       # Will be --with-gdrcopy when available
-  pbuild::add_configure_args "--with-knem"
-  pbuild::add_configure_args "--with-rdmacm"
-  # else
-  #  pbuild::add_configure_args "--without-gdrcopy"
-  # fi
+  if [[ -n "${KNEM_VERSION}" ]]; then
+    pbuild::add_configure_args "--with-knem"
+  fi
+  if pbuild::use_flag slurm || pbuild::use_flag dgx; then
+    pbuild::add_configure_args "--without-gdrcopy"       # Will be --with-gdrcopy when available
+    pbuild::add_configure_args "--with-rdmacm"
+  else
+    pbuild::add_configure_args "--without-gdrcopy"
+  fi
 }
diff --git a/Libraries/ucx/files/variants.merlin6 b/Libraries/ucx/files/variants.merlin6
index 611b206..8ef9726 100644
--- a/Libraries/ucx/files/variants.merlin6
+++ b/Libraries/ucx/files/variants.merlin6
@@ -1,3 +1,2 @@
-ucx/1.9.0_slurm           unstable     cuda/11.1.0  b:doxygen/1.8.14
-ucx/1.9.0_dgx_cuda110     removed      cuda/11.0.3  b:doxygen/1.8.14
-ucx/1.9.0_dgx             unstable     b:doxygen/1.8.14
+ucx/1.9.0_slurm           unstable     cuda/11.1.0 b:doxygen/1.8.14 b:knem/1.1.4
+ucx/1.9.0_dgx             unstable     cuda/11.0.3 b:doxygen/1.8.14 b:knem/1.1.4
diff --git a/Libraries/ucx/files/variants.rhel6 b/Libraries/ucx/files/variants.rhel6
index 1dea9f9..5ab6e61 100644
--- a/Libraries/ucx/files/variants.rhel6
+++ b/Libraries/ucx/files/variants.rhel6
@@ -1,2 +1,2 @@
 ucx/1.8.1	unstable
-ucx/1.9.0	unstable   cuda/11.1.0 b:doxygen/1.8.14
+ucx/1.9.0	unstable   cuda/11.1.0 b:doxygen/1.8.14 b:knem/1.1.4
diff --git a/Libraries/ucx/modulefile b/Libraries/ucx/modulefile
index b6ecfcd..6235aa6 100644
--- a/Libraries/ucx/modulefile
+++ b/Libraries/ucx/modulefile
@@ -9,3 +9,5 @@ module-help		"
 Unified Communication X (ucx) is an open-source production grade communication
 framework for data centric and high-performance application.
 "
+
+setenv  UCX_WARN_UNUSED_ENV_VARS  n