diff --git a/configs/common/packages.yaml b/configs/common/packages.yaml
index 885e10b19..68d8add85 100644
--- a/configs/common/packages.yaml
+++ b/configs/common/packages.yaml
@@ -13,6 +13,12 @@ packages:
       require:
       - zlib
     # Individual package settings
+    arborx:
+      require:
+      - '@2.1'
+      - +mpi
+      - +openmp
+      - +serial
     awscli-v2:
       require:
       - ~examples
diff --git a/configs/sites/tier1/ursa/packages.yaml b/configs/sites/tier1/ursa/packages.yaml
index dfc7c6d3b..fd8265750 100644
--- a/configs/sites/tier1/ursa/packages.yaml
+++ b/configs/sites/tier1/ursa/packages.yaml
@@ -9,17 +9,23 @@ packages:
     - '@1.2.13'
 
 # Modifications of common packages
-  # GPUs on ursa are H100
   ufs-weather-model-env:
     require::
     - +kokkos
+    - +arborx
 
+  # GPUs on ursa are H100
+  # add: '+cuda cuda_arch=90' to kokkos / kokkos-kernels / arborx if building with CUDA support
+  # add: '+wrapper' to kokkos
   kokkos:
     require:
-    - '+cuda cuda_arch=90'
+    - '%cxx=gcc'
   kokkos-kernels:
     require:
-    - '+cuda cuda_arch=90'
+    - '%cxx=gcc'
+  arborx:
+    require:
+    - '%cxx=gcc'
 
 # All other packages listed alphabetically
   autoconf:
diff --git a/configs/sites/tier1/ursa/packages_oneapi-2025.3.1-hpcx.yaml b/configs/sites/tier1/ursa/packages_oneapi-2025.3.1-hpcx.yaml
index 866e1c07a..8c7c9f5a1 100644
--- a/configs/sites/tier1/ursa/packages_oneapi-2025.3.1-hpcx.yaml
+++ b/configs/sites/tier1/ursa/packages_oneapi-2025.3.1-hpcx.yaml
@@ -15,6 +15,7 @@ packages:
     - spec: hpcx-mpi@2.18.1
       prefix: /apps/hpcx-v2.18.1-gcc-mlnx_ofed-redhat9-cuda12-x86_64/ompi-mt-oneapi2025
       modules:
+      - intel-oneapi-compilers/2025.3.1
       - hpc-x/2.18.1-mt-oneapi2025
   intel-oneapi-compilers:
     buildable: False
@@ -37,6 +38,7 @@ packages:
     - spec: intel-oneapi-mkl@2025.3
       prefix: /apps/spack-2024-12/linux-rocky9-x86_64/oneapi-2025.3.1/intel-oneapi-mkl-2025.3.0-z5owhveid7qlq4erbay2seqzs65y3etu
       modules:
+      - intel-oneapi-compilers/2025.3.1
       - intel-oneapi-mkl/2025.3.0
   gcc:
     buildable: False
diff --git a/configs/sites/tier1/ursa/packages_oneapi-2025.3.1.yaml b/configs/sites/tier1/ursa/packages_oneapi-2025.3.1.yaml
index cf096c19c..3da2e8f3f 100644
--- a/configs/sites/tier1/ursa/packages_oneapi-2025.3.1.yaml
+++ b/configs/sites/tier1/ursa/packages_oneapi-2025.3.1.yaml
@@ -30,6 +30,7 @@ packages:
     - spec: intel-oneapi-mpi@2021.17
       prefix: /apps/spack-2024-12/linux-rocky9-x86_64/oneapi-2025.3.1/intel-oneapi-mpi-2021.17.1-emmz2zv6lx5ypzmlc3csouqffu7mwnwr
       modules:
+      - intel-oneapi-compilers/2025.3.1
       - intel-oneapi-mpi/2021.17.1
   intel-oneapi-mkl:
     buildable: False
@@ -37,6 +38,7 @@ packages:
     - spec: intel-oneapi-mkl@2025.3
       prefix: /apps/spack-2024-12/linux-rocky9-x86_64/oneapi-2025.3.1/intel-oneapi-mkl-2025.3.0-z5owhveid7qlq4erbay2seqzs65y3etu
       modules:
+      - intel-oneapi-compilers/2025.3.1
       - intel-oneapi-mkl/2025.3.0
   intel-oneapi-tbb:
     buildable: False
diff --git a/repos/spack_stack/spack_repo/spack_stack/packages/ufs_weather_model_env/package.py b/repos/spack_stack/spack_repo/spack_stack/packages/ufs_weather_model_env/package.py
index 7a1e353b0..9afd48b87 100644
--- a/repos/spack_stack/spack_repo/spack_stack/packages/ufs_weather_model_env/package.py
+++ b/repos/spack_stack/spack_repo/spack_stack/packages/ufs_weather_model_env/package.py
@@ -24,7 +24,8 @@ class UfsWeatherModelEnv(BundlePackage):
     )
     variant("python", default=True, description="Include extra Python packages")
     variant("ncutils", default=True, description="Include extra NetCDF utilities (cprnc and nccmp)")
-    variant("kokkos", default=False, description="Include kokkos and kokkos-kernels")
+    variant("kokkos", default=False, description="Enable kokkos and kokkos-kernels")
+    variant("arborx", default=False, description="Enable arborx")
 
     depends_on("cmake", type="run")
     depends_on("python", type="run")
@@ -63,4 +64,8 @@ class UfsWeatherModelEnv(BundlePackage):
         depends_on("kokkos", type="run")
         depends_on("kokkos-kernels", type="run")
 
+    with when("+arborx"):
+        depends_on("arborx", type="run")
+        requires("+kokkos", msg="Arborx requires +kokkos")
+
     # There is no need for install() since there is no code.