diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 28d5460a8..7810bece6 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -44,37 +44,37 @@
     GIT_CLONE_PATH: $CI_BUILDS_DIR/gitlab-kitware-sciviz-ci
 
 .centos7: &centos7
-  image: "kitware/vtkm:ci-centos7_cuda10.2-20200410"
+  image: "kitware/vtkm:ci-centos7_cuda10.2-20200529"
   extends:
     - .docker_image
 
 .centos8: &centos8
-  image: "kitware/vtkm:ci-centos8-20200410"
+  image: "kitware/vtkm:ci-centos8-20200529"
   extends:
     - .docker_image
 
 .rhel8: &rhel8
-  image: "kitware/vtkm:ci-rhel8_cuda10.2-20200410"
+  image: "kitware/vtkm:ci-rhel8_cuda10.2-20200529"
   extends:
     - .docker_image
 
 .ubuntu1604: &ubuntu1604
-  image: "kitware/vtkm:ci-ubuntu1604-20200410"
+  image: "kitware/vtkm:ci-ubuntu1604-20200529"
   extends:
     - .docker_image
 
 .ubuntu1604_cuda: &ubuntu1604_cuda
-  image: "kitware/vtkm:ci-ubuntu1604_cuda9.2-20200410"
+  image: "kitware/vtkm:ci-ubuntu1604_cuda9.2-20200529"
   extends:
     - .docker_image
 
 .ubuntu1804: &ubuntu1804
-  image: "kitware/vtkm:ci-ubuntu1804-20200410"
+  image: "kitware/vtkm:ci-ubuntu1804-20200529"
   extends:
     - .docker_image
 
 .ubuntu1804_cuda: &ubuntu1804_cuda
-  image: "kitware/vtkm:ci-ubuntu1804_cuda10.1-20200410"
+  image: "kitware/vtkm:ci-ubuntu1804_cuda10.1-20200529"
   extends:
     - .docker_image
 
diff --git a/.gitlab/ci/docker/centos7/cuda10.2/Dockerfile b/.gitlab/ci/docker/centos7/cuda10.2/Dockerfile
index cb16e0541..c0c1e718a 100644
--- a/.gitlab/ci/docker/centos7/cuda10.2/Dockerfile
+++ b/.gitlab/ci/docker/centos7/cuda10.2/Dockerfile
@@ -9,13 +9,15 @@ RUN yum install git git-lfs -y
 # Install CMake 3.13 as it is the minium for cuda builds
 RUN mkdir /opt/cmake && \
     curl -L https://github.com/Kitware/CMake/releases/download/v3.13.5/cmake-3.13.5-Linux-x86_64.sh > cmake-3.13.5-Linux-x86_64.sh && \
-    sh cmake-3.13.5-Linux-x86_64.sh --prefix=/opt/cmake/ --exclude-subdir --skip-license
+    sh cmake-3.13.5-Linux-x86_64.sh --prefix=/opt/cmake/ --exclude-subdir --skip-license && \
+    rm cmake-3.13.5-Linux-x86_64.sh
 
 # Provide CMake 3.17 so we can re-run tests easily
 # This will be used when we run just the tests
 RUN mkdir /opt/cmake-latest/ && \
-    curl -L https://github.com/Kitware/CMake/releases/download/v3.17.0/cmake-3.17.0-Linux-x86_64.sh > cmake-3.17.0-Linux-x86_64.sh && \
-    sh cmake-3.17.0-Linux-x86_64.sh --prefix=/opt/cmake-latest/ --exclude-subdir --skip-license && \
+    curl -L https://github.com/Kitware/CMake/releases/download/v3.17.3/cmake-3.17.3-Linux-x86_64.sh > cmake-3.17.3-Linux-x86_64.sh && \
+    sh cmake-3.17.3-Linux-x86_64.sh --prefix=/opt/cmake-latest/ --exclude-subdir --skip-license && \
+    rm cmake-3.17.3-Linux-x86_64.sh && \
     ln -s /opt/cmake-latest/bin/ctest /opt/cmake-latest/bin/ctest-latest
 
 ENV PATH "/opt/cmake/bin:/opt/cmake-latest/bin:${PATH}"
