diff --git a/.azure-pipelines/azure-pipelines-osx.yml b/.azure-pipelines/azure-pipelines-osx.yml
index 7708e23..ac0bf38 100755
--- a/.azure-pipelines/azure-pipelines-osx.yml
+++ b/.azure-pipelines/azure-pipelines-osx.yml
@@ -5,7 +5,7 @@
 jobs:
 - job: osx
   pool:
-    vmImage: macOS-12
+    vmImage: macOS-13
   strategy:
     matrix:
       osx_64_:
diff --git a/.ci_support/linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeconda.yaml b/.ci_support/linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeconda.yaml
index 5f6d611..5f78fb8 100644
--- a/.ci_support/linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeconda.yaml
+++ b/.ci_support/linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeconda.yaml
@@ -7,7 +7,7 @@ c_stdlib:
 c_stdlib_version:
 - '2.17'
 cdt_name:
-- cos7
+- conda
 channel_sources:
 - conda-forge
 channel_targets:
@@ -34,6 +34,8 @@ mpi_type:
 - conda
 target_platform:
 - linux-64
+ucc:
+- '1'
 ucx:
 - '1.17'
 zip_keys:
@@ -41,7 +43,6 @@ zip_keys:
   - cxx_compiler_version
   - fortran_compiler_version
   - c_stdlib_version
-  - cdt_name
   - cuda_compiler
   - cuda_compiler_version
   - docker_image
diff --git a/.ci_support/linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeexternal.yaml b/.ci_support/linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeexternal.yaml
index da46a4d..ef6972b 100644
--- a/.ci_support/linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeexternal.yaml
+++ b/.ci_support/linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeexternal.yaml
@@ -7,7 +7,7 @@ c_stdlib:
 c_stdlib_version:
 - '2.17'
 cdt_name:
-- cos7
+- conda
 channel_sources:
 - conda-forge
 channel_targets:
@@ -34,6 +34,8 @@ mpi_type:
 - external
 target_platform:
 - linux-64
+ucc:
+- '1'
 ucx:
 - '1.17'
 zip_keys:
@@ -41,7 +43,6 @@ zip_keys:
   - cxx_compiler_version
   - fortran_compiler_version
   - c_stdlib_version
-  - cdt_name
   - cuda_compiler
   - cuda_compiler_version
   - docker_image
diff --git a/.ci_support/linux_aarch64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeconda.yaml b/.ci_support/linux_aarch64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeconda.yaml
index 07a0451..ad65fc7 100644
--- a/.ci_support/linux_aarch64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeconda.yaml
+++ b/.ci_support/linux_aarch64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeconda.yaml
@@ -11,7 +11,7 @@ c_stdlib_version:
 cdt_arch:
 - aarch64
 cdt_name:
-- cos7
+- conda
 channel_sources:
 - conda-forge
 channel_targets:
@@ -38,6 +38,8 @@ mpi_type:
 - conda
 target_platform:
 - linux-aarch64
+ucc:
+- '1'
 ucx:
 - '1.17'
 zip_keys:
@@ -45,7 +47,6 @@ zip_keys:
   - cxx_compiler_version
   - fortran_compiler_version
   - c_stdlib_version
-  - cdt_name
   - cuda_compiler
   - cuda_compiler_version
   - docker_image
diff --git a/.ci_support/linux_aarch64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeexternal.yaml b/.ci_support/linux_aarch64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeexternal.yaml
index d601a10..76cb06b 100644
--- a/.ci_support/linux_aarch64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeexternal.yaml
+++ b/.ci_support/linux_aarch64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeexternal.yaml
@@ -11,7 +11,7 @@ c_stdlib_version:
 cdt_arch:
 - aarch64
 cdt_name:
-- cos7
+- conda
 channel_sources:
 - conda-forge
 channel_targets:
@@ -38,6 +38,8 @@ mpi_type:
 - external
 target_platform:
 - linux-aarch64
+ucc:
+- '1'
 ucx:
 - '1.17'
 zip_keys:
@@ -45,7 +47,6 @@ zip_keys:
   - cxx_compiler_version
   - fortran_compiler_version
   - c_stdlib_version
