diff --git a/.bazeliskrc b/.bazeliskrc
new file mode 100644
index 0000000000..fe5e2c85d1
--- /dev/null
+++ b/.bazeliskrc
@@ -0,0 +1 @@
+USE_BAZEL_VERSION=3.7.2
diff --git a/.bazelversion b/.bazelversion
deleted file mode 100644
index 0b2eb36f50..0000000000
--- a/.bazelversion
+++ /dev/null
@@ -1 +0,0 @@
-3.7.2
diff --git a/tools/docker/build_wheel.Dockerfile b/tools/docker/build_wheel.Dockerfile
index 8836afd536..db247b84c8 100644
--- a/tools/docker/build_wheel.Dockerfile
+++ b/tools/docker/build_wheel.Dockerfile
@@ -28,7 +28,7 @@ COPY requirements.txt .
 RUN python -m pip install -r requirements.txt
 
 COPY ./ /addons
-RUN rm /addons/.bazelversion
+RUN rm /addons/.bazeliskrc
 WORKDIR /addons
 
 # -------------------------------------------------------------------
diff --git a/tools/docker/cpu_tests.Dockerfile b/tools/docker/cpu_tests.Dockerfile
index 2d5c0a299c..daa49ac291 100644
--- a/tools/docker/cpu_tests.Dockerfile
+++ b/tools/docker/cpu_tests.Dockerfile
@@ -5,7 +5,7 @@ ARG TF_VERSION=2.7.0
 RUN pip install --default-timeout=1000 tensorflow-cpu==$TF_VERSION
 
 RUN apt-get update && apt-get install -y sudo rsync
-COPY tools/install_deps/install_bazelisk.sh .bazelversion ./
+COPY tools/install_deps/install_bazelisk.sh .bazeliskrc ./
 RUN bash install_bazelisk.sh
 
 COPY requirements.txt ./
diff --git a/tools/docker/sanity_check.Dockerfile b/tools/docker/sanity_check.Dockerfile
index 6c20ded466..8c31bd3ac9 100644
--- a/tools/docker/sanity_check.Dockerfile
+++ b/tools/docker/sanity_check.Dockerfile
@@ -40,7 +40,7 @@ COPY tools/install_deps/tensorflow-cpu.txt ./
 RUN pip install --default-timeout=1000 -r tensorflow-cpu.txt
 
 RUN apt-get update && apt-get install sudo
-COPY tools/install_deps/install_bazelisk.sh .bazelversion ./
+COPY tools/install_deps/install_bazelisk.sh .bazeliskrc ./
 RUN bash install_bazelisk.sh
 
 COPY ./ /addons
@@ -109,7 +109,7 @@ COPY tools/install_deps/pytest.txt ./
 RUN pip install -r pytest.txt
 
 RUN apt-get update && apt-get install -y sudo rsync
-COPY tools/install_deps/install_bazelisk.sh .bazelversion ./
+COPY tools/install_deps/install_bazelisk.sh .bazeliskrc ./
 RUN bash install_bazelisk.sh
 
 COPY ./ /addons
diff --git a/tools/releases/tf_auditwheel_patch.sh b/tools/releases/tf_auditwheel_patch.sh
index 1df2eaa0de..49d2a5cf77 100644
--- a/tools/releases/tf_auditwheel_patch.sh
+++ b/tools/releases/tf_auditwheel_patch.sh
@@ -18,5 +18,5 @@ set -e -x
 
 SITE_PKG_LOCATION=$(python -c "import site; print(site.getsitepackages()[0])")
 TF_SHARED_LIBRARY_NAME=$(grep -r TF_SHARED_LIBRARY_NAME .bazelrc | awk -F= '{print$2}')
-POLICY_JSON="${SITE_PKG_LOCATION}/auditwheel/policy/policy.json"
+POLICY_JSON="${SITE_PKG_LOCATION}/auditwheel/policy/manylinux-policy.json"
 sed -i "s/libresolv.so.2\"/libresolv.so.2\", $TF_SHARED_LIBRARY_NAME/g" $POLICY_JSON