diff --git a/.gitlab/ci/docker/centos8/base/Dockerfile b/.gitlab/ci/docker/centos8/base/Dockerfile
index 2f75d8324..eb9b7f363 100644
--- a/.gitlab/ci/docker/centos8/base/Dockerfile
+++ b/.gitlab/ci/docker/centos8/base/Dockerfile
@@ -7,12 +7,10 @@ RUN yum install git git-lfs -y
 
 # Provide CMake 3.17 so we can re-run tests easily
 # This will be used when we run just the tests
-RUN mkdir /opt/cmake-latest/ && \
-    curl -L https://github.com/Kitware/CMake/releases/download/v3.17.0/cmake-3.17.0-Linux-x86_64.sh > cmake-3.17.0-Linux-x86_64.sh && \
-    sh cmake-3.17.0-Linux-x86_64.sh --prefix=/opt/cmake-latest/ --exclude-subdir --skip-license && \
-    ln -s /opt/cmake-latest/bin/ctest /opt/cmake-latest/bin/ctest-latest
+RUN mkdir /opt/cmake/ && \
+    curl -L https://github.com/Kitware/CMake/releases/download/v3.17.3/cmake-3.17.3-Linux-x86_64.sh > cmake-3.17.3-Linux-x86_64.sh && \
+    sh cmake-3.17.3-Linux-x86_64.sh --prefix=/opt/cmake/ --exclude-subdir --skip-license && \
+    rm cmake-3.17.3-Linux-x86_64.sh && \
+    ln -s /opt/cmake/bin/ctest /opt/cmake/bin/ctest-latest
 
-# Provide a consistent CMake path across all images. Just use the lastest cmake
-RUN mkdir -p /opt/cmake/bin && ln -s /opt/cmake-latest/bin/cmake /opt/cmake/bin/cmake
-
-ENV PATH "/opt/cmake/bin:/opt/cmake-latest/bin:${PATH}"
+ENV PATH "/opt/cmake/bin:${PATH}"
diff --git a/.gitlab/ci/docker/rhel8/cuda10.2/Dockerfile b/.gitlab/ci/docker/rhel8/cuda10.2/Dockerfile
index c0e6f547e..3406dbc5b 100644
--- a/.gitlab/ci/docker/rhel8/cuda10.2/Dockerfile
+++ b/.gitlab/ci/docker/rhel8/cuda10.2/Dockerfile
@@ -7,12 +7,10 @@ RUN yum install git git-lfs -y
 
 # Provide CMake 3.17 so we can re-run tests easily
 # This will be used when we run just the tests
-RUN mkdir /opt/cmake-latest/ && \
-    curl -L https://github.com/Kitware/CMake/releases/download/v3.17.0/cmake-3.17.0-Linux-x86_64.sh > cmake-3.17.0-Linux-x86_64.sh && \
-    sh cmake-3.17.0-Linux-x86_64.sh --prefix=/opt/cmake-latest/ --exclude-subdir --skip-license && \
-    ln -s /opt/cmake-latest/bin/ctest /opt/cmake-latest/bin/ctest-latest
+RUN mkdir /opt/cmake/ && \
+    curl -L https://github.com/Kitware/CMake/releases/download/v3.17.3/cmake-3.17.3-Linux-x86_64.sh > cmake-3.17.3-Linux-x86_64.sh && \
+    sh cmake-3.17.3-Linux-x86_64.sh --prefix=/opt/cmake/ --exclude-subdir --skip-license && \
+    rm cmake-3.17.3-Linux-x86_64.sh && \
+    ln -s /opt/cmake/bin/ctest /opt/cmake/bin/ctest-latest
 
-# Provide a consistent CMake path across all images. Just use the lastest cmake
-RUN mkdir -p /opt/cmake/bin && ln -s /opt/cmake-latest/bin/cmake /opt/cmake/bin/cmake
-
-ENV PATH "/opt/cmake/bin:/opt/cmake-latest/bin:${PATH}"
+ENV PATH "/opt/cmake/bin:${PATH}"
diff --git a/.gitlab/ci/docker/ubuntu1604/base/Dockerfile b/.gitlab/ci/docker/ubuntu1604/base/Dockerfile
index 8c933d947..2fdd54c3f 100644
--- a/.gitlab/ci/docker/ubuntu1604/base/Dockerfile
+++ b/.gitlab/ci/docker/ubuntu1604/base/Dockerfile
@@ -39,13 +39,15 @@ RUN mkdir /opt/openmpi && \
 # Install CMake 3.12 as it is the minium for non-cuda builds
 RUN mkdir /opt/cmake && \
     curl -L https://github.com/Kitware/CMake/releases/download/v3.12.4/cmake-3.12.4-Linux-x86_64.sh > cmake-3.12.4-Linux-x86_64.sh && \