-  - cdt_name
   - cuda_compiler
   - cuda_compiler_version
   - docker_image
diff --git a/.ci_support/linux_ppc64le_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeconda.yaml b/.ci_support/linux_ppc64le_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeconda.yaml
index e6aae74..294bcfd 100644
--- a/.ci_support/linux_ppc64le_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeconda.yaml
+++ b/.ci_support/linux_ppc64le_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeconda.yaml
@@ -7,7 +7,7 @@ c_stdlib:
 c_stdlib_version:
 - '2.17'
 cdt_name:
-- cos7
+- conda
 channel_sources:
 - conda-forge
 channel_targets:
@@ -34,14 +34,11 @@ mpi_type:
 - conda
 target_platform:
 - linux-ppc64le
-ucx:
-- '1.17'
 zip_keys:
 - - c_compiler_version
   - cxx_compiler_version
   - fortran_compiler_version
   - c_stdlib_version
-  - cdt_name
   - cuda_compiler
   - cuda_compiler_version
   - docker_image
diff --git a/.ci_support/linux_ppc64le_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeexternal.yaml b/.ci_support/linux_ppc64le_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeexternal.yaml
index 6d89fd8..6c210df 100644
--- a/.ci_support/linux_ppc64le_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeexternal.yaml
+++ b/.ci_support/linux_ppc64le_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11fortran_compiler_version11mpi_typeexternal.yaml
@@ -7,7 +7,7 @@ c_stdlib:
 c_stdlib_version:
 - '2.17'
 cdt_name:
-- cos7
+- conda
 channel_sources:
 - conda-forge
 channel_targets:
@@ -34,14 +34,11 @@ mpi_type:
 - external
 target_platform:
 - linux-ppc64le
-ucx:
-- '1.17'
 zip_keys:
 - - c_compiler_version
   - cxx_compiler_version
   - fortran_compiler_version
   - c_stdlib_version
-  - cdt_name
   - cuda_compiler
   - cuda_compiler_version
   - docker_image
diff --git a/.ci_support/migrations/ucx117.yaml b/.ci_support/migrations/ucx117.yaml
deleted file mode 100644
index 655562a..0000000
--- a/.ci_support/migrations/ucx117.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-__migrator:
-  build_number: 1
-  commit_message: Rebuild for ucx 1.17
-  kind: version
-  migration_number: 1
-migrator_ts: 1724319417.9572914
-ucx:
-- '1.17'
diff --git a/.ci_support/osx_64_.yaml b/.ci_support/osx_64_.yaml
index ca56024..83fa8d0 100644
--- a/.ci_support/osx_64_.yaml
+++ b/.ci_support/osx_64_.yaml
@@ -5,7 +5,7 @@ MACOSX_SDK_VERSION:
 c_compiler:
 - clang
 c_compiler_version:
-- '17'
+- '18'
 c_stdlib:
 - macosx_deployment_target
 c_stdlib_version:
@@ -21,7 +21,7 @@ cuda_compiler_version:
 cxx_compiler:
 - clangxx
 cxx_compiler_version:
-- '17'
+- '18'
 fortran_compiler:
 - gfortran
 fortran_compiler_version:
diff --git a/.ci_support/osx_arm64_.yaml b/.ci_support/osx_arm64_.yaml
index 94dd2aa..4f8a481 100644
--- a/.ci_support/osx_arm64_.yaml
+++ b/.ci_support/osx_arm64_.yaml
@@ -5,7 +5,7 @@ MACOSX_SDK_VERSION:
 c_compiler:
 - clang
 c_compiler_version:
-- '17'
+- '18'
 c_stdlib:
 - macosx_deployment_target
 c_stdlib_version:
@@ -21,7 +21,7 @@ cuda_compiler_version:
 cxx_compiler:
 - clangxx
 cxx_compiler_version:
-- '17'
+- '18'
 fortran_compiler:
 - gfortran
 fortran_compiler_version:
