diff --git a/.github/workflows/ubuntu-ci-x86_64-intel.yaml b/.github/workflows/ubuntu-ci-x86_64-intel.yaml
index 406e51235..cb44dafaf 100644
--- a/.github/workflows/ubuntu-ci-x86_64-intel.yaml
+++ b/.github/workflows/ubuntu-ci-x86_64-intel.yaml
@@ -75,10 +75,7 @@ jobs:
           echo "      cxx: /opt/intel/oneapi/compiler/2023.2.3/linux/bin/intel64/icpc" >> ${SPACK_SYSTEM_CONFIG_PATH}/compilers.yaml
           echo "      f77: /opt/intel/oneapi/compiler/2023.2.3/linux/bin/intel64/ifort" >> ${SPACK_SYSTEM_CONFIG_PATH}/compilers.yaml
           echo "      fc: /opt/intel/oneapi/compiler/2023.2.3/linux/bin/intel64/ifort" >> ${SPACK_SYSTEM_CONFIG_PATH}/compilers.yaml
-          echo "    flags:" >> ${SPACK_SYSTEM_CONFIG_PATH}/compilers.yaml
-          echo "      cflags: -diag-disable=10441" >> ${SPACK_SYSTEM_CONFIG_PATH}/compilers.yaml
-          echo "      cxxflags: -diag-disable=10441" >> ${SPACK_SYSTEM_CONFIG_PATH}/compilers.yaml
-          echo "      fflags: -diag-disable=10448" >> ${SPACK_SYSTEM_CONFIG_PATH}/compilers.yaml
+          echo "    flags: {}" >> ${SPACK_SYSTEM_CONFIG_PATH}/compilers.yaml
           echo "    operating_system: ubuntu22.04" >> ${SPACK_SYSTEM_CONFIG_PATH}/compilers.yaml
           echo "    target: x86_64" >> ${SPACK_SYSTEM_CONFIG_PATH}/compilers.yaml
           echo "    modules: []" >> ${SPACK_SYSTEM_CONFIG_PATH}/compilers.yaml
diff --git a/.github/workflows/ubuntu-ci-x86_64-oneapi.yaml b/.github/workflows/ubuntu-ci-x86_64-oneapi.yaml
index d99fc079c..44eeec3aa 100644
--- a/.github/workflows/ubuntu-ci-x86_64-oneapi.yaml
+++ b/.github/workflows/ubuntu-ci-x86_64-oneapi.yaml
@@ -76,10 +76,7 @@ jobs:
           echo "      cxx: /opt/intel/oneapi/compiler/2024.2/bin/icpx" >> ${SPACK_SYSTEM_CONFIG_PATH}/compilers.yaml
           echo "      f77: /opt/intel/oneapi/compiler/2024.2/bin/ifort" >> ${SPACK_SYSTEM_CONFIG_PATH}/compilers.yaml
           echo "      fc: /opt/intel/oneapi/compiler/2024.2/bin/ifort" >> ${SPACK_SYSTEM_CONFIG_PATH}/compilers.yaml
-          echo "    flags:" >> ${SPACK_SYSTEM_CONFIG_PATH}/compilers.yaml
-          echo "      cflags: -diag-disable=10441" >> ${SPACK_SYSTEM_CONFIG_PATH}/compilers.yaml
-          echo "      cxxflags: -diag-disable=10441" >> ${SPACK_SYSTEM_CONFIG_PATH}/compilers.yaml
-          echo "      fflags: -diag-disable=10448" >> ${SPACK_SYSTEM_CONFIG_PATH}/compilers.yaml
+          echo "    flags: {}" >> ${SPACK_SYSTEM_CONFIG_PATH}/compilers.yaml
           echo "    operating_system: ubuntu22.04" >> ${SPACK_SYSTEM_CONFIG_PATH}/compilers.yaml
           echo "    target: x86_64" >> ${SPACK_SYSTEM_CONFIG_PATH}/compilers.yaml
           echo "    modules: []" >> ${SPACK_SYSTEM_CONFIG_PATH}/compilers.yaml
