diff --git a/atmos_cubed_sphere b/atmos_cubed_sphere
index 9ed4a1985..76489d630 160000
--- a/atmos_cubed_sphere
+++ b/atmos_cubed_sphere
@@ -1 +1 @@
-Subproject commit 9ed4a1985cc1524deb98d73a72a2a2c9d40faad0
+Subproject commit 76489d6304c8577a048c3dcccb4082c7195f8c37
diff --git a/ccpp/CMakeLists.txt b/ccpp/CMakeLists.txt
index 750ae5c14..6782c8809 100644
--- a/ccpp/CMakeLists.txt
+++ b/ccpp/CMakeLists.txt
@@ -121,11 +121,9 @@ elseif (${CMAKE_Fortran_COMPILER_ID} MATCHES "Intel")
   elseif (${CMAKE_BUILD_TYPE} MATCHES "Release")
     # Specify aggressive optimization flags (to be overwritten for individual files in ccpp-physics' CMakeLists.txt)
     if (AVX2)
-      if (SIMDMULTIARCH)
-        set (CMAKE_Fortran_FLAGS_OPT "-no-prec-div -no-prec-sqrt -axSSE4.2,AVX,CORE-AVX2,CORE-AVX512")
-      else (SIMDMULTIARCH)
-        set (CMAKE_Fortran_FLAGS_OPT "-no-prec-div -no-prec-sqrt -xCORE-AVX2")
-      endif (SIMDMULTIARCH)
+      set (CMAKE_Fortran_FLAGS_OPT "-no-prec-div -no-prec-sqrt -xCORE-AVX2")
+    elseif (SIMDMULTIARCH)
+      set (CMAKE_Fortran_FLAGS_OPT "-no-prec-div -no-prec-sqrt -axSSE4.2,CORE-AVX2")
     endif (AVX2)
     set (CMAKE_Fortran_FLAGS  "${CMAKE_Fortran_FLAGS} -debug minimal -fp-model source -qoverride-limits -qopt-prefetch=3")
   endif (${CMAKE_BUILD_TYPE} MATCHES "Debug")
diff --git a/ccpp/physics b/ccpp/physics
index d2db535e9..4e7465c98 160000
--- a/ccpp/physics
+++ b/ccpp/physics
@@ -1 +1 @@
-Subproject commit d2db535e9088987d0502efdbfe7a18ac8ea84852
+Subproject commit 4e7465c985597525acea42ead8a3323ea82a9c3e