diff --git a/.readthedocs.yml b/.readthedocs.yml
new file mode 100644
index 000000000..b58aad088
--- /dev/null
+++ b/.readthedocs.yml
@@ -0,0 +1,11 @@
+# .readthedocs.yml
+# Read the Docs configuration file
+# See https://docs.readthedocs.io/en/stable/config-file/v2.html for details
+
+# Required
+version: 2
+
+# Optionally set the version of Python and requirements required to build your docs
+python:
+  install:
+    - requirements: docs/requirements.txt
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 5a7bd9a33..dfc037ad2 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -8,46 +8,26 @@ variables:
 
 strategy:
   matrix:
-    linux_gcc7:
-      VM_ImageName: 'ubuntu-16.04'
-      Compiler_ImageName: 'axom/tpls:gcc-7'
-      C_COMPILER: '/usr/bin/gcc'
-      CXX_COMPILER: '/usr/bin/g++'
-      CMAKE_BIN_DIR: '/home/axom/axom_tpls/gcc-7.3.0/cmake-3.9.6/bin'
-      MPI_DIR: '/home/axom/axom_tpls/gcc-7.3.0/mpich-3.2.1'
-      MPI_FLAGS: '-DENABLE_MPI=ON -DMPI_C_COMPILER=$(MPI_DIR)/bin/mpicc -DMPI_CXX_COMPILER=$(MPI_DIR)/bin/mpicxx -DMPIEXEC=$(MPI_DIR)/bin/mpiexec -DMPIEXEC_NUMPROC_FLAG=-n'
-      CMAKE_FLAGS: '-DCMAKE_C_COMPILER=$(C_COMPILER) -DCMAKE_CXX_COMPILER=$(CXX_COMPILER) -DENABLE_GTEST_DEATH_TESTS=OFF $(MPI_FLAGS) -DENABLE_OPENMP=ON'
-      TEST_TARGET: 'linux_gcc7'
     linux_gcc8:
-      VM_ImageName: 'ubuntu-16.04'
-      Compiler_ImageName: 'axom/tpls:gcc-8'
+      VM_ImageName: 'ubuntu-20.04'
+      Compiler_ImageName: 'axom/tpls:gcc-8_10-21-21_21h-28m'
       C_COMPILER: '/usr/bin/gcc'
       CXX_COMPILER: '/usr/bin/g++'
-      CMAKE_BIN_DIR: '/home/axom/axom_tpls/gcc-8.1.0/cmake-3.10.1/bin'
-      MPI_DIR: '/home/axom/axom_tpls/gcc-8.1.0/mpich-3.3.2'
+      CMAKE_BIN_DIR: '/usr/bin'
+      MPI_DIR: '/usr'
       MPI_FLAGS: '-DENABLE_MPI=ON -DMPI_C_COMPILER=$(MPI_DIR)/bin/mpicc -DMPI_CXX_COMPILER=$(MPI_DIR)/bin/mpicxx -DMPIEXEC=$(MPI_DIR)/bin/mpiexec -DMPIEXEC_NUMPROC_FLAG=-n'
       CMAKE_FLAGS: '-DCMAKE_C_COMPILER=$(C_COMPILER) -DCMAKE_CXX_COMPILER=$(CXX_COMPILER) -DENABLE_GTEST_DEATH_TESTS=OFF $(MPI_FLAGS) -DENABLE_OPENMP=ON'
       TEST_TARGET: 'linux_gcc8'
-    linux_clang4:
-      VM_ImageName: 'ubuntu-16.04'
-      Compiler_ImageName: 'axom/tpls:clang-4'
-      C_COMPILER: '/usr/bin/clang'
-      CXX_COMPILER: '/usr/bin/clang++'
-      CMAKE_BIN_DIR: '/home/axom/axom_tpls/clang-4.0.0/cmake-3.10.1/bin'
-      MPI_DIR: '/home/axom/axom_tpls/clang-4.0.0/mpich-3.0.4'
-      MPI_FLAGS: '-DENABLE_MPI=ON -DMPI_C_COMPILER=$(MPI_DIR)/bin/mpicc -DMPI_CXX_COMPILER=$(MPI_DIR)/bin/mpicxx -DMPIEXEC=$(MPI_DIR)/bin/mpiexec -DMPIEXEC_NUMPROC_FLAG=-n'
-      CMAKE_FLAGS: '-DCMAKE_C_COMPILER=$(C_COMPILER) -DCMAKE_CXX_COMPILER=$(CXX_COMPILER) -DENABLE_GTEST_DEATH_TESTS=OFF $(MPI_FLAGS) -DENABLE_OPENMP=ON'
-      TEST_TARGET: 'linux_clang4'
-    linux_clang6:
-      VM_ImageName: 'ubuntu-16.04'
-      Compiler_ImageName: 'axom/tpls:clang-6'
+    linux_clang10:
+      VM_ImageName: 'ubuntu-18.04'
+      Compiler_ImageName: 'axom/tpls:clang-10_10-21-21_21h-28m'
       C_COMPILER: '/usr/bin/clang'
       CXX_COMPILER: '/usr/bin/clang++'
-      CMAKE_BIN_DIR: '/home/axom/axom_tpls/clang-6.0.0/cmake-3.10.1/bin'
-      MPI_DIR: '/home/axom/axom_tpls/clang-6.0.0/mpich-3.0.4'
+      CMAKE_BIN_DIR: '/usr/bin'
+      MPI_DIR: '/usr'
       MPI_FLAGS: '-DENABLE_MPI=ON -DMPI_C_COMPILER=$(MPI_DIR)/bin/mpicc -DMPI_CXX_COMPILER=$(MPI_DIR)/bin/mpicxx -DMPIEXEC=$(MPI_DIR)/bin/mpiexec -DMPIEXEC_NUMPROC_FLAG=-n'
       CMAKE_FLAGS: '-DCMAKE_C_COMPILER=$(C_COMPILER) -DCMAKE_CXX_COMPILER=$(CXX_COMPILER) -DENABLE_GTEST_DEATH_TESTS=OFF $(MPI_FLAGS) -DENABLE_OPENMP=ON'
-      TEST_TARGET: 'linux_clang6'
+      TEST_TARGET: 'linux_clang10'
     osx_gcc:
       VM_ImageName: 'macos-10.14'
       CMAKE_FLAGS: ''
diff --git a/docs/requirements.txt b/docs/requirements.txt
new file mode 100644
index 000000000..93120e66c
--- /dev/null
+++ b/docs/requirements.txt
@@ -0,0 +1 @@
+docutils<0.18