-    sh cmake-3.12.4-Linux-x86_64.sh --prefix=/opt/cmake/ --exclude-subdir --skip-license
+    sh cmake-3.12.4-Linux-x86_64.sh --prefix=/opt/cmake/ --exclude-subdir --skip-license && \
+    rm cmake-3.12.4-Linux-x86_64.sh
 
 # Provide CMake 3.17 so we can re-run tests easily
 # This will be used when we run just the tests
 RUN mkdir /opt/cmake-latest/ && \
-    curl -L https://github.com/Kitware/CMake/releases/download/v3.17.0/cmake-3.17.0-Linux-x86_64.sh > cmake-3.17.0-Linux-x86_64.sh && \
-    sh cmake-3.17.0-Linux-x86_64.sh --prefix=/opt/cmake-latest/ --exclude-subdir --skip-license && \
+    curl -L https://github.com/Kitware/CMake/releases/download/v3.17.3/cmake-3.17.3-Linux-x86_64.sh > cmake-3.17.3-Linux-x86_64.sh && \
+    sh cmake-3.17.3-Linux-x86_64.sh --prefix=/opt/cmake-latest/ --exclude-subdir --skip-license && \
+    rm cmake-3.17.3-Linux-x86_64.sh && \
     ln -s /opt/cmake-latest/bin/ctest /opt/cmake-latest/bin/ctest-latest
 
 ENV PATH "/opt/cmake/bin:/opt/cmake-latest/bin:${PATH}"
diff --git a/.gitlab/ci/docker/ubuntu1604/cuda9.2/Dockerfile b/.gitlab/ci/docker/ubuntu1604/cuda9.2/Dockerfile
index e05455b64..48f70b895 100644
--- a/.gitlab/ci/docker/ubuntu1604/cuda9.2/Dockerfile
+++ b/.gitlab/ci/docker/ubuntu1604/cuda9.2/Dockerfile
@@ -37,13 +37,15 @@ RUN mkdir /opt/openmpi && \
 # Install CMake 3.13 as it is the minium for cuda builds
 RUN mkdir /opt/cmake && \
     curl -L https://github.com/Kitware/CMake/releases/download/v3.13.5/cmake-3.13.5-Linux-x86_64.sh > cmake-3.13.5-Linux-x86_64.sh && \
-    sh cmake-3.13.5-Linux-x86_64.sh --prefix=/opt/cmake/ --exclude-subdir --skip-license
+    sh cmake-3.13.5-Linux-x86_64.sh --prefix=/opt/cmake/ --exclude-subdir --skip-license && \
+    rm cmake-3.13.5-Linux-x86_64.sh
 
 # Provide CMake 3.17 so we can re-run tests easily
 # This will be used when we run just the tests
 RUN mkdir /opt/cmake-latest/ && \
-    curl -L https://github.com/Kitware/CMake/releases/download/v3.17.0/cmake-3.17.0-Linux-x86_64.sh > cmake-3.17.0-Linux-x86_64.sh && \
-    sh cmake-3.17.0-Linux-x86_64.sh --prefix=/opt/cmake-latest/ --exclude-subdir --skip-license && \
+    curl -L https://github.com/Kitware/CMake/releases/download/v3.17.3/cmake-3.17.3-Linux-x86_64.sh > cmake-3.17.3-Linux-x86_64.sh && \
+    sh cmake-3.17.3-Linux-x86_64.sh --prefix=/opt/cmake-latest/ --exclude-subdir --skip-license && \
+    rm cmake-3.17.3-Linux-x86_64.sh && \
     ln -s /opt/cmake-latest/bin/ctest /opt/cmake-latest/bin/ctest-latest
 
 ENV PATH "/opt/cmake/bin:/opt/cmake-latest/bin:${PATH}"
diff --git a/.gitlab/ci/docker/ubuntu1804/base/Dockerfile b/.gitlab/ci/docker/ubuntu1804/base/Dockerfile
index 7c7159d26..44f95deff 100644
--- a/.gitlab/ci/docker/ubuntu1804/base/Dockerfile
+++ b/.gitlab/ci/docker/ubuntu1804/base/Dockerfile
@@ -31,14 +31,16 @@ RUN git-lfs install
 # Provide a consistent CMake path across all images
 # Allow tests that require CMake to work correctly
 RUN mkdir /opt/cmake && \
