diff --git a/cmake/std/atdm/ats2/environment.sh b/cmake/std/atdm/ats2/environment.sh
index 12528c5916e6..1631f1f35f48 100644
--- a/cmake/std/atdm/ats2/environment.sh
+++ b/cmake/std/atdm/ats2/environment.sh
@@ -78,58 +78,9 @@ module load git/2.20.0
 # Load compiler modules, TPL modules, and point to SPARC TPL install base dirs
 #
 
-if [[ "$ATDM_CONFIG_COMPILER" == *"GNU-7.3.1_SPMPI-rolling" ]]; then
+if [[ "$ATDM_CONFIG_COMPILER" == "GNU-7.3.1_SPMPI-rolling" ]]; then
   module load sparc-dev/gcc-7.3.1_spmpi-rolling
-
-  export COMPILER_ROOT=/usr/tce/packages/gcc/gcc-7.3.1
-  export LD_LIBRARY_PATH=${COMPILER_ROOT}/lib:${LD_LIBRARY_PATH}
-  export BINUTILS_ROOT=${COMPILER_ROOT}
-  export LIBRARY_PATH=${BINUTILS_ROOT}/lib
-  export LIBRARY_PATH=${CBLAS_ROOT}/lib:${LIBRARY_PATH}
-  export INCLUDE=${BINUTILS_ROOT}/include:${INCLUDE}
-  export CPATH=${BINUTILS_ROOT}/include:${CPATH}
-
-elif [[ "$ATDM_CONFIG_COMPILER" == *"XL-2019.08.20_SPMPI-rolling_DISABLED" ]]; then
-  module load xl/2019.08.20
-  module load lapack/3.8.0-xl-2019.08.20
-  module load gmake/4.2.1
-
-  # Ninja not available for XL until cmake 3.17.0
-  export ATDM_CONFIG_USE_NINJA=OFF
-
-  export CBLAS_ROOT=/usr/tcetmp/packages/lapack/lapack-3.8.0-P9-xl-2019.08.20
-  export LAPACK_ROOT=/usr/tcetmp/packages/lapack/lapack-3.8.0-P9-xl-2019.08.20
-  export COMPILER_ROOT=/usr/tce/packages/xl/xl-2019.08.20
-  export SPARC_HDF5=hdf5-1.8.20
-
-  # eharvey: TODO: remove COMPILER_ROOT and other exports below.
-  export PATH=${COMPILER_ROOT}/bin:${PATH}
-  export LD_LIBRARY_PATH=${COMPILER_ROOT}/lib:${LD_LIBRARY_PATH}
-  export BINUTILS_ROOT=/usr/tce/packages/gcc/gcc-7.3.1
-  export LIBRARY_PATH=${BINUTILS_ROOT}/lib
-  export LIBRARY_PATH=${CBLAS_ROOT}/lib:${LIBRARY_PATH}
-  export INCLUDE=${BINUTILS_ROOT}/include:${INCLUDE}
-  export CPATH=${BINUTILS_ROOT}/include:${CPATH}
-
-  if [[ "$ATDM_CONFIG_COMPILER" == "CUDA-10.1.243_"* ]]; then
-    export LD_LIBRARY_PATH=${BINUTILS_ROOT}/rh/lib/gcc/ppc64le-redhat-linux/7:${LD_LIBRARY_PATH}
-  fi
-
-else
-  echo
-  echo "***"
-  echo "*** ERROR: COMPILER=$ATDM_CONFIG_COMPILER is not supported on this system!"
-  echo "***"
-  return
-
-fi
-
-#
-# Load module and do other setup for CUDA bulids
-#
-
-if [[ "$ATDM_CONFIG_COMPILER" == "CUDA-10.1.243_"* ]]; then
-
+elif [[ "$ATDM_CONFIG_COMPILER" == "CUDA-10.1.243_GNU-7.3.1_SPMPI-rolling" ]]; then
   module load sparc-dev/cuda-10.1.243_gcc-7.3.1_spmpi-rolling
   export CUDA_BIN_PATH=$CUDA_HOME
 
