diff --git a/Libraries/ucx/build b/Libraries/ucx/build
index 2170a53..0d9fb7e 100755
--- a/Libraries/ucx/build
+++ b/Libraries/ucx/build
@@ -1,12 +1,38 @@
 #!/usr/bin/env modbuild
 
-pbuild::set_download_url "https://github.com/openucx/ucx/releases/download/v${V_PKG}/$P-$V.tar.gz"
+pbuild::set_download_url "https://github.com/openucx/ucx/releases/download/v${V_PKG}/$P-${V_PKG}.tar.gz"
 pbuild::add_to_group 'Libraries'
 
 # use system gcc to compile
 declare -rx CC=gcc
 declare -rx CPP=/usr/bin/cpp
 
-#pbuild::add_configure_args "--disable-shared"
-pbuild::add_configure_args "--with-pic"
+pbuild::pre_configure() {
+  #pbuild::add_configure_args "--disable-shared"
+  pbuild::add_configure_args "--with-pic"
 
+  pbuild::add_configure_args "--enable-optimizations" # Recommended when compiled from source
+  pbuild::add_configure_args "--disable-logging"
+  pbuild::add_configure_args "--disable-debug"
+  pbuild::add_configure_args "--disable-assertions"
+  pbuild::add_configure_args "--disable-params-check"
+  pbuild::add_configure_args "--without-cm"
+  pbuild::add_configure_args "--without-rocm"
+  pbuild::add_configure_args "--without-xpmem"
+  pbuild::add_configure_args "--without-ugni"
+  pbuild::add_configure_args "--without-java"
+  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 ; 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
+}
diff --git a/Libraries/ucx/files/variants.merlin6 b/Libraries/ucx/files/variants.merlin6
new file mode 100644
index 0000000..0157456
--- /dev/null
+++ b/Libraries/ucx/files/variants.merlin6
@@ -0,0 +1 @@
+ucx/1.9.0_slurm     unstable     cuda/11.1.0  b:doxygen/1.8.14
diff --git a/Libraries/ucx/files/variants.rhel6 b/Libraries/ucx/files/variants.rhel6
index f5d47d4..1dea9f9 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
+ucx/1.9.0	unstable   cuda/11.1.0 b:doxygen/1.8.14