-    curl -L https://github.com/Kitware/CMake/releases/download/v3.16.4/cmake-3.16.4-Linux-x86_64.sh > cmake-3.16.4-Linux-x86_64.sh && \
-    sh cmake-3.16.4-Linux-x86_64.sh --prefix=/opt/cmake/ --exclude-subdir --skip-license
+    curl -L https://github.com/Kitware/CMake/releases/download/v3.16.7/cmake-3.16.7-Linux-x86_64.sh > cmake-3.16.7-Linux-x86_64.sh && \
+    sh cmake-3.16.7-Linux-x86_64.sh --prefix=/opt/cmake/ --exclude-subdir --skip-license && \
+    rm cmake-3.16.7-Linux-x86_64.sh
 
 # Provide CMake 3.17 so we can re-run tests easily
 # This will be used when we run just the tests
 RUN mkdir /opt/cmake-latest/ && \
-    curl -L https://github.com/Kitware/CMake/releases/download/v3.17.0/cmake-3.17.0-Linux-x86_64.sh > cmake-3.17.0-Linux-x86_64.sh && \
-    sh cmake-3.17.0-Linux-x86_64.sh --prefix=/opt/cmake-latest/ --exclude-subdir --skip-license && \
+    curl -L https://github.com/Kitware/CMake/releases/download/v3.17.3/cmake-3.17.3-Linux-x86_64.sh > cmake-3.17.3-Linux-x86_64.sh && \
+    sh cmake-3.17.3-Linux-x86_64.sh --prefix=/opt/cmake-latest/ --exclude-subdir --skip-license && \
+    rm cmake-3.17.3-Linux-x86_64.sh && \
     ln -s /opt/cmake-latest/bin/ctest /opt/cmake-latest/bin/ctest-latest
 
 ENV PATH "/opt/cmake/bin:/opt/cmake-latest/bin:${PATH}"
diff --git a/.gitlab/ci/docker/ubuntu1804/cuda10.1/Dockerfile b/.gitlab/ci/docker/ubuntu1804/cuda10.1/Dockerfile
index acc8e9111..91f68ae62 100644
--- a/.gitlab/ci/docker/ubuntu1804/cuda10.1/Dockerfile
+++ b/.gitlab/ci/docker/ubuntu1804/cuda10.1/Dockerfile
@@ -22,14 +22,16 @@ RUN git-lfs install
 # Provide a consistent CMake path across all images
 # Allow tests that require CMake to work correctly
 RUN mkdir /opt/cmake && \
-    curl -L https://github.com/Kitware/CMake/releases/download/v3.16.4/cmake-3.16.4-Linux-x86_64.sh > cmake-3.16.4-Linux-x86_64.sh && \
-    sh cmake-3.16.4-Linux-x86_64.sh --prefix=/opt/cmake/ --exclude-subdir --skip-license
+    curl -L https://github.com/Kitware/CMake/releases/download/v3.16.7/cmake-3.16.7-Linux-x86_64.sh > cmake-3.16.7-Linux-x86_64.sh && \
+    sh cmake-3.16.7-Linux-x86_64.sh --prefix=/opt/cmake/ --exclude-subdir --skip-license && \
+    rm cmake-3.16.7-Linux-x86_64.sh
 
 # Provide CMake 3.17 so we can re-run tests easily
 # This will be used when we run just the tests
 RUN mkdir /opt/cmake-latest/ && \
-    curl -L https://github.com/Kitware/CMake/releases/download/v3.17.0/cmake-3.17.0-Linux-x86_64.sh > cmake-3.17.0-Linux-x86_64.sh && \
-    sh cmake-3.17.0-Linux-x86_64.sh --prefix=/opt/cmake-latest/ --exclude-subdir --skip-license && \
+    curl -L https://github.com/Kitware/CMake/releases/download/v3.17.3/cmake-3.17.3-Linux-x86_64.sh > cmake-3.17.3-Linux-x86_64.sh && \
+    sh cmake-3.17.3-Linux-x86_64.sh --prefix=/opt/cmake-latest/ --exclude-subdir --skip-license && \
+    rm cmake-3.17.3-Linux-x86_64.sh && \
     ln -s /opt/cmake-latest/bin/ctest /opt/cmake-latest/bin/ctest-latest
 
 ENV PATH "/opt/cmake/bin:/opt/cmake-latest/bin:${PATH}"