diff --git a/ci/cpu/upload.sh b/ci/cpu/upload.sh
index a3a2d4620..49d716c17 100644
--- a/ci/cpu/upload.sh
+++ b/ci/cpu/upload.sh
@@ -29,8 +29,8 @@ fi
 
 gpuci_logger "Get conda file output locations"
 
-export LIBRMM_FILES=$(conda build conda/recipes/librmm --output)
-export RMM_FILE=$(conda build conda/recipes/rmm --python=$PYTHON --output)
+export LIBRMM_FILE=$(conda build conda/recipes/librmm --output)
+export RMM_FILES=$(conda build conda/recipes/rmm --python=$PYTHON --output)
 
 ################################################################################
 # UPLOAD - Conda packages
@@ -39,18 +39,18 @@ export RMM_FILE=$(conda build conda/recipes/rmm --python=$PYTHON --output)
 gpuci_logger "Starting conda uploads"
 
 if [[ "$BUILD_LIBRMM" == "1" && "$UPLOAD_LIBRMM" == "1" ]]; then
-  while read -r LIBRMM_FILE; do
-    test -e ${LIBRMM_FILE}
-    echo "Upload librmm"
-    echo ${LIBRMM_FILE}
-    gpuci_retry anaconda -t ${MY_UPLOAD_KEY} upload -u ${CONDA_USERNAME:-rapidsai} ${LABEL_OPTION} --skip-existing ${LIBRMM_FILE} --no-progress
-  done <<< "${LIBRMM_FILES}"
+  test -e ${LIBRMM_FILE}
+  echo "Upload librmm"
+  echo ${LIBRMM_FILE}
+  gpuci_retry anaconda -t ${MY_UPLOAD_KEY} upload -u ${CONDA_USERNAME:-rapidsai} ${LABEL_OPTION} --skip-existing ${LIBRMM_FILE} --no-progress
 fi
 
 if [[ "$BUILD_RMM" == "1" && "$UPLOAD_RMM" == "1" ]]; then
-  test -e ${RMM_FILE}
-  echo "Upload rmm"
-  echo ${RMM_FILE}
-  gpuci_retry anaconda -t ${MY_UPLOAD_KEY} upload -u ${CONDA_USERNAME:-rapidsai} ${LABEL_OPTION} --skip-existing ${RMM_FILE} --no-progress
+  while read -r RMM_FILE; do
+    test -e ${RMM_FILE}
+    echo "Upload rmm"
+    echo ${RMM_FILE}
+    gpuci_retry anaconda -t ${MY_UPLOAD_KEY} upload -u ${CONDA_USERNAME:-rapidsai} ${LABEL_OPTION} --skip-existing ${RMM_FILE} --no-progress
+  done <<< "${RMM_FILES}"
 fi
 
diff --git a/ci/gpu/build.sh b/ci/gpu/build.sh
index 8a312ad9f..e7239042e 100755
--- a/ci/gpu/build.sh
+++ b/ci/gpu/build.sh
@@ -113,10 +113,7 @@ else
 
     cd $WORKSPACE/python
 
