diff --git a/configs/sites/tier1/noaa-aws/README.md b/configs/sites/tier1/noaa-aws/README.md
index 3977f6b4f..e310fb022 100644
--- a/configs/sites/tier1/noaa-aws/README.md
+++ b/configs/sites/tier1/noaa-aws/README.md
@@ -1,4 +1,4 @@
-# Provisiong ParallelWorks AWS clusters
+# Provisioning ParallelWorks NOAA-AWS clusters
 
 ## Use ParallelWorks NOAA-AWS Rocky9 cluster
 ## Steps to install ue-oneapi-2025.3.0 environment
@@ -6,37 +6,53 @@
 module purge
 
 mkdir -p /contrib/spack-stack-rocky9
+
 cd /contrib/spack-stack-rocky9/
+
 git clone --recurse-submodules -b release/2.1 https://github.com/jcsda/spack-stack.git spack-stack-2.1
+
 cd spack-stack-2.1
+
 source setup.sh
 
-. setup.sh
 spack stack create env --site noaa-aws --template unified-dev --compiler oneapi-2025.3.0 --name ue-oneapi-2025.3.0
+
 spack env activate -p envs/ue-oneapi-2025.3.0
+
 cd ./envs/ue-oneapi-2025.3.0
 
 export MODULES_AUTO_HANDLING=1
+
 module use /pw/apps/modules/intel/2025.3.0
+
 module load compiler/2025.3.0
+
 module load mpi
 
 spack concretize 2>&1 | tee log.concretize
+
 spack install --verbose --fail-fast --show-log-on-error --no-check-signature 2>&1 | tee log.install
+
 spack module lmod refresh -y
+
 spack stack setup-meta-modules
 
 ## Steps to install gcc-12.4.0 environment
 
 module purge
+
 mkdir -p /contrib/spack-stack-rocky9
+
 cd /contrib/spack-stack-rocky9/
+
 cd spack-stack-2.1
+
 source setup.sh
 
 spack stack create env --site noaa-aws --template unified-dev --compiler gcc-12.4.0 --name ue-gcc-12.4.0
 
 spack env activate -p envs/ue-gcc-12.4.0
+
 cd ./envs/ue-gcc-12.4.0
 
 spack concretize 2>&1 | tee log.concretize
@@ -44,4 +60,43 @@ spack concretize 2>&1 | tee log.concretize
 spack install --verbose --fail-fast --show-log-on-error --no-check-signature 2>&1 | tee log.install
 
 spack module lmod refresh -y
+
 spack stack setup-meta-modules
+
+## Steps to test installation for ue-oneapi-2025.3.0:
+
+module purge
+
+module reset
+
+export MODULES_AUTO_HANDLING=1
+
+module use /pw/apps/modules/intel/2025.3.0
+
+module use /contrib/spack-stack-rocky9/spack-stack-2.1/envs/ue-oneapi-2025.3.0/modules/Core
+
+module load stack-intel-oneapi-compilers/2025.3.0
+
+module load stack-intel-oneapi-mpi/2021.17
+
+module load jasper libpng netcdf-c netcdf-fortran parallelio esmf fms bacio crtm g2 g2tmpl ip w3emc gftl-shared mapl nemsio sfcio sigio w3nco wrf-io wgrib2 scotch
+
+module list
+
+## Steps to test installation for ue-gcc-12.4.0:
+
+module purge
+
+module reset
+
+module use /contrib/spack-stack-rocky9/spack-stack-2.1/envs/ue-gcc-12.4.0/modules/Core
+
+module load stack-gcc/12.4.0
+
+module load stack-openmpi/4.1.6
+
+module load jasper libpng netcdf-c netcdf-fortran parallelio esmf fms bacio crtm g2 g2tmpl ip w3emc gftl-shared mapl nemsio sfcio sigio w3nco wrf-io wgrib2 scotch
+
+module list
+
+
diff --git a/configs/sites/tier1/noaa-aws/packages.yaml b/configs/sites/tier1/noaa-aws/packages.yaml
index bcb150cfd..508840fae 100644
--- a/configs/sites/tier1/noaa-aws/packages.yaml
+++ b/configs/sites/tier1/noaa-aws/packages.yaml
@@ -23,7 +23,7 @@ packages:
     externals:
     - spec: binutils@2.35.2~gold+headers
       prefix: /usr
