diff --git a/build_tools/python-builder/build-wheels.sh b/build_tools/python-builder/build-wheels.sh
index e7a5261..7bdcd31 100644
--- a/build_tools/python-builder/build-wheels.sh
+++ b/build_tools/python-builder/build-wheels.sh
@@ -8,7 +8,7 @@ yum install -y  zlib-devel
 ln -fs /usr/local/bin/cmake /usr/bin/cmake
 
 
-ALL_PYTHON="cp36-cp36m" # cp37-cp37m cp38-cp38" 
+ALL_PYTHON="cp39-cp39 cp310-cp310 cp311-cp311" 
 
 # Compile wheels
 for pkg in $ALL_PYTHON; do
diff --git a/setup.py b/setup.py
index 2afcaa7..b25ff43 100755
--- a/setup.py
+++ b/setup.py
@@ -2,6 +2,7 @@ import stat
 import os
 import sys
 import shutil
+from sysconfig import get_config_var
 from distutils.command.install_data import install_data
 import pathlib
 from setuptools import find_packages, setup, Extension
@@ -168,8 +169,7 @@ class BuildCMakeExt(build_ext):
         self.spawn(['bash', 'build.sh', '--build-dir', self.build_temp,
                     f"--python={sys.executable}", "--c-compiler", c_compiler,
                     "--cxx-compiler", cxx_compiler, '--purge',
-                    '--skip-building-tests', '--hades-python', '--install-system-python',
-                    '--deprecated',
+                    '--hades-python', '--install-system-python',
                     '--extra-flags', f"-DPYTHON_SITE_PACKAGES={install_dir} -DINSTALL_COMPATIBILITY_PYBORG=OFF -DINSTALL_SHARED=ON -DDATA_INSTALL_DIR={install_dir}/aquila_borg/_data"
                     ])