-    CONDA_FILE=`find $WORKSPACE/ci/artifacts/rmm/cpu/conda-bld/ -name "librmm*no_cma*.tar.bz2"`
-    if [[ "$CUDA_MAJOR_VER" -ge 11 ]] && [[ "$CUDA_MINOR_VER" -ge 2 ]]; then
-        CONDA_FILE=`find $WORKSPACE/ci/artifacts/rmm/cpu/conda-bld/ -name "librmm*has_cma*.tar.bz2"`
-    fi
+    CONDA_FILE=`find $WORKSPACE/ci/artifacts/rmm/cpu/conda-bld/ -name "librmm*.tar.bz2"`
     CONDA_FILE=`basename "$CONDA_FILE" .tar.bz2` #get filename without extension
     CONDA_FILE=${CONDA_FILE//-/=} #convert to conda install
     gpuci_logger "Installing $CONDA_FILE"
diff --git a/conda/recipes/librmm/build.sh b/conda/recipes/librmm/build.sh
index eeb757f8c..2c75e4624 100644
--- a/conda/recipes/librmm/build.sh
+++ b/conda/recipes/librmm/build.sh
@@ -1,4 +1,4 @@
 # Copyright (c) 2018-2019, NVIDIA CORPORATION.
 
 # This assumes the script is executed from the root of the repo directory
-./build.sh -v clean librmm --cmake-args=\"-DCMAKE_INSTALL_LIBDIR=lib\" ${BUILD_FLAGS}
+./build.sh -v clean librmm --cmake-args=\"-DCMAKE_INSTALL_LIBDIR=lib\"
diff --git a/conda/recipes/librmm/meta.yaml b/conda/recipes/librmm/meta.yaml
index c4e74bec4..e54a7edd7 100644
--- a/conda/recipes/librmm/meta.yaml
+++ b/conda/recipes/librmm/meta.yaml
@@ -3,7 +3,6 @@
 {% set version = environ.get('GIT_DESCRIBE_TAG', '0.0.0.dev').lstrip('v') + environ.get('VERSION_SUFFIX', '') %}
 {% set cuda_version='.'.join(environ.get('CUDA', '9.2').split('.')[:2]) %}
 {% set cuda_major=cuda_version.split('.')[0] %}
-{% set build_flags="" if cudaMallocAsync == "has_cma" else "--no-cudamallocasync" %}
 
 package:
   name: librmm
@@ -14,7 +13,7 @@ source:
 
 build:
   number: {{ GIT_DESCRIBE_NUMBER }}
-  string: cuda{{ cuda_major }}_{{ GIT_DESCRIBE_HASH }}_{{ GIT_DESCRIBE_NUMBER }}_{{ cudaMallocAsync }}
+  string: cuda{{ cuda_major }}_{{ GIT_DESCRIBE_HASH }}_{{ GIT_DESCRIBE_NUMBER }}
   script_env:
     - CC
     - CXX
@@ -28,7 +27,6 @@ build:
     - CMAKE_C_COMPILER_LAUNCHER
     - CMAKE_CXX_COMPILER_LAUNCHER
     - CMAKE_CUDA_COMPILER_LAUNCHER
-    - BUILD_FLAGS="{{ build_flags }}"
   run_exports:
     - {{ pin_subpackage("librmm", max_pin="x.x") }}
 
@@ -39,11 +37,7 @@ requirements:
     - cudatoolkit {{ cuda_version }}.*
   run:
     - spdlog>=1.8.5,<1.9
-{% if cudaMallocAsync == "has_cma" %}
-    - {{ pin_compatible('cudatoolkit', max_pin='x', lower_bound='11.2') }} # cudatoolkit >=11.2,<12.0.0
-{% else %}
-    - {{ pin_compatible('cudatoolkit', upper_bound='11.2', lower_bound='11.0') }} # cudatoolkit >=11.0,<11.2
-{% endif %}
+    - {{ pin_compatible('cudatoolkit', max_pin='x', min_pin='x') }}
 
 test:
   commands:
diff --git a/conda/recipes/rmm/build.sh b/conda/recipes/rmm/build.sh
index d2c672e69..08990c36e 100644
--- a/conda/recipes/rmm/build.sh
+++ b/conda/recipes/rmm/build.sh
@@ -1,4 +1,9 @@
 # Copyright (c) 2018-2019, NVIDIA CORPORATION.
 
 # Script assumes the script is executed from the root of the repo directory
-./build.sh -v clean rmm
+BUILD_FLAGS=""
+if [ "${cudaMallocAsync}" == "no_cma" ]; then
+    BUILD_FLAGS="${BUILD_FLAGS} --no-cudamallocasync"
+fi
+
+./build.sh -v clean rmm ${BUILD_FLAGS}
diff --git a/conda/recipes/librmm/conda_build_config.yaml b/conda/recipes/rmm/conda_build_config.yaml
similarity index 100%
rename from conda/recipes/librmm/conda_build_config.yaml
rename to conda/recipes/rmm/conda_build_config.yaml
diff --git a/conda/recipes/rmm/meta.yaml b/conda/recipes/rmm/meta.yaml
index dbb8789a7..fd32170df 100644
--- a/conda/recipes/rmm/meta.yaml
+++ b/conda/recipes/rmm/meta.yaml
@@ -14,7 +14,7 @@ source:
 
 build:
   number: {{ GIT_DESCRIBE_NUMBER }}
-  string: cuda_{{ cuda_major }}_py{{ py_version }}_{{ GIT_DESCRIBE_HASH }}_{{ GIT_DESCRIBE_NUMBER }}
+  string: cuda{{ cuda_major }}_py{{ py_version }}_{{ GIT_DESCRIBE_HASH }}_{{ GIT_DESCRIBE_NUMBER }}_{{ cudaMallocAsync }}
   script_env:
     - RMM_BUILD_NO_GPU_TEST
     - VERSION_SUFFIX
@@ -34,7 +34,11 @@ requirements:
     - python
     - numba >=0.49
     - numpy
-    - {{ pin_compatible('cudatoolkit', max_pin='x', min_pin='x') }}
+{% if cudaMallocAsync == "has_cma" %}
+    - {{ pin_compatible('cudatoolkit', max_pin='x', lower_bound='11.2') }} # cudatoolkit >=11.2,<12.0.0
+{% else %}
+    - {{ pin_compatible('cudatoolkit', upper_bound='11.2', lower_bound='11.0') }} # cudatoolkit >=11.0,<11.2
+{% endif %}
 
 test:
   commands: