diff --git a/tools/dockerfile/grpc_artifact_linux_x64/Dockerfile b/tools/dockerfile/grpc_artifact_linux_x64/Dockerfile
index b3c16951229..d0faf057679 100644
--- a/tools/dockerfile/grpc_artifact_linux_x64/Dockerfile
+++ b/tools/dockerfile/grpc_artifact_linux_x64/Dockerfile
@@ -84,7 +84,7 @@ RUN apt-get update && apt-get install -t jessie-backports -y cmake && apt-get cl
 # Python AuditWheel dependencies (needed to check manylinux1 compatibility)
 
 RUN apt-get install -y python3 python3-pip
-RUN pip3 install auditwheel==1.10.0
+RUN pip3 install auditwheel==2.1.1
 
 
 RUN mkdir /var/local/jenkins
diff --git a/tools/dockerfile/grpc_artifact_linux_x86/Dockerfile b/tools/dockerfile/grpc_artifact_linux_x86/Dockerfile
index c9054653067..8738137f5b2 100644
--- a/tools/dockerfile/grpc_artifact_linux_x86/Dockerfile
+++ b/tools/dockerfile/grpc_artifact_linux_x86/Dockerfile
@@ -77,7 +77,7 @@ RUN apt-get update && apt-get install -t jessie-backports -y cmake && apt-get cl
 # Python AuditWheel dependencies (needed to check manylinux1 compatibility)
 
 RUN apt-get install -y python3 python3-pip
-RUN pip3 install auditwheel==1.10.0
+RUN pip3 install auditwheel==2.1.1
 
 
 RUN mkdir /var/local/jenkins
diff --git a/tools/dockerfile/grpc_artifact_python_manylinux1_x64/Dockerfile b/tools/dockerfile/grpc_artifact_python_manylinux1_x64/Dockerfile
index c36ad6bec58..1ff6aa062a2 100644
--- a/tools/dockerfile/grpc_artifact_python_manylinux1_x64/Dockerfile
+++ b/tools/dockerfile/grpc_artifact_python_manylinux1_x64/Dockerfile
@@ -28,11 +28,4 @@ RUN /opt/python/cp34-cp34m/bin/pip install cython
 RUN /opt/python/cp35-cp35m/bin/pip install cython
 RUN /opt/python/cp36-cp36m/bin/pip install cython
 RUN /opt/python/cp37-cp37m/bin/pip install cython
-
-####################################################
-# Install auditwheel with fix for namespace packages
-RUN git clone https://github.com/pypa/auditwheel /usr/local/src/auditwheel
-RUN cd /usr/local/src/auditwheel && git checkout 2.1
-RUN /opt/python/cp36-cp36m/bin/pip install /usr/local/src/auditwheel
-RUN rm /usr/local/bin/auditwheel
-RUN cd /usr/local/bin && ln -s /opt/python/cp36-cp36m/bin/auditwheel
+RUN /opt/python/cp38-cp38/bin/pip install cython
diff --git a/tools/dockerfile/grpc_artifact_python_manylinux1_x86/Dockerfile b/tools/dockerfile/grpc_artifact_python_manylinux1_x86/Dockerfile
index a33e0517ae2..18b4cb62927 100644
--- a/tools/dockerfile/grpc_artifact_python_manylinux1_x86/Dockerfile
+++ b/tools/dockerfile/grpc_artifact_python_manylinux1_x86/Dockerfile
@@ -28,12 +28,5 @@ RUN /opt/python/cp34-cp34m/bin/pip install cython
 RUN /opt/python/cp35-cp35m/bin/pip install cython
 RUN /opt/python/cp36-cp36m/bin/pip install cython
 RUN /opt/python/cp37-cp37m/bin/pip install cython
