diff --git a/tools/cufinufft/build-library.sh b/tools/cufinufft/build-library.sh
index 988096879..ec01d0735 100755
--- a/tools/cufinufft/build-library.sh
+++ b/tools/cufinufft/build-library.sh
@@ -1,13 +1,15 @@
 #!/usr/bin/env bash
 set -e -u -x
 
-mkdir -p /io/build
+rm -rf /io/build
+mkdir /io/build
 cd /io/build
 
 cmake -D FINUFFT_USE_CUDA=ON \
       -D FINUFFT_USE_CPU=OFF \
       -D FINUFFT_BUILD_TESTS=ON \
       -D CMAKE_CUDA_ARCHITECTURES="35;50;60;70;75;80" \
+      -D CMAKE_CUDA_FLAGS="-Wno-deprecated-gpu-targets" \
       -D BUILD_TESTING=ON \
       ..
 
diff --git a/tools/cufinufft/build-wheels.sh b/tools/cufinufft/build-wheels.sh
index 890c15415..2a3764a6e 100755
--- a/tools/cufinufft/build-wheels.sh
+++ b/tools/cufinufft/build-wheels.sh
@@ -53,7 +53,7 @@ done
 for py_version in ${py_versions[@]}; do
     py_binary=$(get_python_binary ${py_version})
 
-    "${py_binary}/pip" install cufinufft -f /io/wheelhouse
+    "${py_binary}/pip" install --pre cufinufft -f /io/wheelhouse
     "${py_binary}/pip" install pytest
     "${py_binary}/pytest" /io/python/cufinufft/tests
 done
diff --git a/tools/cufinufft/distribution_helper.sh b/tools/cufinufft/distribution_helper.sh
index 014d51ecd..335ad0ca0 100755
--- a/tools/cufinufft/distribution_helper.sh
+++ b/tools/cufinufft/distribution_helper.sh
@@ -2,13 +2,13 @@
 
 # Helper Script For Building Wheels
 
-cufinufft_version=1.3
+cufinufft_version=2.2
 manylinux_version=manylinux2014
 cuda_version=11.0
 dockerhub=janden
 
 
-echo "# build the wheel"
+echo "# Build the docker image"
 docker build \
     --file tools/cufinufft/docker/cuda${cuda_version}/Dockerfile-x86_64 \
     --tag ${dockerhub}/cufinufft-${cufinufft_version}-${manylinux_version} .
@@ -21,14 +21,16 @@ docker create \
     --tty \
     --volume $(pwd)/wheelhouse:/io/wheelhouse \
     --env PLAT=${manylinux_version}_x86_64 \
+    --env LIBRARY_PATH="/io/build" \
+    --env LD_LIBRARY_PATH="/io/build" \
     --name cufinufft \
     ${dockerhub}/cufinufft-${cufinufft_version}-${manylinux_version}
 
 docker start cufinufft
 
-echo "# Build the library and install it"
+echo "# Copy the code and build the library"
+docker cp . cufinufft:/io
 docker exec cufinufft /io/tools/cufinufft/build-library.sh
-docker exec cufinufft cp /io/build/libcufinufft.so /usr/lib
 
 echo "# Build the wheels"
 docker exec cufinufft /io/tools/cufinufft/build-wheels.sh
@@ -41,10 +43,8 @@ echo "# Copy the wheels we care about to the dist folder"
 mkdir -p dist
 cp -v wheelhouse/cufinufft-${cufinufft_version}-cp3*${manylinux_version}* dist
 
-
 echo "The following steps should be performed manually for now.\n"
 
-
 echo "# Push to Test PyPI for review/testing"
 echo "#twine upload -r testpypi dist/*"
 echo