diff --git a/common-manylinux.crosstool b/common-manylinux.crosstool
index f102ddf..ff8c6f7 100644
--- a/common-manylinux.crosstool
+++ b/common-manylinux.crosstool
@@ -16,7 +16,7 @@
 
 ENV MANYLINUX_DEPS="glibc-devel glibc-devel.i686 libstdc++-devel glib2-devel libX11-devel libXext-devel libXrender-devel mesa-libGL-devel libICE-devel libSM-devel"
 
-ENV PYTHON_COMPILE_DEPS="python-devel zlib-devel bzip2-devel expat-devel ncurses-devel readline-devel tk-devel gdbm-devel libdb-devel libpcap-devel xz-devel openssl-devel keyutils-libs-devel krb5-devel libcom_err-devel libidn-devel curl-devel perl-devel"
+ENV PYTHON_COMPILE_DEPS="python3-devel zlib-devel bzip2-devel expat-devel ncurses-devel readline-devel tk-devel gdbm-devel libdb-devel libpcap-devel xz-devel openssl-devel keyutils-libs-devel krb5-devel libcom_err-devel libidn-devel curl-devel perl-devel"
 
 ENV TOOLCHAIN_DEPS="devtoolset-9-binutils devtoolset-9-gcc devtoolset-9-gcc-c++ devtoolset-9-gcc-gfortran"
 
@@ -38,6 +38,9 @@ RUN \
     ${MANYLINUX_DEPS} && \
   yum clean all
 
+# Add symlink for compatibility
+RUN ln -s /usr/bin/python3 /usr/bin/python
+
 ENV XCC_PREFIX=/usr/xcc
 
 # Add the crosstool-ng script and image-specific toolchain configuration into
@@ -47,7 +50,6 @@ ENV XCC_PREFIX=/usr/xcc
 # for users.
 COPY \
   imagefiles/install-crosstool-ng-toolchain.sh \
-  imagefiles/crosstool-ng-expat.patch \
   manylinux2014-aarch64/crosstool-ng.config \
   /dockcross/
 
diff --git a/web-wasm/Dockerfile.in b/web-wasm/Dockerfile.in
index fd24165..1c1d3ff 100644
--- a/web-wasm/Dockerfile.in
+++ b/web-wasm/Dockerfile.in
@@ -1,4 +1,4 @@
-FROM emscripten/emsdk:2.0.4
+FROM emscripten/emsdk:2.0.20
 MAINTAINER Matt McCormick "matt.mccormick@kitware.com"
 
 # Revert back to "/bin/sh" as default shell
@@ -9,10 +9,6 @@ ARG DEBIAN_FRONTEND=noninteractive
 ARG REPO=http://cdn-fastly.deb.debian.org
 
 RUN \
-  bash -c "echo \"deb $REPO/debian buster main contrib non-free\" > /etc/apt/sources.list"  && \
-  bash -c "echo \"deb $REPO/debian buster-updates main contrib non-free\" >> /etc/apt/sources.list"  && \
-  bash -c "echo \"deb $REPO/debian-security buster/updates main\" >> /etc/apt/sources.list" && \
-  bash -c "echo \"deb http://ftp.debian.org/debian buster-backports main\" >> /etc/apt/sources.list" && \
   apt-get update --yes && \
   apt-get install --no-install-recommends --yes \
     automake \
@@ -35,8 +31,8 @@ RUN \
     ncurses-dev \
     pkg-config \
     libtool \
-    python \
-    python-pip \
+    python3 \
+    python3-pip \
     rsync \
     sed \
     ssh \
@@ -51,6 +47,9 @@ RUN \
   && \
   apt-get clean --yes
 
+# Add symlink for compatibility
+RUN ln -s /usr/bin/python3 /usr/bin/python
+
 #include "common.dockcross"
 
 #include "common.docker"