diff --git a/configs/sites/tier1/aws-pcluster/compilers.yaml b/configs/sites/tier1/aws-pcluster/compilers.yaml
index d25960366..9b084a26a 100644
--- a/configs/sites/tier1/aws-pcluster/compilers.yaml
+++ b/configs/sites/tier1/aws-pcluster/compilers.yaml
@@ -6,9 +6,7 @@ compilers:
       cxx: /opt/intel/oneapi/compiler/2023.2.3/linux/bin/intel64/icpc
       f77: /opt/intel/oneapi/compiler/2023.2.3/linux/bin/intel64/ifort
       fc: /opt/intel/oneapi/compiler/2023.2.3/linux/bin/intel64/ifort
-    flags:
-      cflags: "-diag-disable=10441"
-      cxxflags: "-diag-disable=10441"
+    flags: {}
     operating_system: ubuntu22.04
     target: x86_64
     modules: []
diff --git a/configs/sites/tier1/derecho/compilers.yaml b/configs/sites/tier1/derecho/compilers.yaml
index 553814786..20cf2574c 100644
--- a/configs/sites/tier1/derecho/compilers.yaml
+++ b/configs/sites/tier1/derecho/compilers.yaml
@@ -6,10 +6,7 @@ compilers::
       cxx: /glade/u/apps/common/23.08/spack/opt/spack/intel-oneapi-compilers/2023.2.1/compiler/2023.2.1/linux/bin/intel64/icpc
       f77: /glade/u/apps/common/23.08/spack/opt/spack/intel-oneapi-compilers/2023.2.1/compiler/2023.2.1/linux/bin/intel64/ifort
       fc: /glade/u/apps/common/23.08/spack/opt/spack/intel-oneapi-compilers/2023.2.1/compiler/2023.2.1/linux/bin/intel64/ifort
-    flags:
-      cflags: -diag-disable=10441
-      cxxflags: -diag-disable=10441
-      fflags: -diag-disable=10448
+    flags: {}
     operating_system: sles15
     target: x86_64
     modules:
diff --git a/configs/sites/tier1/discover-scu17/compilers.yaml b/configs/sites/tier1/discover-scu17/compilers.yaml
index 873d9a693..4ea0fa10d 100644
--- a/configs/sites/tier1/discover-scu17/compilers.yaml
+++ b/configs/sites/tier1/discover-scu17/compilers.yaml
@@ -6,10 +6,7 @@ compilers:
       cxx: /usr/local/intel/oneapi/2021/compiler/2023.2.1/linux/bin/intel64/icpc
       f77: /usr/local/intel/oneapi/2021/compiler/2023.2.1/linux/bin/intel64/ifort
       fc: /usr/local/intel/oneapi/2021/compiler/2023.2.1/linux/bin/intel64/ifort
-    flags:
-      cflags: -diag-disable=10441
-      cxxflags: -diag-disable=10441
-      fflags: -diag-disable=10448
+    flags: {}
     operating_system: sles15
     target: x86_64
     modules:
diff --git a/configs/sites/tier1/hercules/compilers.yaml b/configs/sites/tier1/hercules/compilers.yaml
index 45d7077fb..36c12beac 100644
--- a/configs/sites/tier1/hercules/compilers.yaml
+++ b/configs/sites/tier1/hercules/compilers.yaml
@@ -6,10 +6,7 @@ compilers:
       cxx: /apps/spack-managed/gcc-11.3.1/intel-oneapi-compilers-2023.1.0-sb753366rvywq75zeg4ml5k5c72xgj72/compiler/2023.1.0/linux/bin/intel64/icpc
       f77: /apps/spack-managed/gcc-11.3.1/intel-oneapi-compilers-2023.1.0-sb753366rvywq75zeg4ml5k5c72xgj72/compiler/2023.1.0/linux/bin/intel64/ifort
       fc: /apps/spack-managed/gcc-11.3.1/intel-oneapi-compilers-2023.1.0-sb753366rvywq75zeg4ml5k5c72xgj72/compiler/2023.1.0/linux/bin/intel64/ifort
-    flags:
-      cflags: -diag-disable=10441
-      cxxflags: -diag-disable=10441
-      fflags: -diag-disable=10448
+    flags: {}
     operating_system: rocky9
     target: x86_64
     modules:
diff --git a/configs/sites/tier1/nautilus/compilers.yaml b/configs/sites/tier1/nautilus/compilers.yaml
index ced8a48bd..c3d08c859 100644
--- a/configs/sites/tier1/nautilus/compilers.yaml
+++ b/configs/sites/tier1/nautilus/compilers.yaml
@@ -56,8 +56,7 @@ compilers:
       cxx: /p/app/projects/NEPTUNE/spack-stack/oneapi-2024.1.2/compiler/2024.1/bin/icpx
       f77: /p/app/projects/NEPTUNE/spack-stack/oneapi-2024.1.2/compiler/2024.1/bin/ifort
       fc: /p/app/projects/NEPTUNE/spack-stack/oneapi-2024.1.2/compiler/2024.1/bin/ifort
-    flags:
-      fflags: -diag-disable=10448
+    flags: {}
     operating_system: rhel8
     target: x86_64
     modules: []
diff --git a/configs/sites/tier1/orion/compilers.yaml b/configs/sites/tier1/orion/compilers.yaml
index 0417cfb0e..7514a364d 100644
--- a/configs/sites/tier1/orion/compilers.yaml
+++ b/configs/sites/tier1/orion/compilers.yaml
@@ -6,10 +6,7 @@ compilers:
       cxx: /apps/spack-managed/gcc-11.3.1/intel-oneapi-compilers-2023.1.0-sb753366rvywq75zeg4ml5k5c72xgj72/compiler/2023.1.0/linux/bin/intel64/icpc
       f77: /apps/spack-managed/gcc-11.3.1/intel-oneapi-compilers-2023.1.0-sb753366rvywq75zeg4ml5k5c72xgj72/compiler/2023.1.0/linux/bin/intel64/ifort
       fc: /apps/spack-managed/gcc-11.3.1/intel-oneapi-compilers-2023.1.0-sb753366rvywq75zeg4ml5k5c72xgj72/compiler/2023.1.0/linux/bin/intel64/ifort
-    flags:
-      cflags: -diag-disable=10441
-      cxxflags: -diag-disable=10441
-      fflags: -diag-disable=10448
+    flags: {}
     operating_system: rocky9
     target: x86_64
     modules:
diff --git a/configs/sites/tier2/blackpearl/compilers.yaml b/configs/sites/tier2/blackpearl/compilers.yaml
index e80a7baa1..2a1ca5332 100644
--- a/configs/sites/tier2/blackpearl/compilers.yaml
+++ b/configs/sites/tier2/blackpearl/compilers.yaml
@@ -47,10 +47,7 @@ compilers:
       fc: /opt/intel/oneapi/compiler/2024.1/bin/ifort
       #f77: /opt/intel/oneapi/compiler/2024.1/bin/ifx
       #fc: /opt/intel/oneapi/compiler/2024.1/bin/ifx
-    flags:
-      cflags: -diag-disable=10441
-      cxxflags: -diag-disable=10441
-      fflags: -diag-disable=10448
+    flags: {}
     operating_system: oracle9
     target: x86_64
     modules: []
diff --git a/configs/sites/tier2/frontera/compilers.yaml b/configs/sites/tier2/frontera/compilers.yaml
index e634a2843..507ff070d 100644
--- a/configs/sites/tier2/frontera/compilers.yaml
+++ b/configs/sites/tier2/frontera/compilers.yaml
@@ -6,10 +6,7 @@ compilers::
         cxx: /opt/intel/oneapi/compiler/2023.1.0/linux/bin/intel64/icpc
         f77: /opt/intel/oneapi/compiler/2023.1.0/linux/bin/intel64/ifort
         fc: /opt/intel/oneapi/compiler/2023.1.0/linux/bin/intel64/ifort
-      flags:
-        cflags: -diag-disable=10441
-        cxxflags: -diag-disable=10441
-        fflags: -diag-disable=10448
+      flags: {}
       operating_system: centos7
       target: x86_64
       modules:
diff --git a/spack b/spack
index c06c82918..fb50a614c 160000
--- a/spack
+++ b/spack
@@ -1 +1 @@
-Subproject commit c06c8291877e7b472367d8b944f38717b1b7e792
+Subproject commit fb50a614cc6f927e4844476acd38e06ea55292c4