diff --git a/host-configs/TOTAL/pangea2-base.cmake b/host-configs/TOTAL/pangea2-base.cmake
index a1b404ca2dc..b2b5e405380 100644
--- a/host-configs/TOTAL/pangea2-base.cmake
+++ b/host-configs/TOTAL/pangea2-base.cmake
@@ -15,7 +15,7 @@ set( ENABLE_PVTPackage ON CACHE BOOL "" FORCE)
 set( ENABLE_GEOSX_PTP ON CACHE BOOL "" FORCE)
 set( ENABLE_PETSC OFF CACHE BOOL "" FORCE)
 set( ENABLE_MATHPRESSO ON CACHE BOOL "" FORCE)
-set( ENABLE_HYPRE OFF CACHE BOOL "" FORCE)
+set( ENABLE_HYPRE ON CACHE BOOL "" FORCE)
 set( ENABLE_XML_UPDATES OFF CACHE BOOL "" FORCE)
 set( ENABLE_DOXYGEN OFF CACHE BOOL "" FORCE )
 set( ENABLE_BENCHMARKS OFF CACHE BOOL "" FORCE)
@@ -30,7 +30,7 @@ set(CUDA_ENABLED      "OFF"       CACHE PATH "" FORCE)
 set(CHAI_BUILD_TYPE   "cpu-no-rm" CACHE PATH "" FORCE)
 set(CHAI_ARGS         ""          CACHE PATH "" FORCE)
 
-set(ENABLE_OPENMP     "ON"        CACHE PATH "" FORCE)
-set(RAJA_ENABLE_OPENMP "ON"        CACHE PATH "" FORCE)
+set(ENABLE_OPENMP     "OFF"        CACHE PATH "" FORCE)
+set(RAJA_ENABLE_OPENMP "OFF"        CACHE PATH "" FORCE)
 
 
diff --git a/host-configs/TOTAL/pangea2-gcc@8.3.0.cmake b/host-configs/TOTAL/pangea2-gcc@8.3.0.cmake
index 0a1df4ab398..345949e271a 100644
--- a/host-configs/TOTAL/pangea2-gcc@8.3.0.cmake
+++ b/host-configs/TOTAL/pangea2-gcc@8.3.0.cmake
@@ -18,9 +18,9 @@ set(CMAKE_C_COMPILER "/data_local/sw/gcc/RHEL7/8.3.0/bin/gcc" CACHE PATH "")
 set(CMAKE_CXX_COMPILER "/data_local/sw/gcc/RHEL7/8.3.0/bin/g++" CACHE PATH "")
 set(CMAKE_Fortran_COMPILER "/data_local/sw/gcc/RHEL7/8.3.0/bin/gfortran" CACHE PATH "")
 
-set(CMAKE_C_FLAGS_RELEASE "-O3 -DNDEBUG -march=native -mtune=native" CACHE STRING "")
-set(CMAKE_CXX_FLAGS_RELEASE "-O3 -DNDEBUG -march=native -mtune=native" CACHE STRING "")
-set(CMAKE_Fortran_FLAGS_RELEASE "-O3 -DNDEBUG -march=native -mtune=native" CACHE STRING "")
+set(CMAKE_C_FLAGS_RELEASE "-O3 -DNDEBUG -march=x86-64 -mtune=generic" CACHE STRING "")
+set(CMAKE_CXX_FLAGS_RELEASE "-O3 -DNDEBUG -march=x86-64 -mtune=generic" CACHE STRING "")
+set(CMAKE_Fortran_FLAGS_RELEASE "-O3 -DNDEBUG -march=x86-64 -mtune=generic" CACHE STRING "")
 
 set(ENABLE_FORTRAN OFF CACHE BOOL "" FORCE)
 set(ENABLE_MPI ON CACHE BOOL "" FORCE)
diff --git a/scripts/config-build.py b/scripts/config-build.py
index 3a6a1327350..c0e3f21a366 100755
--- a/scripts/config-build.py
+++ b/scripts/config-build.py
@@ -82,6 +82,11 @@ def setup_ats(scriptsdir, buildpath):
                     action='store_true',
                     help="create an xcode project.")
 
+parser.add_argument("-cb",
+                    "--codeblocks",
+                    action='store_true',
+                    help="create a codeblocks project.")
+
 parser.add_argument("-ecc",
                     "--exportcompilercommands",
                     action='store_true',
@@ -192,6 +197,9 @@ def setup_ats(scriptsdir, buildpath):
 if args.eclipse:
     cmakeline += ' -G "Eclipse CDT4 - Unix Makefiles"'
 
+if args.codeblocks:
+    cmakeline += ' -G "CodeBlocks - Unix Makefiles"'
+
 if args.xcode:
     cmakeline += ' -G Xcode'