diff --git a/.github/env/Linux/auditwheel-keep-libjvm.py b/.github/env/Linux/auditwheel-keep-libjvm.py
deleted file mode 100755
index 4f77bae4..00000000
--- a/.github/env/Linux/auditwheel-keep-libjvm.py
+++ /dev/null
@@ -1,11 +0,0 @@
-import re
-import sys
-from auditwheel.main import main
-from auditwheel.policy import _POLICIES
-
-for policy in _POLICIES:
-  policy['lib_whitelist'].append('libjvm.so')
-
-if __name__ == '__main__':
-  sys.argv[0] = re.sub(r'(-script\.pyw|\.exe)?$', '', sys.argv[0])
-  sys.exit(main())
diff --git a/.github/env/Linux/bdist-wheel.sh b/.github/env/Linux/bdist-wheel.sh
index a5de44ff..04716174 100755
--- a/.github/env/Linux/bdist-wheel.sh
+++ b/.github/env/Linux/bdist-wheel.sh
@@ -12,9 +12,10 @@ python -m pip install -r "${__dir}/requirements.txt"
 python setup.py bdist_wheel --dist-dir dist.linux
 
 # Note: auditwheel only works with a single file argument - we are relying on finding exactly one wheel
-python "${__dir}/auditwheel-keep-libjvm.py" \
+auditwheel \
   repair \
   --plat "manylinux_2_17_$(arch)" \
   --only-plat \
+  --exclude libjvm.so \
   --wheel-dir dist/ \
   dist.linux/*
diff --git a/.github/env/Linux/requirements.txt b/.github/env/Linux/requirements.txt
index a0d07ab7..3828bf67 100644
--- a/.github/env/Linux/requirements.txt
+++ b/.github/env/Linux/requirements.txt
@@ -1,4 +1,6 @@
 setuptools
 wheel
-auditwheel
+auditwheel>=6.0.0; python_version >= '3.8'
+auditwheel>=5.4.0; python_version == '3.7'
+auditwheel>=5.3.0; python_version == '3.6'
 patchelf