diff --git a/.github/workflows/automerge.yml b/.github/workflows/automerge.yml
deleted file mode 100644
index 0535f6a..0000000
--- a/.github/workflows/automerge.yml
+++ /dev/null
@@ -1,17 +0,0 @@
-on:
-  status: {}
-  check_suite:
-    types:
-      - completed
-
-jobs:
-  automerge-action:
-    runs-on: ubuntu-latest
-    name: automerge
-    steps:
-      - name: automerge-action
-        id: automerge-action
-        uses: conda-forge/automerge-action@main
-        with:
-          github_token: ${{ secrets.GITHUB_TOKEN }}
-          rerendering_github_token: ${{ secrets.RERENDERING_GITHUB_TOKEN }}
diff --git a/.github/workflows/webservices.yml b/.github/workflows/webservices.yml
deleted file mode 100644
index d6f06b5..0000000
--- a/.github/workflows/webservices.yml
+++ /dev/null
@@ -1,13 +0,0 @@
-on: repository_dispatch
-
-jobs:
-  webservices:
-    runs-on: ubuntu-latest
-    name: webservices
-    steps:
-      - name: webservices
-        id: webservices
-        uses: conda-forge/webservices-dispatch-action@main
-        with:
-          github_token: ${{ secrets.GITHUB_TOKEN }}
-          rerendering_github_token: ${{ secrets.RERENDERING_GITHUB_TOKEN }}
diff --git a/.scripts/build_steps.sh b/.scripts/build_steps.sh
index 856f469..827a29f 100755
--- a/.scripts/build_steps.sh
+++ b/.scripts/build_steps.sh
@@ -31,13 +31,13 @@ pkgs_dirs:
 solver: libmamba
 
 CONDARC
+mv /opt/conda/conda-meta/history /opt/conda/conda-meta/history.$(date +%Y-%m-%d-%H-%M-%S)
+echo > /opt/conda/conda-meta/history
+micromamba install --root-prefix ~/.conda --prefix /opt/conda \
+    --yes --override-channels --channel conda-forge --strict-channel-priority \
+    pip  python=3.12 conda-build conda-forge-ci-setup=4 "conda-build>=24.1"
 export CONDA_LIBMAMBA_SOLVER_NO_CHANNELS_FROM_INSTALLED=1
 
-mamba install --update-specs --yes --quiet --channel conda-forge --strict-channel-priority \
-    pip mamba conda-build conda-forge-ci-setup=4 "conda-build>=24.1"
-mamba update --update-specs --yes --quiet --channel conda-forge --strict-channel-priority \
-    pip mamba conda-build conda-forge-ci-setup=4 "conda-build>=24.1"
-
 # set up the condarc
 setup_conda_rc "${FEEDSTOCK_ROOT}" "${RECIPE_ROOT}" "${CONFIG_FILE}"
 
@@ -76,8 +76,8 @@ else
         --extra-meta flow_run_id="${flow_run_id:-}" remote_url="${remote_url:-}" sha="${sha:-}"
     ( startgroup "Inspecting artifacts" ) 2> /dev/null
 
-    # inspect_artifacts was only added in conda-forge-ci-setup 4.6.0
-    command -v inspect_artifacts >/dev/null 2>&1 && inspect_artifacts || echo "inspect_artifacts needs conda-forge-ci-setup >=4.6.0"
+    # inspect_artifacts was only added in conda-forge-ci-setup 4.9.4
+    command -v inspect_artifacts >/dev/null 2>&1 && inspect_artifacts --recipe-dir "${RECIPE_ROOT}" -m "${CONFIG_FILE}" || echo "inspect_artifacts needs conda-forge-ci-setup >=4.9.4"
 
     ( endgroup "Inspecting artifacts" ) 2> /dev/null
     ( startgroup "Validating outputs" ) 2> /dev/null
diff --git a/.scripts/run_osx_build.sh b/.scripts/run_osx_build.sh
index 420f051..0b36498 100755
--- a/.scripts/run_osx_build.sh
+++ b/.scripts/run_osx_build.sh
@@ -7,28 +7,39 @@ source .scripts/logging_utils.sh
 set -xe
 
 MINIFORGE_HOME=${MINIFORGE_HOME:-${HOME}/miniforge3}