-  libd:
+  libdb:
     externals:
     - spec: libdb@5.3.28
       prefix: /usr
@@ -77,7 +77,7 @@ packages:
       prefix: /usr
   grep:
     externals:
-    - spec: grep@3.6.5
+    - spec: grep@3.6
       prefix: /usr
   groff:
     externals:
@@ -87,7 +87,7 @@ packages:
     externals:
     - spec: hwloc@2.4.1
       prefix: /usr
-  krb5-lib:
+  krb5-libs:
     externals:
     - spec: krb5@1.21.1
       prefix: /usr
@@ -101,7 +101,7 @@ packages:
       prefix: /usr
   mysql:
     externals:
-    - spec: mysql@10.6.6
+    - spec: mysql@10.5.27
       prefix: /usr
   ncurses:
     externals:
@@ -113,7 +113,7 @@ packages:
       prefix: /usr
   perl:
     externals:
-    - spec: perl@5.26.3~cpanm+shared+threads
+    - spec: perl@5.32.1~cpanm+shared+threads
       prefix: /usr
   pkg-config:
     externals:
diff --git a/configs/sites/tier1/noaa-aws/packages_gcc-12.4.0.yaml b/configs/sites/tier1/noaa-aws/packages_gcc-12.4.0.yaml
index 04de239b3..539f0a39b 100644
--- a/configs/sites/tier1/noaa-aws/packages_gcc-12.4.0.yaml
+++ b/configs/sites/tier1/noaa-aws/packages_gcc-12.4.0.yaml
@@ -21,6 +21,5 @@ packages:
     - spec: openmpi@4.1.6~internal-hwloc+two_level_namespace
       prefix: /apps/spack-2024-12/linux-rocky9-x86_64/gcc-11.4.1/openmpi-4.1.6-2dkf6t23iyw4xodxruh72yvmrhhvyoms
       modules:
-      - gnu/12.4.0
       - openmpi/4.1.6
 
diff --git a/configs/sites/tier1/noaa-azure/README.md b/configs/sites/tier1/noaa-azure/README.md
index 3275b3ef2..f50e2b9cf 100644
--- a/configs/sites/tier1/noaa-azure/README.md
+++ b/configs/sites/tier1/noaa-azure/README.md
@@ -1,43 +1,101 @@
-# Provisiong ParallelWorks Azure clusters
+# Provisioning ParallelWorks NOAA-Azure clusters
 
-## Steps to perform before installing spack-stack version 1.9.3
+## Use ParallelWorks NOAA-Azure Rocky9 cluster
+## Steps to install ue-oneapi-2025.3.0 environment
 
-sudo su -
-chmod 777 /contrib
-yum install -y qt5-qtbase-devel
-yum install -y qt5-qtsvg-devel
+module purge
 
+mkdir -p /contrib/spack-stack-rocky9
 
-## Steps to install spack-stack version 1.8.0
+cd /contrib/spack-stack-rocky9/
 
-sudo su -
-chmod 777 /contrib
+git clone --recurse-submodules -b release/2.1 https://github.com/jcsda/spack-stack.git spack-stack-2.1
 
-module purge
+cd spack-stack-2.1
+
+source setup.sh
+
+spack stack create env --site noaa-azure --template unified-dev --compiler oneapi-2025.3.0 --name ue-oneapi-2025.3.0
+
+spack env activate -p envs/ue-oneapi-2025.3.0
+
+cd ./envs/ue-oneapi-2025.3.0
+
+export MODULES_AUTO_HANDLING=1
+
+module use /pw/apps/modules/intel/2025.3.0
+
+module load compiler/2025.3.0
+
+module load mpi
 
-cd /contrib/spack-stack-rocky8/
-git clone --recursive https://github.com/JCSDA/spack-stack -b release/1.9.0 spack-stack-1.9.3
-cd spack-stack-1.9.3
-. setup.sh
-spack stack create env --name ue-oneapi-2024.2.1 --template unified-dev --site noaa-azure --compiler oneapi
-cd envs/ue-oneapi-2024.2.1
-spack env activate .
 spack concretize 2>&1 | tee log.concretize
+
 spack install --verbose --fail-fast --show-log-on-error --no-check-signature 2>&1 | tee log.install
+
 spack module lmod refresh -y
