diff --git a/ci/docker/ubuntu-18.04-clang-cpp.dockerfile b/ci/docker/ubuntu-18.04-clang-cpp.dockerfile
index c60293df..92f087f3 100644
--- a/ci/docker/ubuntu-18.04-clang-cpp.dockerfile
+++ b/ci/docker/ubuntu-18.04-clang-cpp.dockerfile
@@ -1,7 +1,7 @@
 
 ARG arch=amd64
 ARG distro=18.04
-FROM ${arch}/ubuntu:${distro} as base
+FROM ${arch}/ubuntu:${distro} AS base
 
 ARG proxy=""
 ARG compiler=clang-7
@@ -64,29 +64,9 @@ ENV MPI_EXTRA_FLAGS="" \
     PATH=/usr/lib/ccache/:$PATH \
     CMAKE_EXE_LINKER_FLAGS="-pthread"
 
-FROM base as build
+FROM base AS build
 COPY . /checkpoint
-
-ARG MAGISTRATE_DOXYGEN_ENABLED
-ARG MAGISTRATE_TESTS_ENABLED
-ARG MAGISTRATE_EXAMPLES_ENABLED
-ARG MAGISTRATE_WARNINGS_AS_ERRORS
-ARG MAGISTRATE_MPI_ENABLED
-ARG MAGISTRATE_ASAN_ENABLED
-ARG MAGISTRATE_UBSAN_ENABLED
-ARG MAGISTRATE_SERIALIZATION_ERROR_CHECKING_ENABLED
-
-ENV MAGISTRATE_DOXYGEN_ENABLED=${MAGISTRATE_DOXYGEN_ENABLED} \
-    MAGISTRATE_TESTS_ENABLED=${MAGISTRATE_TESTS_ENABLED} \
-    MAGISTRATE_EXAMPLES_ENABLED=${MAGISTRATE_EXAMPLES_ENABLED} \
-    MAGISTRATE_WARNINGS_AS_ERRORS=${MAGISTRATE_WARNINGS_AS_ERRORS} \
-    MAGISTRATE_MPI_ENABLED=${MAGISTRATE_MPI_ENABLED} \
-    MAGISTRATE_ASAN_ENABLED=${MAGISTRATE_ASAN_ENABLED} \
-    MAGISTRATE_UBSAN_ENABLED=${MAGISTRATE_UBSAN_ENABLED} \
-    MAGISTRATE_SERIALIZATION_ERROR_CHECKING_ENABLED=${MAGISTRATE_SERIALIZATION_ERROR_CHECKING_ENABLED} \
-    CMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
-
 RUN /checkpoint/ci/build_cpp.sh /checkpoint /build
 
-FROM build as test
+FROM build AS test
 RUN /checkpoint/ci/test_cpp.sh /checkpoint /build
diff --git a/ci/docker/ubuntu-18.04-gnu-cpp.dockerfile b/ci/docker/ubuntu-18.04-gnu-cpp.dockerfile
index 88df3ec3..218fbeea 100644
--- a/ci/docker/ubuntu-18.04-gnu-cpp.dockerfile
+++ b/ci/docker/ubuntu-18.04-gnu-cpp.dockerfile
@@ -1,7 +1,7 @@
 
 ARG arch=amd64
 ARG distro=18.04
-FROM ${arch}/ubuntu:${distro} as base
+FROM ${arch}/ubuntu:${distro} AS base
 
 ARG proxy=""
 ARG compiler=gcc-8