+MINIFORGE_HOME=${MINIFORGE_HOME%/} # remove trailing slash
 
-( startgroup "Installing a fresh version of Miniforge" ) 2> /dev/null
-
-MINIFORGE_URL="https://github.com/conda-forge/miniforge/releases/latest/download"
-MINIFORGE_FILE="Miniforge3-MacOSX-$(uname -m).sh"
-curl -L -O "${MINIFORGE_URL}/${MINIFORGE_FILE}"
-rm -rf ${MINIFORGE_HOME}
-bash $MINIFORGE_FILE -b -p ${MINIFORGE_HOME}
-
-( endgroup "Installing a fresh version of Miniforge" ) 2> /dev/null
+( startgroup "Provisioning base env with micromamba" ) 2> /dev/null
+MICROMAMBA_VERSION="1.5.10-0"
+if [[ "$(uname -m)" == "arm64" ]]; then
+  osx_arch="osx-arm64"
+else
+  osx_arch="osx-64"
+fi
+MICROMAMBA_URL="https://github.com/mamba-org/micromamba-releases/releases/download/${MICROMAMBA_VERSION}/micromamba-${osx_arch}"
+MAMBA_ROOT_PREFIX="${MINIFORGE_HOME}-micromamba-$(date +%s)"
+echo "Downloading micromamba ${MICROMAMBA_VERSION}"
+micromamba_exe="$(mktemp -d)/micromamba"
+curl -L -o "${micromamba_exe}" "${MICROMAMBA_URL}"
+chmod +x "${micromamba_exe}"
+echo "Creating environment"
+"${micromamba_exe}" create --yes --root-prefix "${MAMBA_ROOT_PREFIX}" --prefix "${MINIFORGE_HOME}" \
+  --channel conda-forge \
+  pip python=3.12 conda-build conda-forge-ci-setup=4 "conda-build>=24.1"
+echo "Moving pkgs cache from ${MAMBA_ROOT_PREFIX} to ${MINIFORGE_HOME}"
+mv "${MAMBA_ROOT_PREFIX}/pkgs" "${MINIFORGE_HOME}"
+echo "Cleaning up micromamba"
+rm -rf "${MAMBA_ROOT_PREFIX}" "${micromamba_exe}" || true
+( endgroup "Provisioning base env with micromamba" ) 2> /dev/null
 
 ( startgroup "Configuring conda" ) 2> /dev/null
-
-source ${MINIFORGE_HOME}/etc/profile.d/conda.sh
+echo "Activating environment"
+source "${MINIFORGE_HOME}/etc/profile.d/conda.sh"
 conda activate base
 export CONDA_SOLVER="libmamba"
 export CONDA_LIBMAMBA_SOLVER_NO_CHANNELS_FROM_INSTALLED=1
 
-mamba install --update-specs --quiet --yes --channel conda-forge --strict-channel-priority \
-    pip mamba conda-build conda-forge-ci-setup=4 "conda-build>=24.1"
-mamba update --update-specs --yes --quiet --channel conda-forge --strict-channel-priority \
-    pip mamba conda-build conda-forge-ci-setup=4 "conda-build>=24.1"
+
 
 
 
@@ -88,8 +99,8 @@ else
 
     ( startgroup "Inspecting artifacts" ) 2> /dev/null
 
-    # inspect_artifacts was only added in conda-forge-ci-setup 4.6.0
-    command -v inspect_artifacts >/dev/null 2>&1 && inspect_artifacts || echo "inspect_artifacts needs conda-forge-ci-setup >=4.6.0"
+    # inspect_artifacts was only added in conda-forge-ci-setup 4.9.4
+    command -v inspect_artifacts >/dev/null 2>&1 && inspect_artifacts --recipe-dir ./recipe -m ./.ci_support/${CONFIG}.yaml || echo "inspect_artifacts needs conda-forge-ci-setup >=4.9.4"
 
     ( endgroup "Inspecting artifacts" ) 2> /dev/null
     ( startgroup "Validating outputs" ) 2> /dev/null
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 33a441c..013bdc1 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -2,6 +2,31 @@
 # update the conda-forge.yml and/or the recipe/meta.yaml.
 # -*- mode: yaml -*-
 