+
 spack stack setup-meta-modules
 
-## Steps to install GSI addon
+## Steps to install gcc-12.4.0 environment
+
+module purge
+
+mkdir -p /contrib/spack-stack-rocky9
+
+cd /contrib/spack-stack-rocky9/
 
-sudo su -
-chmod 777 /contrib
+cd spack-stack-2.1
+
+source setup.sh
+
+spack stack create env --site noaa-azure --template unified-dev --compiler gcc-12.4.0 --name ue-gcc-12.4.0
+
+spack env activate -p envs/ue-gcc-12.4.0
+
+cd ./envs/ue-gcc-12.4.0
 
-cd /contrib/spack-stack-rocky8/spack-stack-1.9.3
-. setup.sh
-spack stack create env --name gsi-oneapi-2024.2.1 --template gsi-addon-dev --site noaa-azure --upstream /contrib/spack-stack-rocky8/spack-stack-1.9.3/envs/ue-oneapi-2024.2.1/install --compiler oneapi
-cd envs/gsi-oneapi-2024.2.1
-spack env activate .
 spack concretize 2>&1 | tee log.concretize
+
 spack install --verbose --fail-fast --show-log-on-error --no-check-signature 2>&1 | tee log.install
-spack module lmod refresh --upstream-modules
+
+spack module lmod refresh -y
+
 spack stack setup-meta-modules
+
+## Steps to test installation for ue-oneapi-2025.3.0:
+
+module purge 
+
+module reset
+
+export MODULES_AUTO_HANDLING=1
+
+module use /pw/apps/modules/intel/2025.3.0
+
+module use /contrib/spack-stack-rocky9/spack-stack-2.1/envs/ue-oneapi-2025.3.0/modules/Core
+
+module load stack-intel-oneapi-compilers/2025.3.0
+
+module load stack-intel-oneapi-mpi/2021.17
+
+module load jasper libpng netcdf-c netcdf-fortran parallelio esmf fms bacio crtm g2 g2tmpl ip w3emc gftl-shared mapl nemsio sfcio sigio w3nco wrf-io wgrib2 scotch
+
+module list
+
+## Steps to test installation for ue-gcc-12.4.0:
+
+module purge 
+
+module reset
+
+module use /contrib/spack-stack-rocky9/spack-stack-2.1/envs/ue-gcc-12.4.0/modules/Core
+
+module load stack-gcc/12.4.0
+
+module load stack-openmpi/4.1.6
+
+module load jasper libpng netcdf-c netcdf-fortran parallelio esmf fms bacio crtm g2 g2tmpl ip w3emc gftl-shared mapl nemsio sfcio sigio w3nco wrf-io wgrib2 scotch
+
+module list
+
diff --git a/configs/sites/tier1/noaa-azure/compilers.yaml b/configs/sites/tier1/noaa-azure/compilers.yaml
deleted file mode 100644
index b43e86403..000000000
--- a/configs/sites/tier1/noaa-azure/compilers.yaml
+++ /dev/null
@@ -1,51 +0,0 @@
-compilers:
-- compiler:
-    spec: intel@2021.5.0
-    paths:
-      cc: /apps/oneapi/compiler/2022.0.2/linux/bin/intel64/icc
-      cxx: /apps/oneapi/compiler/2022.0.2/linux/bin/intel64/icpc
-      f77: /apps/oneapi/compiler/2022.0.2/linux/bin/intel64/ifort
-      fc: /apps/oneapi/compiler/2022.0.2/linux/bin/intel64/ifort
-    flags: {}
-    operating_system: rocky8
-    target: x86_64
-    modules:
-    - intel/2022.1.2
-    environment:
-      prepend_path:
-        PATH: '/apps/gnu/gcc-9.2.0/bin'
-        LD_LIBRARY_PATH: '/apps/gnu/gcc-9.2.0/lib64'
-        CPATH: '/apps/gnu/gcc-9.2.0/include'
-    extra_rpaths: []
-- compiler:
-    spec: gcc@13.2.0
-    paths:
-      cc: /apps/gnu/gcc-13.2.0/bin/gcc
-      cxx: /apps/gnu/gcc-13.2.0/bin/g++
-      f77: /apps/gnu/gcc-13.2.0/bin/gfortran
-      fc:  /apps/gnu/gcc-13.2.0/bin/gfortran
-    flags: {}
-    operating_system: rocky8
-    target: x86_64
-    modules:
-    - gnu/13.2.0
-    environment: {}
-    extra_rpaths: []
-- compiler:
-    spec: oneapi@2024.2.1
-    paths:
-      cc: /apps/oneapi/compiler/2024.2/bin/icx
-      cxx: /apps/oneapi/compiler/2024.2/bin/icpx
-      f77: /apps/oneapi/compiler/2024.2/bin/ifort
-      fc: /apps/oneapi/compiler/2024.2/bin/ifort
-    flags: {}
-    operating_system: rocky8
-    target: x86_64
-    modules:
-    - intel/2024.2.1
-    environment:
-      prepend_path:
-        PATH: '/apps/gnu/gcc-13.2.0/bin'
-        LD_LIBRARY_PATH: '/apps/gnu/gcc-13.2.0/lib64'
-        CPATH: '/apps/gnu/gcc-13.2.0/include'
-    extra_rpaths: []
diff --git a/configs/sites/tier1/noaa-azure/config.yaml b/configs/sites/tier1/noaa-azure/config.yaml
index 29be72f82..d01ba35fe 100644
--- a/configs/sites/tier1/noaa-azure/config.yaml
+++ b/configs/sites/tier1/noaa-azure/config.yaml
@@ -1,5 +1,5 @@
 config:
