diff --git a/common.docker b/common.docker
index 62a36c6..7ef8a72 100644
--- a/common.docker
+++ b/common.docker
@@ -1,7 +1,7 @@
 WORKDIR /usr/src
 
-ARG GIT_VERSION=2.31.1
-ARG CMAKE_VERSION=3.17.1
+ARG GIT_VERSION=2.32.0
+ARG CMAKE_VERSION=3.20.5
 
 # Image build scripts
 COPY \
@@ -23,7 +23,7 @@ RUN \
   /buildscripts/build-and-install-openssh.sh && \
   /buildscripts/build-and-install-curl.sh && \
   /buildscripts/build-and-install-git.sh && \
-  /buildscripts/install-cmake-binary.sh $X86_FLAG && \
+  if [ "$CMAKE_BIN" = "true" ]; then CMAKE_VERSION=3.17.1 && /buildscripts/install-cmake-binary.sh $X86_FLAG;else /buildscripts/build-and-install-cmake.sh  $X86_FLAG;fi && \
   /buildscripts/install-liquidprompt-binary.sh && \
   PYTHON=$([ -e /opt/python/cp38-cp38/bin/python ] && echo "/opt/python/cp38-cp38/bin/python" || echo "python3") && \
   /buildscripts/install-python-packages.sh -python ${PYTHON} && \
diff --git a/imagefiles/build-and-install-cmake.sh b/imagefiles/build-and-install-cmake.sh
index 2862710..adb4e7a 100755
--- a/imagefiles/build-and-install-cmake.sh
+++ b/imagefiles/build-and-install-cmake.sh
@@ -35,8 +35,10 @@ mkdir /usr/src/CMake-build
 cd /usr/src/CMake-build
 
 ${WRAPPER} /usr/src/CMake/bootstrap \
-  --parallel=$(grep -c processor /proc/cpuinfo)
-${WRAPPER} make -j$(grep -c processor /proc/cpuinfo)
+  --parallel=$(nproc) \
+  -- -DCMAKE_USE_OPENSSL=OFF
+${WRAPPER} make -j$(nproc)
+
 
 mkdir /usr/src/CMake-ssl-build
 cd /usr/src/CMake-ssl-build
@@ -48,7 +50,7 @@ ${WRAPPER} /usr/src/CMake-build/bin/cmake \
   -DCMAKE_USE_OPENSSL:BOOL=ON \
   -DOPENSSL_ROOT_DIR:PATH=/usr/local/ssl \
   ../CMake
-${WRAPPER} make -j$(grep -c processor /proc/cpuinfo) install
+${WRAPPER} make -j$(nproc) install
 
 # Cleanup install tree
 cd /usr/src/cmake-$CMAKE_VERSION
diff --git a/imagefiles/build-and-install-curl.sh b/imagefiles/build-and-install-curl.sh
index cd0393d..bb347ad 100755
--- a/imagefiles/build-and-install-curl.sh
+++ b/imagefiles/build-and-install-curl.sh
@@ -18,7 +18,7 @@ function do_curl_build {
     # We do this shared to avoid obnoxious linker issues where git couldn't
     # link properly. If anyone wants to make this build statically go for it.
     LIBS=-ldl CFLAGS=-Wl,--exclude-libs,ALL ./configure --with-ssl --disable-static > /dev/null
-    make > /dev/null
+    make -j$(nproc) > /dev/null
     make install > /dev/null
 }
 
diff --git a/imagefiles/build-and-install-git.sh b/imagefiles/build-and-install-git.sh
index 0338857..9d1f249 100755
--- a/imagefiles/build-and-install-git.sh
+++ b/imagefiles/build-and-install-git.sh
@@ -32,7 +32,7 @@ rm -f git-${GIT_VERSION}.tar.gz
 
 pushd git-${GIT_VERSION}
 ./configure --prefix=/usr/local --with-curl
-make
+make -j$(nproc)
 make install
 popd
 
diff --git a/imagefiles/build-and-install-openssl.sh b/imagefiles/build-and-install-openssl.sh
index d0ff582..19a6610 100755
--- a/imagefiles/build-and-install-openssl.sh
+++ b/imagefiles/build-and-install-openssl.sh
@@ -59,7 +59,7 @@ PERL_DOWNLOAD_URL=https://www.cpan.org/src/5.0
 
 function do_perl_build {
     ${WRAPPER} sh Configure -des -Dprefix=/opt/perl > /dev/null
-    ${WRAPPER} make > /dev/null
+    ${WRAPPER} make -j$(nproc) > /dev/null
     ${WRAPPER} make install > /dev/null
 }
 
@@ -78,7 +78,7 @@ function build_perl {
 
 function do_openssl_build {
     ${WRAPPER} ./config no-shared -fPIC $CONFIG_FLAG --prefix=/usr/local/ssl --openssldir=/usr/local/ssl > /dev/null
-    ${WRAPPER} make > /dev/null
+    ${WRAPPER} make -j$(nproc) > /dev/null
     ${WRAPPER} make install_sw > /dev/null
 }
 
diff --git a/manylinux1-x64/Dockerfile.in b/manylinux1-x64/Dockerfile.in
index 4a1f7ea..8d57eb4 100644
--- a/manylinux1-x64/Dockerfile.in
+++ b/manylinux1-x64/Dockerfile.in
@@ -2,6 +2,7 @@ FROM quay.io/pypa/manylinux1_x86_64:latest
 MAINTAINER Matt McCormick "matt.mccormick@kitware.com"
 
 ENV DEFAULT_DOCKCROSS_IMAGE dockcross/manylinux1-x64
+ENV CMAKE_BIN true
 
 #include "common.manylinux"
 
diff --git a/manylinux1-x86/Dockerfile.in b/manylinux1-x86/Dockerfile.in
index 98eacc2..3ba63be 100644
--- a/manylinux1-x86/Dockerfile.in
+++ b/manylinux1-x86/Dockerfile.in
@@ -2,6 +2,7 @@ FROM quay.io/pypa/manylinux1_i686:latest
 MAINTAINER Matt McCormick "matt.mccormick@kitware.com"
 
 ENV DEFAULT_DOCKCROSS_IMAGE dockcross/manylinux1-x86
+ENV CMAKE_BIN true
 
 #include "common.manylinux"