-jobs:
-  - template: ./.azure-pipelines/azure-pipelines-linux.yml
-  - template: ./.azure-pipelines/azure-pipelines-osx.yml
\ No newline at end of file
+stages:
+- stage: Check
+  jobs:
+    - job: Skip
+      pool:
+        vmImage: 'ubuntu-22.04'
+      variables:
+        DECODE_PERCENTS: 'false'
+        RET: 'true'
+      steps:
+      - checkout: self
+        fetchDepth: '2'
+      - bash: |
+          git_log=`git log --max-count=1 --skip=1 --pretty=format:"%B" | tr "\n" " "`
+          echo "##vso[task.setvariable variable=log]$git_log"
+        displayName: Obtain commit message
+      - bash: echo "##vso[task.setvariable variable=RET]false"
+        condition: and(eq(variables['Build.Reason'], 'PullRequest'), or(contains(variables.log, '[skip azp]'), contains(variables.log, '[azp skip]'), contains(variables.log, '[skip ci]'), contains(variables.log, '[ci skip]')))
+        displayName: Skip build?
+      - bash: echo "##vso[task.setvariable variable=start_main;isOutput=true]$RET"
+        name: result
+        displayName: Export result
+- stage: Build
+  condition: and(succeeded(), eq(dependencies.Check.outputs['Skip.result.start_main'], 'true'))
+  dependsOn: Check
+  jobs:
+    - template: ./.azure-pipelines/azure-pipelines-linux.yml
+    - template: ./.azure-pipelines/azure-pipelines-osx.yml
\ No newline at end of file
diff --git a/recipe/build-mpi.sh b/recipe/build-mpi.sh
index 655a787..b1d95a0 100644
--- a/recipe/build-mpi.sh
+++ b/recipe/build-mpi.sh
@@ -1,5 +1,4 @@
 #!/bin/bash
-
 set -ex
 
 # avoid absolute-paths in compilers
@@ -83,29 +82,16 @@ fi
             --with-hwloc=$PREFIX \
             --with-libevent=$PREFIX \
             --with-zlib=$PREFIX \
-            --enable-mca-dso \
             --enable-ipv6 \
             $build_with_ucx \
             $build_with_ucc \
             $build_with_cuda \
-    || (cat config.log; false)
+    || (cat config.log; exit 1)
 
 make -j"${CPU_COUNT:-1}"
 make install
 
 POST_LINK=$PREFIX/bin/.openmpi-post-link.sh
-if [ -n "$build_with_ucx" ]; then
-    echo "setting MCA pml to ^ucx..."
-    echo "pml = ^ucx" >> $PREFIX/etc/openmpi-mca-params.conf
-    echo "setting MCA osc to ^ucx..."
-    echo "osc = ^ucx" >> $PREFIX/etc/openmpi-mca-params.conf
-    cat $RECIPE_DIR/post-link-ucx.sh >> $POST_LINK
-fi
-if [ -n "$build_with_ucc" ]; then
-    echo "setting MCA coll_ucc_enable to 0..."
-    echo "coll_ucc_enable = 0" >> $PREFIX/etc/openmpi-mca-params.conf
-    cat $RECIPE_DIR/post-link-ucc.sh >> $POST_LINK
-fi
 if [ -n "$build_with_cuda" ]; then
     echo "setting MCA mca_base_component_show_load_errors to 0..."
     echo "mca_base_component_show_load_errors = 0" >> $PREFIX/etc/openmpi-mca-params.conf
diff --git a/recipe/meta.yaml b/recipe/meta.yaml
index 254848b..1fea6b4 100644
--- a/recipe/meta.yaml
+++ b/recipe/meta.yaml
@@ -1,7 +1,7 @@
 {% set version = "5.0.5" %}
 {% set major = version.rpartition('.')[0] %}
 {% set cuda_major = (cuda_compiler_version|default("11.8")).rpartition('.')[0] %}