@@ -159,14 +110,35 @@ if [[ "$ATDM_CONFIG_COMPILER" == "CUDA-10.1.243_"* ]]; then
   # CTEST Settings
   # Trilinos_CTEST_RUN_CUDA_AWARE_MPI is used by cmake/ctest/driver/atdm/ats2/local-driver.sh
   export Trilinos_CTEST_RUN_CUDA_AWARE_MPI=1
+elif [[ "$ATDM_CONFIG_COMPILER" == *"XL-2019.08.20_SPMPI-rolling_DISABLED" ]]; then
+  module load xl/2019.08.20
+  module load lapack/3.8.0-xl-2019.08.20
+  module load gmake/4.2.1
+
+  # Ninja not available for XL until cmake 3.17.0
+  export ATDM_CONFIG_USE_NINJA=OFF
+
+  export CBLAS_ROOT=/usr/tcetmp/packages/lapack/lapack-3.8.0-P9-xl-2019.08.20
+  export LAPACK_ROOT=/usr/tcetmp/packages/lapack/lapack-3.8.0-P9-xl-2019.08.20
+  export COMPILER_ROOT=/usr/tce/packages/xl/xl-2019.08.20
+  export SPARC_HDF5=hdf5-1.8.20
 
-elif [[ "$ATDM_CONFIG_COMPILER" == "CUDA"* ]]; then
+  # eharvey: TODO: remove COMPILER_ROOT and other exports below.
+  export PATH=${COMPILER_ROOT}/bin:${PATH}
+  export LD_LIBRARY_PATH=${COMPILER_ROOT}/lib:${LD_LIBRARY_PATH}
+  export BINUTILS_ROOT=/usr/tce/packages/gcc/gcc-7.3.1
+  export LIBRARY_PATH=${BINUTILS_ROOT}/lib
+  export LIBRARY_PATH=${CBLAS_ROOT}/lib:${LIBRARY_PATH}
+  export INCLUDE=${BINUTILS_ROOT}/include:${INCLUDE}
+  export CPATH=${BINUTILS_ROOT}/include:${CPATH}
 
+  if [[ "$ATDM_CONFIG_COMPILER" == "CUDA-10.1.243_"* ]]; then
+    export LD_LIBRARY_PATH=${BINUTILS_ROOT}/rh/lib/gcc/ppc64le-redhat-linux/7:${LD_LIBRARY_PATH}
+  fi
+else
   echo
   echo "***"
-  echo "*** ERROR: CUDA version in COMPILER=$ATDM_CONFIG_COMPILER"
-  echo "*** is not supported on this system!  Only CUDA-10.1.243"
-  echo "*** is currently supported!"
+  echo "*** ERROR: COMPILER=$ATDM_CONFIG_COMPILER is not supported on this system!"
   echo "***"
   return
 
@@ -176,6 +148,15 @@ fi
 # Final setup for all build configurations
 #
 
+# Point to binutils
+export COMPILER_ROOT=/usr/tce/packages/gcc/gcc-7.3.1
+export LD_LIBRARY_PATH=${COMPILER_ROOT}/lib:${LD_LIBRARY_PATH}
+export BINUTILS_ROOT=${COMPILER_ROOT}
+export LIBRARY_PATH=${BINUTILS_ROOT}/lib
+export LIBRARY_PATH=${CBLAS_ROOT}/lib:${LIBRARY_PATH}
+export INCLUDE=${BINUTILS_ROOT}/include:${INCLUDE}
+export CPATH=${BINUTILS_ROOT}/include:${CPATH}
+
 # Prepend path to ninja after all of the modules are loaded
 export PATH=/projects/atdm_devops/vortex/ninja-fortran-1.8.2:$PATH