diff --git a/Libraries/ucx/build b/Libraries/ucx/build
index 5490f59..a95879a 100755
--- a/Libraries/ucx/build
+++ b/Libraries/ucx/build
@@ -1,29 +1,35 @@
 #!/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 "--enable-mt"
-pbuild::add_configure_args "--disable-params-check"
-pbuild::add_configure_args "--enable-cma"
-pbuild::add_configure_args "--with-cuda"
-pbuild::add_configure_args "--without-gdrcopy"
-pbuild::add_configure_args "--with-verbs"
-pbuild::add_configure_args "--without-cm"
-pbuild::add_configure_args "--with-knem"
-pbuild::add_configure_args "--with-rdmacm"
-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-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 "--with-cuda=$CUDA_HOME"
+  pbuild::add_configure_args "--enable-cma"
+  pbuild::add_configure_args "--enable-mt"
+  pbuild::add_configure_args "--with-verbs"
+  if pbuild::use_flag slurm ; then
+    pbuild::add_configure_args "--without-gdrcopy"
+    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
index 5c8ad0f..2448818 100644
--- a/Libraries/ucx/files/variants.merlin6
+++ b/Libraries/ucx/files/variants.merlin6
@@ -1 +1 @@
-ucx/1.9.0	unstable	cuda/11.1.0
+ucx/1.9.0_slurm     unstable     cuda/11.1.0