diff --git a/_multibuild b/_multibuild
index 606536d..a8e6772 100644
--- a/_multibuild
+++ b/_multibuild
@@ -1,6 +1,6 @@
 <multibuild>
-  <package>standard</package>
-  <package>testsuite</package>
+  <package>ucx</package>
+  <package>ucx-testsuite</package>
   <package>ofi</package>
   <package>ofi-testsuite</package>
 </multibuild>
diff --git a/mpich.changes b/mpich.changes
index 2aed6ed..b9ba771 100644
--- a/mpich.changes
+++ b/mpich.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Tue Nov  4 17:54:18 UTC 2025 - Nicolas Morey <nicolas.morey@suse.com>
+
+- Use external hwloc
+- Rename standard multibuild flavor to ucx for more clarity
+
 -------------------------------------------------------------------
 Tue Oct 28 17:54:04 UTC 2025 - Nicolas Morey <nicolas.morey@suse.com>
 
diff --git a/mpich.spec b/mpich.spec
index 9513b1a..9063bc9 100644
--- a/mpich.spec
+++ b/mpich.spec
@@ -29,10 +29,10 @@
 ExclusiveArch:  do_not_build
 %endif
 
-%if "%{flavor}" == "standard"
+%if "%{flavor}" == "ucx"
 %define build_flavor ucx
 %endif
-%if "%{flavor}" == "testsuite"
+%if "%{flavor}" == "ucx-testsuite"
 %define build_flavor ucx
 %define testsuite 1
 %endif
@@ -101,6 +101,7 @@ BuildRequires:  libtool
 BuildRequires:  libtool
 BuildRequires:  mpi-selector
 BuildRequires:  python3-devel
+BuildRequires:  hwloc-devel >= 2.0
 
 %if "%{build_flavor}" == "ofi"
 BuildRequires:  libfabric-devel
@@ -114,7 +115,6 @@ BuildRequires:  libuct-devel >= 1.7.0
 # UCX is only available for 64b archs
 ExcludeArch:    %ix86 %arm
 %endif
-
 Provides:       mpi
 BuildRequires:  Modules
 BuildRequires:  gcc-c++
@@ -191,7 +191,7 @@ export FFLAGS="-fallow-argument-mismatch $FFLAGS"
 export FCFLAGS="-fallow-argument-mismatch $FCFLAGS"
 %endif
 
-./autogen.sh --without-ucx --without-ofi --without-json
+autoreconf
 %configure \
     --prefix=%{p_prefix} \
     --exec-prefix=%{p_prefix} \
@@ -205,6 +205,7 @@ export FCFLAGS="-fallow-argument-mismatch $FCFLAGS"
     --sysconfdir=%{p_sysconfdir} \
     --disable-rpath      \
     --disable-wrapper-rpath      \
+    --with-hwloc \
 %if "%{build_flavor}" == "ofi"
    --with-ofi \
    --with-device=ch4:ofi \