-
-####################################################
-# Install auditwheel with fix for namespace packages
-RUN git clone https://github.com/pypa/auditwheel /usr/local/src/auditwheel
-RUN cd /usr/local/src/auditwheel && git checkout 2.1
-RUN /opt/python/cp36-cp36m/bin/pip install /usr/local/src/auditwheel
-RUN rm /usr/local/bin/auditwheel
-RUN cd /usr/local/bin && ln -s /opt/python/cp36-cp36m/bin/auditwheel
-
+RUN /opt/python/cp37-cp37m/bin/pip install cython
+RUN /opt/python/cp38-cp38/bin/pip install cython
diff --git a/tools/dockerfile/grpc_artifact_python_manylinux2010_x64/Dockerfile b/tools/dockerfile/grpc_artifact_python_manylinux2010_x64/Dockerfile
index 37e2da568ae..66aefcaac28 100644
--- a/tools/dockerfile/grpc_artifact_python_manylinux2010_x64/Dockerfile
+++ b/tools/dockerfile/grpc_artifact_python_manylinux2010_x64/Dockerfile
@@ -28,11 +28,5 @@ RUN /opt/python/cp34-cp34m/bin/pip install cython
 RUN /opt/python/cp35-cp35m/bin/pip install cython
 RUN /opt/python/cp36-cp36m/bin/pip install cython
 RUN /opt/python/cp37-cp37m/bin/pip install cython
-
-####################################################
-# Install auditwheel with fix for namespace packages
-RUN git clone https://github.com/pypa/auditwheel /usr/local/src/auditwheel
-RUN cd /usr/local/src/auditwheel && git checkout 2.1
-RUN /opt/python/cp36-cp36m/bin/pip install /usr/local/src/auditwheel
-RUN rm /usr/local/bin/auditwheel
-RUN cd /usr/local/bin && ln -s /opt/python/cp36-cp36m/bin/auditwheel
+RUN /opt/python/cp37-cp37m/bin/pip install cython
+RUN /opt/python/cp38-cp38/bin/pip install cython
diff --git a/tools/dockerfile/grpc_artifact_python_manylinux2010_x86/Dockerfile b/tools/dockerfile/grpc_artifact_python_manylinux2010_x86/Dockerfile
new file mode 100644
index 00000000000..f55a8785182
--- /dev/null
+++ b/tools/dockerfile/grpc_artifact_python_manylinux2010_x86/Dockerfile
@@ -0,0 +1,32 @@
+# Copyright 2019 The gRPC Authors
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# Docker file for building gRPC manylinux Python artifacts.
+
+FROM quay.io/pypa/manylinux2010_i686
+
+# Update the package manager
+RUN yum update -y
+RUN yum install -y curl-devel expat-devel gettext-devel linux-headers openssl-devel zlib-devel gcc
+
+###################################
+# Install Python build requirements
+RUN /opt/python/cp27-cp27m/bin/pip install cython
+RUN /opt/python/cp27-cp27mu/bin/pip install cython
+RUN /opt/python/cp34-cp34m/bin/pip install cython
+RUN /opt/python/cp35-cp35m/bin/pip install cython
+RUN /opt/python/cp36-cp36m/bin/pip install cython
+RUN /opt/python/cp37-cp37m/bin/pip install cython
+RUN /opt/python/cp37-cp37m/bin/pip install cython
+RUN /opt/python/cp38-cp38/bin/pip install cython
diff --git a/tools/run_tests/artifacts/build_artifact_python.sh b/tools/run_tests/artifacts/build_artifact_python.sh
index 91eb21fd7ee..1fc7fd67a6f 100755
--- a/tools/run_tests/artifacts/build_artifact_python.sh
+++ b/tools/run_tests/artifacts/build_artifact_python.sh
@@ -79,12 +79,12 @@ ${SETARCH_CMD} "${PYTHON}" tools/distrib/python/grpcio_tools/setup.py bdist_whee
 if [ "$GRPC_BUILD_MANYLINUX_WHEEL" != "" ]
 then
   for wheel in dist/*.whl; do
-    "${AUDITWHEEL}" show "$wheel" | tee /dev/stderr |  grep -E -w 'manylinux(1|2010)_(x86_64|i686)'
+    "${AUDITWHEEL}" show "$wheel" | tee /dev/stderr |  grep -E -w "$AUDITWHEEL_PLAT"
     "${AUDITWHEEL}" repair "$wheel" -w "$ARTIFACT_DIR"
     rm "$wheel"
   done
   for wheel in tools/distrib/python/grpcio_tools/dist/*.whl; do
-    "${AUDITWHEEL}" show "$wheel" | tee /dev/stderr |  grep -E -w 'manylinux(1|2010)_(x86_64|i686)'
+    "${AUDITWHEEL}" show "$wheel" | tee /dev/stderr |  grep -E -w "$AUDITWHEEL_PLAT"
     "${AUDITWHEEL}" repair "$wheel" -w "$ARTIFACT_DIR"
     rm "$wheel"
   done