diff --git a/.conda/heffte/cuda/build.sh b/.conda/heffte/cuda/build.sh
index 097964280..baee1163f 100755
--- a/.conda/heffte/cuda/build.sh
+++ b/.conda/heffte/cuda/build.sh
@@ -31,7 +31,7 @@ cmake -D CMAKE_BUILD_TYPE:STRING=RELEASE \
       $SRC_DIR \
       -D CMAKE_CXX_FLAGS="$PATCHED_CXXFLAGS" \
       -D MPI_C_COMPILER="$BUILD_PREFIX/bin/mpicc" \
-      -D MPI_CXX_COMPILER="$BUILD_PREFIX/bin/mpicxx" \
+      -D MPI_CXX_COMPILER="${OMPI_CXX}" \
       -D CMAKE_CUDA_HOST_LINK_LAUNCHER=$CXX \
       -D CMAKE_CUDA_COMPILER=$(which nvcc) \
 
diff --git a/.conda/heffte/cuda/meta.yaml b/.conda/heffte/cuda/meta.yaml
index 49bf9018e..205129192 100644
--- a/.conda/heffte/cuda/meta.yaml
+++ b/.conda/heffte/cuda/meta.yaml
@@ -36,7 +36,7 @@ requirements:
   # Not sure which ones are totally necessary.
   host:
     - cuda-cudart-static={{ cuda_version }} # Make sure your nvcc version and cudart versions are the same
-    - cuda-cudart-static
+      #- cuda-cudart-static
     - libcusolver-dev
     - libcufft-dev
     - libcublas-dev