-{% set build = 3 %}
+{% set build = 4 %}
 
 # give conda package a higher build number
 {% if mpi_type == 'conda' %}
@@ -40,9 +40,6 @@ outputs:
       track_features:
         - openmpi_{{ mpi_type }}
       {% endif %}
-      ignore_run_exports:
-        - ucx  # [linux]
-        - ucc  # [linux]
       ignore_run_exports_from:
         - {{ compiler('cuda') }}   # [cuda_compiler != "None"]
     requirements:
@@ -73,8 +70,6 @@ outputs:
         #- openpmix
         #- prrte
       run_constrained:
-        - {{ pin_compatible("ucx", max_pin="x.x") }}  # [linux and not ppc64le]
-        - {{ pin_compatible("ucc", max_pin="x.x") }}  # [linux and not ppc64le]
         # Open MPI only uses CUDA Driver APIs, set the minimal driver version
         - __cuda  >= {{ cuda_major ~ ".0" }}  # [cuda_compiler != "None"]
         # Ensure a consistent CUDA environment
diff --git a/recipe/post-link-ucc.sh b/recipe/post-link-ucc.sh
deleted file mode 100644
index dafcd81..0000000
--- a/recipe/post-link-ucc.sh
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/bash
-
-cat << EOF >> $PREFIX/.messages.txt
-
-On Linux, Open MPI is built with UCC support but it is disabled by default.
-To enable it, first install UCC (conda install -c conda-forge ucc).
-Afterwards, set the environment variables
-OMPI_MCA_coll_ucc_enable=1
-before launching your MPI processes.
-Equivalently, you can set the MCA parameters in the command line:
-mpiexec --mca coll_ucc_enable 1 ...
-
-EOF
diff --git a/recipe/post-link-ucx.sh b/recipe/post-link-ucx.sh
deleted file mode 100644
index 2cf9466..0000000
--- a/recipe/post-link-ucx.sh
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/bash
-
-cat << EOF >> $PREFIX/.messages.txt
-
-On Linux, Open MPI is built with UCX support but it is disabled by default.
-To enable it, first install UCX (conda install -c conda-forge ucx).
-Afterwards, set the environment variables
-OMPI_MCA_pml=ucx OMPI_MCA_osc=ucx
-before launching your MPI processes.
-Equivalently, you can set the MCA parameters in the command line:
-mpiexec --mca pml ucx --mca osc ucx ...
-
-EOF
diff --git a/recipe/run_test.sh b/recipe/run_test.sh
index 0d7412e..df78321 100755
--- a/recipe/run_test.sh
+++ b/recipe/run_test.sh
@@ -7,16 +7,15 @@ pushd "tests"
 
 if [[ $PKG_NAME == "openmpi" ]]; then
 
-  if [[ -n "$(conda list | grep ucx)" ]]; then
-    echo "Improper UCX dependency!"
-    exit 1
-  fi
-
   if [[ "$target_platform" == linux-64 || "$target_platform" == linux-aarch64 ]]; then
-     if [[ -z "$(ompi_info | grep ucx)" ]]; then
-        echo "OpenMPI configured without UCX support!"
-        exit 1
-     fi
+    if [[ -z "$(ompi_info | grep ucc)" ]]; then
+      echo "OpenMPI configured without UCC support!"
+      exit 1
+    fi
+    if [[ -z "$(ompi_info | grep ucx)" ]]; then
+      echo "OpenMPI configured without UCX support!"
+      exit 1
+    fi
   fi
 
   if [[ -n "$(conda list | grep cuda-version)" ]]; then
@@ -25,10 +24,10 @@ if [[ $PKG_NAME == "openmpi" ]]; then
   fi
 
   if [[ "$target_platform" == linux-64 || "$target_platform" == linux-aarch64 ]]; then
-     if [[ -z "$(ompi_info | grep cuda)" ]]; then
-        echo "OpenMPI configured without CUDA support!"
-        exit 1
-     fi
+    if [[ -z "$(ompi_info | grep cuda)" ]]; then
+      echo "OpenMPI configured without CUDA support!"
+      exit 1
+    fi
   fi
 
   command -v ompi_info