diff --git a/bin/mkmf.template.nci b/bin/mkmf.template.nci
index da9cbf88d..76592be03 100644
--- a/bin/mkmf.template.nci
+++ b/bin/mkmf.template.nci
@@ -38,14 +38,14 @@ endif
 
 FPPFLAGS := -fpp -Wp,-w $(INCLUDE)
 FFLAGS := -fno-alias -safe-cray-ptr -fpe0 -ftz -assume byterecl -i4 -r8 -traceback -nowarn -check noarg_temp_created -assume nobuffered_io -convert big_endian -grecord-gcc-switches -align all
-FFLAGS_OPT := -g3 -O2 -xCORE-AVX2 -debug all -check none
+FFLAGS_OPT := -g3 -O2 -mavx2 -debug all -check none
 FFLAGS_REPORT := -qopt-report=5 -qopt-report-annotate
 FFLAGS_DEBUG := -g3 -O0 -debug all -check -check noarg_temp_created -check nopointer -warn -warn noerrors -ftrapuv
 FFLAGS_REPRO := -fp-model precise -fp-model source -align all
 FFLAGS_VERBOSE := -v -V -what
 
 CFLAGS := -D__IFC $(INCLUDE)
-CFLAGS_OPT := -O2 -debug minimal -xCORE-AVX2
+CFLAGS_OPT := -O2 -debug minimal -mavx2
 CFLAGS_REPORT := -qopt-report=5 -qopt-report-annotate
 CFLAGS_DEBUG := -O0 -g -ftrapuv -traceback
 CFLAGS_REPRO := -fp-model precise -fp-model source
diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt
index 6e5a724d4..f571b67dc 100644
--- a/cmake/CMakeLists.txt
+++ b/cmake/CMakeLists.txt
@@ -52,9 +52,9 @@ include(CheckFortranCompilerFlag)
 if(CMAKE_Fortran_COMPILER_ID MATCHES "Intel")
   set(CMAKE_Fortran_FLAGS                 "${CMAKE_Fortran_FLAGS} -fno-alias -safe-cray-ptr -fpe0 -ftz -assume byterecl -i4 -r8 -nowarn -check noarg_temp_created -assume nobuffered_io -convert big_endian -grecord-gcc-switches -fp-model precise -fp-model source -align all")
   if (MOM5_DETERMINISTIC)
-    set(CMAKE_Fortran_FLAGS_RELEASE       "-g0 -O0 -xCORE-AVX2 -debug none -check none")
+    set(CMAKE_Fortran_FLAGS_RELEASE       "-g0 -O0 -mavx2 -debug none -check none")
   else()
-    set(CMAKE_Fortran_FLAGS_RELEASE       "-g3 -O2 -xCORE-AVX2 -debug all -check none -traceback")
+    set(CMAKE_Fortran_FLAGS_RELEASE       "-g3 -O2 -mavx2 -debug all -check none -traceback")
   endif()
   set(CMAKE_Fortran_FLAGS_RELWITHDEBINFO  "${CMAKE_Fortran_FLAGS_RELEASE} -g")
   set(CMAKE_Fortran_FLAGS_DEBUG           "-g3 -O0 -debug all -check -check noarg_temp_created -check nopointer -warn -warn noerrors -ftrapuv -traceback")
@@ -79,18 +79,18 @@ endif()
 if(CMAKE_C_COMPILER_ID STREQUAL "IntelLLVM")
   set(CMAKE_C_FLAGS                 "${CMAKE_C_FLAGS} -fp-model precise")
   if (MOM5_DETERMINISTIC)
-    set(CMAKE_C_FLAGS_RELEASE       "-O0 -debug none -xCORE-AVX2")
+    set(CMAKE_C_FLAGS_RELEASE       "-O0 -debug none -mavx2")
   else()
-    set(CMAKE_C_FLAGS_RELEASE       "-O2 -debug minimal -xCORE-AVX2")
+    set(CMAKE_C_FLAGS_RELEASE       "-O2 -debug minimal -mavx2")
   endif()
   set(CMAKE_C_FLAGS_RELWITHDEBINFO  "${CMAKE_C_FLAGS_RELEASE} -g")
   set(CMAKE_C_FLAGS_DEBUG           "-O0 -g -ftrapuv -traceback")
 elseif(CMAKE_C_COMPILER_ID STREQUAL "Intel")
   set(CMAKE_C_FLAGS                 "${CMAKE_C_FLAGS} -fp-model precise -fp-model source")
   if (MOM5_DETERMINISTIC)
-    set(CMAKE_C_FLAGS_RELEASE       "-O0 -debug none -xCORE-AVX2")
+    set(CMAKE_C_FLAGS_RELEASE       "-O0 -debug none -mavx2")
   else()
-    set(CMAKE_C_FLAGS_RELEASE       "-O2 -debug minimal -xCORE-AVX2")
+    set(CMAKE_C_FLAGS_RELEASE       "-O2 -debug minimal -mavx2")
   endif()
   set(CMAKE_C_FLAGS_RELWITHDEBINFO  "${CMAKE_C_FLAGS_RELEASE} -g")
   set(CMAKE_C_FLAGS_DEBUG           "-O0 -g -ftrapuv -traceback")