-  build_jobs: 4
+  build_jobs: 6
 
   # Overrides for spack build and staging areas to speed up builds
   # and avoid errors with hard links on the NFS filesystem /contrib
diff --git a/configs/sites/tier1/noaa-azure/mirrors.yaml b/configs/sites/tier1/noaa-azure/mirrors.yaml
deleted file mode 100644
index 3d247981f..000000000
--- a/configs/sites/tier1/noaa-azure/mirrors.yaml
+++ /dev/null
@@ -1,18 +0,0 @@
-mirrors:
-  local-source:
-    fetch:
-      url: file:///contrib/spack-stack/source-cache
-      access_pair:
-      - null
-      - null
-      access_token: null
-      profile: null
-      endpoint_url: null
-    push:
-      url: file:///contrib/spack-stack/source-cache
-      access_pair:
-      - null
-      - null
-      access_token: null
-      profile: null
-      endpoint_url: null
diff --git a/configs/sites/tier1/noaa-azure/packages.yaml b/configs/sites/tier1/noaa-azure/packages.yaml
index 2d3de9b46..17ff434c3 100644
--- a/configs/sites/tier1/noaa-azure/packages.yaml
+++ b/configs/sites/tier1/noaa-azure/packages.yaml
@@ -2,117 +2,150 @@ packages:
   all:
     providers:
       zlib-api:: [zlib]
-  zlib-api:
-    buildable: False
   zlib:
-    buildable: False
+    require:
+    - '@1.2.13'
+
+# All other packages listed alphabetically
+  autoconf:
     externals:
-    - spec: zlib@1.2.11
+    - spec: autoconf@2.69
+      prefix: /usr
+  automake:
+    externals:
+    - spec: automake@1.16.2
       prefix: /usr
   bash:
     externals:
-    - spec: bash@4.4.20
+    - spec: bash@5.1.8
       prefix: /usr
-  berkeley-db:
+  binutils:
     externals:
-    - spec: berkeley-db@5.3.28
+    - spec: binutils@2.35.2~gold+headers
+      prefix: /usr
+  libdb:
+    externals:
+    - spec: libdb@5.3.28
       prefix: /usr
   cpio:
     externals:
-    - spec: cpio@2.12
+    - spec: cpio@2.13
+      prefix: /usr
+  coreutils:
+    externals:
+    - spec: coreutils@8.32
+      prefix: /usr
+  cvs:
+    externals:
+    - spec: cvs@1.11.23
       prefix: /usr
   diffutils:
     externals:
-    - spec: diffutils@3.6
+    - spec: diffutils@3.7
+      prefix: /usr
+  doxygen:
+    externals:
+    - spec: doxygen@1.9.1+graphviz~mscgen
       prefix: /usr
   file:
     externals:
-    - spec: file@5.33
+    - spec: file@5.39
       prefix: /usr
   findutils:
     externals:
-    - spec: findutils@4.6.0
+    - spec: findutils@4.8.0
       prefix: /usr
   flex:
     externals:
-    - spec: flex@2.6.1
+    - spec: flex@2.6.4+lex
       prefix: /usr
   gawk:
     externals:
-    - spec: gawk@4.2.1
+    - spec: gawk@5.1.0
       prefix: /usr
   git:
     externals:
-    - spec: git@2.39.3~tcltk
+    - spec: git@2.47.3+tcltk
       prefix: /usr
   git-lfs:
     externals:
-    - spec: git-lfs@3.2.0
+    - spec: git-lfs@3.6.1
       prefix: /usr
   gmake:
     externals:
-    - spec: gmake@4.2.1
+    - spec: gmake@4.3
       prefix: /usr
   grep:
     externals:
-    - spec: grep@3.1
+    - spec: grep@3.6
+      prefix: /usr
+  groff:
+    externals:
+    - spec: groff@1.22.4
       prefix: /usr
   hwloc:
     externals:
-    - spec: hwloc@2.2.0
+    - spec: hwloc@2.4.1
+      prefix: /usr
+  krb5-libs:
+    externals:
+    - spec: krb5@1.21.1
+      prefix: /usr
+  libtool:
+    externals:
+    - spec: libtool@2.4.6
       prefix: /usr
-  krb5:
+  m4:
     externals:
-    - spec: krb5@1.18.2
+    - spec: m4@1.4.19
       prefix: /usr
   mysql:
     externals:
-    - spec: mysql@8.0.31
-      prefix: /contrib/spack-stack-rocky8/mysql-8.0.31
+    - spec: mysql@10.5.29
+      prefix: /usr
   ncurses:
     externals:
-    - spec: ncurses@6.1-10.20180224+termlib abi=5
+    - spec: ncurses@6.2 +termlib abi=6
       prefix: /usr
-  openjdk:
+  openssh:
     externals:
-    - spec: openjdk@1.8.0_402-b06
+    - spec: openssh@8.7p1
       prefix: /usr
   perl:
     externals:
-    - spec: perl@5.26.3~cpanm+shared+threads
+    - spec: perl@5.32.1~cpanm+shared+threads
       prefix: /usr
   pkg-config:
     externals:
-    - spec: pkg-config@1.4.2
+    - spec: pkg-config@1.7.3
       prefix: /usr
-  qt:
-    buildable: false
-    externals:
-    - spec: qt@5.15.3
-      prefix: /usr/lib64/qt5
   rsync:
     externals:
-    - spec: rsync@3.1.3
+    - spec: rsync@3.2.5
       prefix: /usr
   ruby:
     externals:
-    - spec: ruby@2.5.9p229
+    - spec: ruby@3.0.7
       prefix: /usr
   sed:
     externals:
-    - spec: sed@4.5
+    - spec: sed@4.8
+      prefix: /usr
+  subversion:
+    externals:
+    - spec: subversion@1.14.1
       prefix: /usr
   tar:
     externals:
-    - spec: tar@1.30
+    - spec: tar@1.34
       prefix: /usr
   texinfo:
     externals:
-    - spec: texinfo@6.5-7
+    - spec: texinfo@6.7
       prefix: /usr
   wget:
     externals:
-    - spec: wget@1.19.5
+    - spec: wget@1.21.1
       prefix: /usr
   zip:
     externals:
diff --git a/configs/sites/tier1/noaa-azure/packages_gcc-12.4.0.yaml b/configs/sites/tier1/noaa-azure/packages_gcc-12.4.0.yaml
new file mode 100644
index 000000000..539f0a39b
--- /dev/null
+++ b/configs/sites/tier1/noaa-azure/packages_gcc-12.4.0.yaml
@@ -0,0 +1,25 @@
+packages:
+  mpi:
+    buildable: False
+    require:
+    - openmpi@4.1.6
+  gcc:
+    buildable: False
+    externals:
+      - spec: gcc@12.4.0 languages:='c,c++,fortran'
+        prefix: /apps/spack-2024-12/linux-rocky9-x86_64/gcc-11.4.1/gcc-12.4.0-dsgnou52lpn2tus6mohdmcw5mjqmqrhj
+        modules:
+        - gcc/12.4.0
+        extra_attributes:
+          compilers:
+            c: /apps/spack-2024-12/linux-rocky9-x86_64/gcc-11.4.1/gcc-12.4.0-dsgnou52lpn2tus6mohdmcw5mjqmqrhj/bin/gcc
+            cxx: /apps/spack-2024-12/linux-rocky9-x86_64/gcc-11.4.1/gcc-12.4.0-dsgnou52lpn2tus6mohdmcw5mjqmqrhj/bin/g++
+            fortran: /apps/spack-2024-12/linux-rocky9-x86_64/gcc-11.4.1/gcc-12.4.0-dsgnou52lpn2tus6mohdmcw5mjqmqrhj/bin/gfortran
+  openmpi:
+    buildable: false
+    externals:
+    - spec: openmpi@4.1.6~internal-hwloc+two_level_namespace
+      prefix: /apps/spack-2024-12/linux-rocky9-x86_64/gcc-11.4.1/openmpi-4.1.6-2dkf6t23iyw4xodxruh72yvmrhhvyoms
+      modules:
+      - openmpi/4.1.6
+
diff --git a/configs/sites/tier1/noaa-azure/packages_gcc.yaml b/configs/sites/tier1/noaa-azure/packages_gcc.yaml
deleted file mode 100644
index 23e55c774..000000000
--- a/configs/sites/tier1/noaa-azure/packages_gcc.yaml
+++ /dev/null
@@ -1,13 +0,0 @@
-packages:
-  all:
-    compiler:: [gcc@13.2.0]
-    providers:
-      mpi:: [openmpi@4.1.6]
-  mpi:
-    buildable: False
-  openmpi:
-    externals:
-    - spec: openmpi@4.1.6~atomics~cuda~cxx~cxx_exceptions~gpfs~internal-hwloc~internal-libevent~internal-pmix~java+legacylaunchers~lustre~memchecker~openshmem~orterunprefix+pmi+romio+rsh~singularity+static+vt+wrapper-rpath fabrics=ucx schedulers=slurm
-      modules:
-      - gnu/13.2.0
-      - openmpi/4.1.6
diff --git a/configs/sites/tier1/noaa-azure/packages_intel.yaml b/configs/sites/tier1/noaa-azure/packages_intel.yaml
deleted file mode 100644
index cace7469e..000000000
--- a/configs/sites/tier1/noaa-azure/packages_intel.yaml
+++ /dev/null
@@ -1,34 +0,0 @@
-packages:
-  all:
-    compiler:: [intel@2021.10.0]
-    providers:
-      mpi:: [intel-oneapi-mpi@2021.10.0]
-      # Remove the next three lines to switch to intel-oneapi-mkl
-      blas:: [openblas]
-      fftw-api:: [fftw]
-      lapack:: [openblas]
-  mpi:
-    buildable: False
-  intel-oneapi-mpi:
-    externals:
-    - spec: intel-oneapi-mpi@2021.10.0%intel@2021.10.0 +classic-names
-      prefix: /apps/oneapi
-      modules:
-      - impi/2023.2.0
-  intel-oneapi-mkl:
-    # Remove buildable: False and configure+uncomment externals section below to use intel-oneapi-mkl
-    buildable: False
-    #externals:
-    #- spec: intel-oneapi-mkl@2022.0.2%intel@2021.3.0
-    #  prefix: /apps/oneapi
-  # DH* Remove this section to switch to intel-oneapi-mkl
-  ectrans:
-    require::
-    - '@1.2.0 ~mkl +fftw'
-  gsibec:
-    require::
-    - '@1.4.2 ~mkl'
-  py-numpy:
-    require::
-    - '^openblas'
-  # *DH
diff --git a/configs/sites/tier1/noaa-azure/packages_oneapi-2025.3.0.yaml b/configs/sites/tier1/noaa-azure/packages_oneapi-2025.3.0.yaml
new file mode 100644
index 000000000..f1d9155d2
--- /dev/null
+++ b/configs/sites/tier1/noaa-azure/packages_oneapi-2025.3.0.yaml
@@ -0,0 +1,65 @@
+packages:
+  all:
+    require:
+    - any_of: ['%intel-oneapi-compilers@=2025.3.0']
+      when: '%intel-oneapi-compilers'
+    - any_of: ['%gcc@=12.4.0']
+      when: '%gcc'
+  mpi:
+    buildable: false
+    require:
+    - intel-oneapi-mpi@2021.17
+  intel-oneapi-compilers:
+    buildable: false
+    externals:
+    - spec: intel-oneapi-compilers@2025.3.0
+      prefix: /pw/apps/intel/2025.3.0
+      modules:
+      - tbb/2022.3
+      - compiler-rt/2025.3.0
+      - umf/1.0.2
+      - compiler/2025.3.0
+      extra_attributes:
+        compilers:
+          c: /pw/apps/intel/2025.3.0/compiler/2025.3/bin/icx
+          cxx: /pw/apps/intel/2025.3.0/compiler/2025.3/bin/icpx
+          fortran: /pw/apps/intel/2025.3.0/compiler/2025.3/bin/ifx
+        environment:
+          set:
+            MODULES_AUTO_HANDLING: '1'
+          prepend_path:
+            MODULEPATH: /pw/apps/modules/intel/2025.3.0
+  intel-oneapi-mpi:
+    buildable: false
+    externals:
+    - spec: intel-oneapi-mpi@2021.17
+      prefix: /pw/apps/intel/2025.3.0
+      modules:
+      - mpi/2021.17
+  intel-oneapi-mkl:
+    buildable: false
+    externals:
+    - spec: intel-oneapi-mkl@2025.3
+      prefix: /pw/apps/intel/2025.3.0
+      modules:
+      - mkl/2025.3
+  intel-oneapi-tbb:
+    buildable: false
+    externals:
+    - spec: intel-oneapi-tbb@2022.3
+      prefix: /pw/apps/intel/2025.3.0
+      modules:
+      - tbb/2022.3
+  gcc:
+    buildable: false
+    externals:
+    - spec: gcc@12.4.0 languages:='c,c++,fortran'
+      prefix: /apps/spack-2024-12/linux-rocky9-x86_64/gcc-11.4.1/gcc-12.4.0-dsgnou52lpn2tus6mohdmcw5mjqmqrhj
+      modules:
+      - gcc/12.4.0
+      extra_attributes:
+        compilers:
+          c: /apps/spack-2024-12/linux-rocky9-x86_64/gcc-11.4.1/gcc-12.4.0-dsgnou52lpn2tus6mohdmcw5mjqmqrhj/bin/gcc
+          cxx: /apps/spack-2024-12/linux-rocky9-x86_64/gcc-11.4.1/gcc-12.4.0-dsgnou52lpn2tus6mohdmcw5mjqmqrhj/bin/g++
+          fortran: /apps/spack-2024-12/linux-rocky9-x86_64/gcc-11.4.1/gcc-12.4.0-dsgnou52lpn2tus6mohdmcw5mjqmqrhj/bin/gfortran
+
diff --git a/configs/sites/tier1/noaa-azure/packages_oneapi.yaml b/configs/sites/tier1/noaa-azure/packages_oneapi.yaml
deleted file mode 100644
index a77da5d3c..000000000
--- a/configs/sites/tier1/noaa-azure/packages_oneapi.yaml
+++ /dev/null
@@ -1,40 +0,0 @@
-packages:
-  all:
-    compiler:: [oneapi@2024.2.1]
-    providers:
-      mpi:: [intel-oneapi-mpi@2021.13]
-      # Remove the next three lines to switch to intel-oneapi-mkl
-      blas:: [openblas]
-      fftw-api:: [fftw]
-      lapack:: [openblas]
-  mpi:
-    buildable: False
-  intel-oneapi-mpi:
-    buildable: False
-    externals:
-    - spec: intel-oneapi-mpi@2021.13%oneapi@2024.2.1
-      modules:
-      - intel/2024.2.1
-      - impi/2024.2.1
-      prefix: /apps/oneapi
-  intel-oneapi-mkl:
-    # Remove buildable: False and uncomment externals section below to use intel-oneapi-mkl
-    buildable: False
-    #externals:
-    #- spec: intel-oneapi-mkl@2022.0.2%intel@2021.5.0
-    #  prefix: /apps/oneapi
-  # DH* Remove this section to switch to intel-oneapi-mkl
-  ectrans:
-    require::
-    - '@1.2.0 ~mkl +fftw'
-  gsibec:
-    require::
-    - '@1.4.2 ~mkl'
-  py-numpy:
-    require::
-    - '@1.26'
-    - '^openblas'
-  # *DH
-  cdo:
-    require:
-      - '@2.3.0'