@@ -72,29 +72,9 @@ RUN apt-get update -y -q && \
     apt-get clean && \
     rm -rf /var/lib/apt/lists/*
 
-FROM base as build
+FROM base AS build
 COPY . /checkpoint
-
-ARG MAGISTRATE_DOXYGEN_ENABLED
-ARG MAGISTRATE_TESTS_ENABLED
-ARG MAGISTRATE_EXAMPLES_ENABLED
-ARG MAGISTRATE_WARNINGS_AS_ERRORS
-ARG MAGISTRATE_MPI_ENABLED
-ARG MAGISTRATE_ASAN_ENABLED
-ARG MAGISTRATE_UBSAN_ENABLED
-ARG MAGISTRATE_SERIALIZATION_ERROR_CHECKING_ENABLED
-
-ENV MAGISTRATE_DOXYGEN_ENABLED=${MAGISTRATE_DOXYGEN_ENABLED} \
-    MAGISTRATE_TESTS_ENABLED=${MAGISTRATE_TESTS_ENABLED} \
-    MAGISTRATE_EXAMPLES_ENABLED=${MAGISTRATE_EXAMPLES_ENABLED} \
-    MAGISTRATE_WARNINGS_AS_ERRORS=${MAGISTRATE_WARNINGS_AS_ERRORS} \
-    MAGISTRATE_MPI_ENABLED=${MAGISTRATE_MPI_ENABLED} \
-    MAGISTRATE_ASAN_ENABLED=${MAGISTRATE_ASAN_ENABLED} \
-    MAGISTRATE_UBSAN_ENABLED=${MAGISTRATE_UBSAN_ENABLED} \
-    MAGISTRATE_SERIALIZATION_ERROR_CHECKING_ENABLED=${MAGISTRATE_SERIALIZATION_ERROR_CHECKING_ENABLED} \
-    CMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
-
 RUN /checkpoint/ci/build_cpp.sh /checkpoint /build
 
-FROM build as test
+FROM build AS test
 RUN /checkpoint/ci/test_cpp.sh /checkpoint /build
diff --git a/ci/docker/ubuntu-18.04-intel-cpp.dockerfile b/ci/docker/ubuntu-18.04-intel-cpp.dockerfile
index 3a700350..8eb130c6 100644
--- a/ci/docker/ubuntu-18.04-intel-cpp.dockerfile
+++ b/ci/docker/ubuntu-18.04-intel-cpp.dockerfile
@@ -1,6 +1,6 @@
 
 ARG compiler=icc-18
-FROM lifflander1/${compiler} as base
+FROM lifflander1/${compiler} AS base
 
 ARG proxy=""
 
@@ -65,29 +65,9 @@ ENV MPI_EXTRA_FLAGS="" \
     PATH=/usr/lib/ccache/:$PATH \
     LD_LIBRARY_PATH=/opt/intel/ld_library_path
 
-FROM base as build
+FROM base AS build
 COPY . /checkpoint
-
-ARG MAGISTRATE_DOXYGEN_ENABLED
-ARG MAGISTRATE_TESTS_ENABLED
-ARG MAGISTRATE_EXAMPLES_ENABLED
-ARG MAGISTRATE_WARNINGS_AS_ERRORS
-ARG MAGISTRATE_MPI_ENABLED
-ARG MAGISTRATE_ASAN_ENABLED
-ARG MAGISTRATE_UBSAN_ENABLED
-ARG MAGISTRATE_SERIALIZATION_ERROR_CHECKING_ENABLED
-
-ENV MAGISTRATE_DOXYGEN_ENABLED=${MAGISTRATE_DOXYGEN_ENABLED} \
-    MAGISTRATE_TESTS_ENABLED=${MAGISTRATE_TESTS_ENABLED} \
-    MAGISTRATE_EXAMPLES_ENABLED=${MAGISTRATE_EXAMPLES_ENABLED} \
-    MAGISTRATE_WARNINGS_AS_ERRORS=${MAGISTRATE_WARNINGS_AS_ERRORS} \
-    MAGISTRATE_MPI_ENABLED=${MAGISTRATE_MPI_ENABLED} \
-    MAGISTRATE_ASAN_ENABLED=${MAGISTRATE_ASAN_ENABLED} \
-    MAGISTRATE_UBSAN_ENABLED=${MAGISTRATE_UBSAN_ENABLED} \
-    MAGISTRATE_SERIALIZATION_ERROR_CHECKING_ENABLED=${MAGISTRATE_SERIALIZATION_ERROR_CHECKING_ENABLED} \
-    CMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
-
 RUN /checkpoint/ci/build_cpp.sh /checkpoint /build
 
-FROM build as test
+FROM build AS test
 RUN /checkpoint/ci/test_cpp.sh /checkpoint /build
diff --git a/ci/docker/ubuntu-20.04-gnu-docs.dockerfile b/ci/docker/ubuntu-20.04-gnu-docs.dockerfile
index 8ea2af0c..8ef7543e 100644
--- a/ci/docker/ubuntu-20.04-gnu-docs.dockerfile
+++ b/ci/docker/ubuntu-20.04-gnu-docs.dockerfile
@@ -64,10 +64,5 @@ FROM base AS build
 COPY . /checkpoint
 
 ARG token
-ARG MAGISTRATE_DOXYGEN_ENABLED
-ARG CMAKE_BUILD_TYPE
-
-ENV MAGISTRATE_DOXYGEN_ENABLED=${MAGISTRATE_DOXYGEN_ENABLED} \
-    CMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
 
 RUN /checkpoint/ci/build_cpp.sh /checkpoint /build "${token}"
diff --git a/ci/docker/ubuntu-20.04-nvidia-cpp.dockerfile b/ci/docker/ubuntu-20.04-nvidia-cpp.dockerfile
index fb99355c..dec3782d 100644
--- a/ci/docker/ubuntu-20.04-nvidia-cpp.dockerfile
+++ b/ci/docker/ubuntu-20.04-nvidia-cpp.dockerfile
@@ -2,7 +2,7 @@
 ARG compiler=11.2.2
 ARG arch=amd64
 ARG ubuntu=20.04
-FROM --platform=${arch} nvidia/cuda:${compiler}-devel-ubuntu${ubuntu} as base
+FROM --platform=${arch} nvidia/cuda:${compiler}-devel-ubuntu${ubuntu} AS base
 
 ARG proxy=""
 
@@ -62,29 +62,9 @@ COPY ./ci/deps/kokkos-kernels.sh kokkos-kernels.sh
 RUN ./kokkos-kernels.sh 4.1.00 /pkgs
 ENV KOKKOS_KERNELS_ROOT=/pkgs/kokkos-kernels/install
 
-FROM base as build
+FROM base AS build
 COPY . /checkpoint
-
-ARG MAGISTRATE_DOXYGEN_ENABLED
-ARG MAGISTRATE_TESTS_ENABLED
-ARG MAGISTRATE_EXAMPLES_ENABLED
-ARG MAGISTRATE_WARNINGS_AS_ERRORS
-ARG MAGISTRATE_MPI_ENABLED
-ARG MAGISTRATE_ASAN_ENABLED
-ARG MAGISTRATE_UBSAN_ENABLED
-ARG MAGISTRATE_SERIALIZATION_ERROR_CHECKING_ENABLED
-
-ENV MAGISTRATE_DOXYGEN_ENABLED=${MAGISTRATE_DOXYGEN_ENABLED} \
-    MAGISTRATE_TESTS_ENABLED=${MAGISTRATE_TESTS_ENABLED} \
-    MAGISTRATE_EXAMPLES_ENABLED=${MAGISTRATE_EXAMPLES_ENABLED} \
-    MAGISTRATE_WARNINGS_AS_ERRORS=${MAGISTRATE_WARNINGS_AS_ERRORS} \
-    MAGISTRATE_MPI_ENABLED=${MAGISTRATE_MPI_ENABLED} \
-    MAGISTRATE_ASAN_ENABLED=${MAGISTRATE_ASAN_ENABLED} \
-    MAGISTRATE_UBSAN_ENABLED=${MAGISTRATE_UBSAN_ENABLED} \
-    MAGISTRATE_SERIALIZATION_ERROR_CHECKING_ENABLED=${MAGISTRATE_SERIALIZATION_ERROR_CHECKING_ENABLED} \
-    CMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
-
 RUN /checkpoint/ci/build_cpp.sh /checkpoint /build
 
-FROM build as test
+FROM build AS test
 RUN /checkpoint/ci/test_cpp.sh /checkpoint /build
diff --git a/ci/docker/ubuntu-22.04-clang-cpp.dockerfile b/ci/docker/ubuntu-22.04-clang-cpp.dockerfile
index 0bbeb1b1..830381dd 100644
--- a/ci/docker/ubuntu-22.04-clang-cpp.dockerfile
+++ b/ci/docker/ubuntu-22.04-clang-cpp.dockerfile
@@ -1,7 +1,7 @@
 
 ARG arch=amd64
 ARG distro=22.04
-FROM ${arch}/ubuntu:${distro} as base
+FROM ${arch}/ubuntu:${distro} AS base
 
 ARG proxy=""
 ARG compiler=clang-13
@@ -66,29 +66,9 @@ ENV MPI_EXTRA_FLAGS="" \
     PATH=/usr/lib/ccache/:$PATH \
     CMAKE_EXE_LINKER_FLAGS="-pthread"
 
-FROM base as build
+FROM base AS build
 COPY . /checkpoint
-
-ARG MAGISTRATE_DOXYGEN_ENABLED
-ARG MAGISTRATE_TESTS_ENABLED
-ARG MAGISTRATE_EXAMPLES_ENABLED
-ARG MAGISTRATE_WARNINGS_AS_ERRORS
-ARG MAGISTRATE_MPI_ENABLED
-ARG MAGISTRATE_ASAN_ENABLED
-ARG MAGISTRATE_UBSAN_ENABLED
-ARG MAGISTRATE_SERIALIZATION_ERROR_CHECKING_ENABLED
-
-ENV MAGISTRATE_DOXYGEN_ENABLED=${MAGISTRATE_DOXYGEN_ENABLED} \
-    MAGISTRATE_TESTS_ENABLED=${MAGISTRATE_TESTS_ENABLED} \
-    MAGISTRATE_EXAMPLES_ENABLED=${MAGISTRATE_EXAMPLES_ENABLED} \
-    MAGISTRATE_WARNINGS_AS_ERRORS=${MAGISTRATE_WARNINGS_AS_ERRORS} \
-    MAGISTRATE_MPI_ENABLED=${MAGISTRATE_MPI_ENABLED} \
-    MAGISTRATE_ASAN_ENABLED=${MAGISTRATE_ASAN_ENABLED} \
-    MAGISTRATE_UBSAN_ENABLED=${MAGISTRATE_UBSAN_ENABLED} \
-    MAGISTRATE_SERIALIZATION_ERROR_CHECKING_ENABLED=${MAGISTRATE_SERIALIZATION_ERROR_CHECKING_ENABLED} \
-    CMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
-
 RUN /checkpoint/ci/build_cpp.sh /checkpoint /build
 
-FROM build as test
+FROM build AS test
 RUN /checkpoint/ci/test_cpp.sh /checkpoint /build