diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 167501b..bbba03d 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,11 +1,10 @@
 ##############################################################################
-# Copyright (c) 2019-2021, Lawrence Livermore National Security, LLC and
+# Copyright (c) 2019-2024, Lawrence Livermore National Security, LLC and
 # RADIUSS project contributors. See the COPYRIGHT file for details.
 #
 # SPDX-License-Identifier: (MIT)
 ##############################################################################
 
-#[create-unique-path--]
 variables:
 # Use the umdev LLNL service user to run CI. This prevents from running
 # pipelines as an actual user.
@@ -13,14 +12,6 @@ variables:
 # Use the service user workspace. Solves permission issues, stores everything
 # at the same location whoever triggers a pipeline.
   CUSTOM_CI_BUILDS_DIR: /usr/workspace/bradiuss/gitlab-runner
-# Unique paths
-  MY_SPACK_PARENT_DIR: ${CUSTOM_CI_BUILDS_DIR}/llnl-stack-${CI_PIPELINE_ID}
-  MY_SPACK_PATH: ${CUSTOM_CI_BUILDS_DIR}/llnl-stack-${CI_PIPELINE_ID}/spack
-  MY_SPACK_USER_CACHE: /dev/shm/llnl-stack-${CI_PIPELINE_ID}-${CI_JOB_ID}/spack-cache
-  SPACK_USER_CACHE_PATH: ${CUSTOM_CI_BUILDS_DIR}/llnl-stack-${CI_PIPELINE_ID}/spack-user-cache
-#[--create-unique-path]
-  SPACK_DISABLE_LOCAL_CONFIG: ""
-  MY_SPACK_DEBUG: ""
 
 stages:
   - setup
@@ -31,7 +22,7 @@ stages:
 include:
   - project: 'lc-templates/id_tokens'
     file: 'id_tokens.yml'
-  - local: .gitlab/core-ci.yml
+  - local: .gitlab/variables.yml
     rules:
       - if: $MY_ENV_NAME != null
   - local: spack-environments/${MY_ENV_NAME}/pipeline.yml
diff --git a/.gitlab/core-ci.yml b/.gitlab/core-ci.yml
deleted file mode 100644
index c4c9917..0000000
--- a/.gitlab/core-ci.yml
+++ /dev/null
@@ -1,52 +0,0 @@
-##############################################################################
-# Copyright (c) 2019-2021, Lawrence Livermore National Security, LLC and
-# RADIUSS project contributors. See the COPYRIGHT file for details.
-#
-# SPDX-License-Identifier: (MIT)
-##############################################################################
-
-.on-oslic:
-  tags: [shell, oslic]
-
-.on-ruby:
-  tags: [shell, ruby]
-
-.on-lassen:
-  tags: [shell, lassen]
-
-# Generate CI pipelines for the package in $MY_ENV_NAME
-#[get-spack--]
-get-spack:
-  extends: [.on-oslic]
-  stage: setup
-  script:
-    - scripts/get-spack
-#[--get-spack]
-
-.generate-pipeline:
-  script:
-    - . ${MY_SPACK_PATH}/share/spack/setup-env.sh
-    - spack ${MY_SPACK_DEBUG} env activate --without-view spack-environments/${MY_ENV_NAME}
-    - spack ${MY_SPACK_DEBUG} config blame mirrors
-    - spack ${MY_SPACK_DEBUG} mirror add --oci-username ${CI_REGISTRY_USER} --oci-password ${CI_REGISTRY_PASSWORD} buildcache-destination oci://${CI_REGISTRY_IMAGE}
-    - spack ${MY_SPACK_DEBUG} config blame mirrors
-#    - spack ${MY_SPACK_DEBUG} concretize || spack ${MY_SPACK_DEBUG} concretize
-    - spack ${MY_SPACK_DEBUG} --color=always
-        --config-scope "${CI_PROJECT_DIR}/.gitlab/spack"
-        ci generate
-        --check-index-only
-        --artifacts-root "${CI_PROJECT_DIR}/jobs_scratch_dir"
-        --output-file "${CI_PROJECT_DIR}/jobs_scratch_dir/pipeline.yml"
-    - cp -r spack-environments/${MY_ENV_NAME}/${SYS_TYPE} ${CI_PROJECT_DIR}/jobs_scratch_dir/concrete_environment/
-  artifacts:
-    paths:
-      - "${CI_PROJECT_DIR}/jobs_scratch_dir"
-
-#[rm-spack--]
-rm-spack:
-  extends: [.on-oslic]
-  stage: clean
-  script:
-    - scripts/remove-spack
-#[--rm-spack]
-
diff --git a/.gitlab/corona.yml b/.gitlab/corona.yml
new file mode 100644
index 0000000..7d0e467
--- /dev/null
+++ b/.gitlab/corona.yml
@@ -0,0 +1,97 @@
+##############################################################################
+# Copyright (c) 2019-2024, Lawrence Livermore National Security, LLC and
+# RADIUSS project contributors. See the COPYRIGHT file for details.
+#
+# SPDX-License-Identifier: (MIT)
+##############################################################################
+
+variables:
+  CORONA_ALLOC_NAME: ${CI_PROJECT_NAME}_ci_${CI_PIPELINE_ID}
+  CORONA_SHARED_ALLOC: "--exclusive --time-limit=60m --nodes=1"
+  CORONA_JOB_ALLOC: "--nodes=1 --begin-time=+2s"
+
+.on-corona:
+  tags:
+    - shell
+    - corona
+  rules:
+    # Runs except if we explicitly deactivate corona by variable.
+    - if: '$ON_CORONA == "OFF"'
+      when: never
+    # We should always release resources allocated in the pipeline.
+    - if: '$CI_JOB_NAME =~ /release-corona/'
+      when: always
+    # A true statement is expected to allow jobs to run. Here is the default.
+    - when: on_success
+
+allocate-corona:
+  variables:
+    GIT_STRATEGY: none
+  extends: [.on-corona, .corona-variables]
+  stage: .pre
+  script:
+    - |
+      set -x
+      flux --parent alloc ${CORONA_SHARED_ALLOC} --job-name=${CORONA_ALLOC_NAME} --bg
+
+.prepare_corona_proxy:
+  script:
+    - |
+      export ALLOC_ID=$(flux jobs --name="${CORONA_ALLOC_NAME}" -n -o "{id}")
+      echo -e "[Information] Shared allocation ID = ${ALLOC_ID}"
+      export PROXY="$( [[ -n "${ALLOC_ID}" ]] && echo "flux proxy ${ALLOC_ID}" || echo "" )"
+
+get-spack-corona:
+  extends: [.on-corona, .corona-variables]
+  stage: setup
+  script:
+    - !reference [.prepare_corona_proxy, script]
+    - ${PROXY} flux watch $( ${PROXY} flux batch -o output.stdout.type=kvs --nodes=1 --begin-time=+2s scripts/get-spack)
+  needs: [allocate-corona]
+
+generate-on-corona:
+  extends: [.on-corona, .corona-variables]
+  stage: generate
+  script:
+    - scripts/print-variables
+    - !reference [.prepare_corona_proxy, script]
+    - ${PROXY} flux watch $( ${PROXY} flux batch -o output.stdout.type=kvs --nodes=1 --begin-time=+2s .gitlab/spack/generate-script.sh)
+  artifacts:
+    paths:
+      - "${CI_PROJECT_DIR}/jobs_scratch_dir"
+  needs: [get-spack-corona]
+
+build-on-corona:
+  extends: [.corona-variables]
+  stage: build
+  trigger:
+    include:
+      - artifact: "jobs_scratch_dir/pipeline.yml"
+        job: generate-on-corona
+      - project: "lc-templates/id_tokens"
+        file: "id_tokens.yml"
+      - local: ".gitlab/spack/reindex-corona.yml"
+    strategy: depend
+    forward:
+      pipeline_variables: true
+  needs: [generate-on-corona]
+
+rm-spack-corona:
+  extends: [.on-corona, .corona-variables]
+  stage: clean
+  script:
+    - !reference [.prepare_corona_proxy, script]
+    - ${PROXY} flux watch $( ${PROXY} flux batch -o output.stdout.type=kvs --nodes=1 --begin-time=+2s scripts/remove-spack)
+  needs: [build-on-corona]
+
+release-corona:
+  variables:
+    GIT_STRATEGY: none
+  extends: [.on-corona, .corona-variables]
+  stage: .post
+  script:
+    - |
+      set -x
+      export URI=$(flux jobs -o "{id} {name}" | grep ${CORONA_ALLOC_NAME} | awk '{print $1}')
+      ([[ -n "${URI}" ]] && flux job kill ${URI} || exit 0)
+  needs: [rm-spack-corona]
diff --git a/.gitlab/lassen.yml b/.gitlab/lassen.yml
index 006472c..bfcdc28 100644
--- a/.gitlab/lassen.yml
+++ b/.gitlab/lassen.yml
@@ -1,18 +1,48 @@
 ##############################################################################
-# Copyright (c) 2019-2021, Lawrence Livermore National Security, LLC and
+# Copyright (c) 2019-2024, Lawrence Livermore National Security, LLC and
 # RADIUSS project contributors. See the COPYRIGHT file for details.
 #
 # SPDX-License-Identifier: (MIT)
 ##############################################################################
 
-# lassen
+variables:
+  ALLOC_NAME: ${CI_PROJECT_NAME}_ci_${CI_PIPELINE_ID}
+  LASSEN_JOB_ALLOC: "1 -W 15 -q pci"
+
+.on-lassen:
+  tags:
+    - shell
+    - lassen
+  rules:
+    # Runs except if we explicitly deactivate lassen by variable.
+    - if: '$ON_LASSEN == "OFF"'
+      when: never
+    # We should always release resources allocated in the pipeline.
+    - if: '$CI_JOB_NAME =~ /release-lassen/'
+      when: always
+    # A true statement is expected to allow jobs to run. Here is the default.
+    - when: on_success
+
+get-spack-lassen:
+  extends: [.on-lassen, .lassen-variables]
+  stage: setup
+  script:
+    - scripts/get-spack
+  needs: []
+
 generate-on-lassen:
-  extends: [.generate-pipeline, .on-lassen]
+  extends: [.on-lassen, .lassen-variables]
   stage: generate
-  before_script:
+  script:
     - scripts/print-variables
+    - .gitlab/spack/generate-script.sh
+  artifacts:
+    paths:
+      - "${CI_PROJECT_DIR}/jobs_scratch_dir"
+  needs: [get-spack-lassen]
 
 build-on-lassen:
+  extends: [.lassen-variables]
   stage: build
   trigger:
     include:
@@ -20,7 +50,15 @@ build-on-lassen:
         job: generate-on-lassen
       - project: "lc-templates/id_tokens"
         file: "id_tokens.yml"
+      - local: ".gitlab/spack/reindex-lassen.yml"
     strategy: depend
     forward:
       pipeline_variables: true
   needs: [generate-on-lassen]
+
+rm-spack-lassen:
+  extends: [.on-lassen, .lassen-variables]
+  stage: clean
+  script:
+    - scripts/remove-spack
+  needs: [build-on-lassen]
diff --git a/.gitlab/poodle.yml b/.gitlab/poodle.yml
new file mode 100644
index 0000000..b572dc1
--- /dev/null
+++ b/.gitlab/poodle.yml
@@ -0,0 +1,93 @@
+##############################################################################
+# Copyright (c) 2019-2024, Lawrence Livermore National Security, LLC and
+# RADIUSS project contributors. See the COPYRIGHT file for details.
+#
+# SPDX-License-Identifier: (MIT)
+##############################################################################
+
+variables:
+  POODLE_ALLOC_NAME: ${CI_PROJECT_NAME}_ci_${CI_PIPELINE_ID}
+  POODLE_SHARED_ALLOC: "--exclusive --time=60 --nodes=1"
+  POODLE_JOB_ALLOC: "--overlap --nodes=1"
+
+.on-poodle:
+  tags:
+    - shell
+    - poodle
+  rules:
+    # Runs except if we explicitly deactivate poodle by variable.
+    - if: '$ON_POODLE == "OFF"'
+      when: never
+    # We should always release resources allocated in the pipeline.
+    - if: '$CI_JOB_NAME =~ /release-poodle/'
+      when: always
+    # A true statement is expected to allow jobs to run. Here is the default.
+    - when: on_success
+
+allocate-poodle:
+  variables:
+    GIT_STRATEGY: none
+  extends: [.on-poodle, .poodle-variables]
+  stage: .pre
+  script:
+    - salloc ${POODLE_SHARED_ALLOC} --no-shell --job-name=${POODLE_ALLOC_NAME}
+
+.prepare_poodle_jobid:
+  script:
+    - |
+      export JOBID=$(squeue -h --name=${POODLE_ALLOC_NAME} --format=%A)
+      echo -e "[Information] Shared allocation ID = ${JOBID}"
+      export JOBID_OPT=$([[ -n "${JOBID}" ]] && echo "--jobid=${JOBID}")
+
+get-spack-poodle:
+  extends: [.on-poodle, .poodle-variables]
+  stage: setup
+  script:
+    - !reference [.prepare_poodle_jobid, script]
+    - srun ${JOBID_OPT} --nodes=1 scripts/get-spack
+  needs: [allocate-poodle]
+
+generate-on-poodle:
+  extends: [.on-poodle, .poodle-variables]
+  stage: generate
+  script:
+    - scripts/print-variables
+    - !reference [.prepare_poodle_jobid, script]
+    - srun ${JOBID_OPT} --nodes=1 .gitlab/spack/generate-script.sh
+  artifacts:
+    paths:
+      - "${CI_PROJECT_DIR}/jobs_scratch_dir"
+  needs: [get-spack-poodle]
+
+build-on-poodle:
+  extends: [.poodle-variables]
+  stage: build
+  trigger:
+    include:
+      - artifact: "jobs_scratch_dir/pipeline.yml"
+        job: generate-on-poodle
+      - project: "lc-templates/id_tokens"
+        file: "id_tokens.yml"
+      - local: ".gitlab/spack/reindex-poodle.yml"
+    strategy: depend
+    forward:
+      pipeline_variables: true
+  needs: [generate-on-poodle]
+
+rm-spack-poodle:
+  extends: [.on-poodle, .poodle-variables]
+  stage: clean
+  script:
+    - !reference [.prepare_poodle_jobid, script]
+    - srun ${JOBID_OPT} --nodes=1 scripts/remove-spack
+  needs: [build-on-poodle]
+
+release-poodle:
+  variables:
+    GIT_STRATEGY: none
+  extends: [.on-poodle, .poodle-variables]
+  stage: .post
+  script:
+    - !reference [.prepare_poodle_jobid, script]
+    - ([[ -n "${JOBID}" ]] && scancel ${JOBID} || exit 0)
+  needs: [rm-spack-poodle]
diff --git a/.gitlab/ruby.yml b/.gitlab/ruby.yml
index fc4bf49..2c52475 100644
--- a/.gitlab/ruby.yml
+++ b/.gitlab/ruby.yml
@@ -1,19 +1,69 @@
 ##############################################################################
-# Copyright (c) 2019-2021, Lawrence Livermore National Security, LLC and
+# Copyright (c) 2019-2024, Lawrence Livermore National Security, LLC and
 # RADIUSS project contributors. See the COPYRIGHT file for details.
 #
 # SPDX-License-Identifier: (MIT)
 ##############################################################################
 
-# ruby
+variables:
+  RUBY_ALLOC_NAME: ${CI_PROJECT_NAME}_ci_${CI_PIPELINE_ID}
+  RUBY_SHARED_ALLOC: "--exclusive --reservation=ci --time=30 --nodes=2"
+  RUBY_JOB_ALLOC: "--reservation=ci --overlap --nodes=1"
+
+.on-ruby:
+  tags:
+    - shell
+    - ruby
+  rules:
+    # Runs except if we explicitly deactivate ruby by variable.
+    - if: '$ON_RUBY == "OFF"'
+      when: never
+    # We should always release resources allocated in the pipeline.
+    - if: '$CI_JOB_NAME =~ /release-ruby/'
+      when: always
+    # A true statement is expected to allow jobs to run. Here is the default.
+    - when: on_success
+
+allocate-ruby:
+  variables:
+    GIT_STRATEGY: none
+  extends: [.on-ruby, .ruby-variables]
+  stage: .pre
+  script:
+    - salloc ${RUBY_SHARED_ALLOC} --no-shell --job-name=${RUBY_ALLOC_NAME}
+
+.prepare_ruby_jobid:
+  script:
+    - |
+      export JOBID=$(squeue -h --name=${RUBY_ALLOC_NAME} --format=%A)
+      echo -e "[Information] Shared allocation ID = ${JOBID}"
+      export JOBID_OPT=$([[ -n "${JOBID}" ]] && echo "--jobid=${JOBID}")
+
+#[get-spack--]
+get-spack-ruby:
+  extends: [.on-ruby, .ruby-variables]
+  stage: setup
+  script:
+    - !reference [.prepare_ruby_jobid, script]
+    - srun ${JOBID_OPT} --reservation=ci --nodes=2 -n 2 scripts/get-spack
+  needs: [allocate-ruby]
+#[--get-spack]
+
 generate-on-ruby:
-  extends: [.generate-pipeline, .on-ruby]
+  extends: [.on-ruby, .ruby-variables]
   stage: generate
-  before_script:
+  script:
     - scripts/print-variables
+    - !reference [.prepare_ruby_jobid, script]
+    - srun ${JOBID_OPT} --reservation=ci --nodes=1 .gitlab/spack/generate-script.sh
+  artifacts:
+    paths:
+      - "${CI_PROJECT_DIR}/jobs_scratch_dir"
+  needs: [get-spack-ruby]
 
 #[send-variable-child--]
 build-on-ruby:
+  extends: [.ruby-variables]
   stage: build
   trigger:
     include:
@@ -21,8 +71,29 @@ build-on-ruby:
         job: generate-on-ruby
       - project: "lc-templates/id_tokens"
         file: "id_tokens.yml"
+      - local: ".gitlab/spack/reindex-ruby.yml"
     strategy: depend
     forward:
       pipeline_variables: true
   needs: [generate-on-ruby]
 #[--send-variable-child]
+
+#[rm-spack--]
+rm-spack-ruby:
+  extends: [.on-ruby, .ruby-variables]
+  stage: clean
+  script:
+    - !reference [.prepare_ruby_jobid, script]
+    - srun ${JOBID_OPT} --reservation=ci --nodes=2 -n 2 scripts/remove-spack
+  needs: [build-on-ruby]
+#[--rm-spack]
+
+release-ruby:
+  variables:
+    GIT_STRATEGY: none
+  extends: [.on-ruby, .ruby-variables]
+  stage: .post
+  script:
+    - !reference [.prepare_ruby_jobid, script]
+    - ([[ -n "${JOBID}" ]] && scancel ${JOBID} || exit 0)
+  needs: [rm-spack-ruby]
diff --git a/.gitlab/spack/ci-script.sh b/.gitlab/spack/ci-script.sh
new file mode 100755
index 0000000..4c88ffd
--- /dev/null
+++ b/.gitlab/spack/ci-script.sh
@@ -0,0 +1,24 @@
+#! /bin/bash
+##############################################################################
+# Copyright (c) 2019-2024, Lawrence Livermore National Security, LLC and
+# RADIUSS project contributors. See the COPYRIGHT file for details.
+#
+# SPDX-License-Identifier: (MIT)
+##############################################################################
+
+hostname
+
+. ${MY_SPACK_PARENT_DIR}/spack/share/spack/setup-env.sh
+export SPACK_DISABLE_LOCAL_CONFIG=""
+export SPACK_USER_CACHE_PATH="${MY_SPACK_USER_CACHE}"
+spack --version
+spack ${MY_SPACK_DEBUG} env activate --without-view ${SPACK_CONCRETE_ENV_DIR}
+spack ${MY_SPACK_DEBUG} config blame mirrors
+spack ${MY_SPACK_DEBUG} mirror rm buildcache-destination
+spack ${MY_SPACK_DEBUG} mirror add --oci-username ${CI_REGISTRY_USER} --oci-password ${CI_REGISTRY_PASSWORD} buildcache-destination oci://${CI_REGISTRY_IMAGE}/${SPACK_TARGET}
+spack ${MY_SPACK_DEBUG} config blame mirrors
+ spack ${MY_SPACK_DEBUG} ci rebuild
+echo Building ${SPACK_JOB_SPEC_PKG_NAME} /${SPACK_JOB_SPEC_DAG_HASH}
+spack --color=always --backtrace install --include-build-deps --no-check-signature --use-buildcache=package:never,dependencies:only /${SPACK_JOB_SPEC_DAG_HASH}
+echo Pushing ${SPACK_JOB_SPEC_PKG_NAME} /${SPACK_JOB_SPEC_DAG_HASH}
+spack buildcache push buildcache-destination /${SPACK_JOB_SPEC_DAG_HASH}
diff --git a/.gitlab/spack/ci.yaml b/.gitlab/spack/ci.yaml
index b1602be..adbccd6 100644
--- a/.gitlab/spack/ci.yaml
+++ b/.gitlab/spack/ci.yaml
@@ -12,65 +12,59 @@ ci:
 
   - any-job:
       before_script:
-        - . ${MY_SPACK_PATH}/share/spack/setup-env.sh
-        - export SPACK_DISABLE_LOCAL_CONFIG=""
-        - export SPACK_USER_CACHE_PATH="${MY_SPACK_USER_CACHE}"
-        - spack --version
+        - echo "This section cannot be empty because of Spack CI implementation."
 
   - submapping:
     - match:
-      - arch=linux-rhel8-ivybridge
+      - 'target=zen'
+      build-job:
+        tags: [corona, shell]
+        script::
+        - export ALLOC_ID=$(flux jobs --name="${CORONA_ALLOC_NAME}" -n -o "{id}")
+        - echo -e "[Information] Shared allocation ID = ${ALLOC_ID}"
+        - export PROXY="$( [[ -n "${ALLOC_ID}" ]] && echo "flux proxy ${ALLOC_ID}" || echo "" )"
+        - ${PROXY} flux watch $( ${PROXY} flux batch -o output.stdout.type=kvs ${CORONA_JOB_ALLOC} .gitlab/spack/ci-script.sh)
+    - match:
+      - 'target=cascadelake'
       build-job:
         tags: [ruby, shell]
         script::
-        - spack ${MY_SPACK_DEBUG} env activate --without-view ${SPACK_CONCRETE_ENV_DIR}
-        - spack ${MY_SPACK_DEBUG} config blame mirrors
-        - spack ${MY_SPACK_DEBUG} mirror rm buildcache-destination
-        - spack ${MY_SPACK_DEBUG} mirror add --oci-username ${CI_REGISTRY_USER} --oci-password ${CI_REGISTRY_PASSWORD} buildcache-destination oci://${CI_REGISTRY_IMAGE}
-        - spack ${MY_SPACK_DEBUG} config blame mirrors
-        #- spack ${MY_SPACK_DEBUG} ci rebuild
-        - echo Building ${SPACK_JOB_SPEC_PKG_NAME} /${SPACK_JOB_SPEC_DAG_HASH}
-        - spack --color=always --backtrace
-          install
-          --include-build-deps
-          --no-check-signature
-          --use-buildcache=package:never,dependencies:only
-          /${SPACK_JOB_SPEC_DAG_HASH}
-        - echo Pushing ${SPACK_JOB_SPEC_PKG_NAME} /${SPACK_JOB_SPEC_DAG_HASH}
-        - spack buildcache push buildcache-destination /${SPACK_JOB_SPEC_DAG_HASH}
+        - export JOBID=$(squeue -h --name=${RUBY_ALLOC_NAME} --format=%A)
+        - srun $( [[ -n "${JOBID}" ]] && echo "--jobid=${JOBID}" ) ${RUBY_JOB_ALLOC} .gitlab/spack/ci-script.sh
+    - match:
+      - 'target=sapphirerapids'
+      build-job:
+        tags: [poodle, shell]
+        script::
+        - export JOBID=$(squeue -h --name=${POODLE_ALLOC_NAME} --format=%A)
+        - srun $( [[ -n "${JOBID}" ]] && echo "--jobid=${JOBID}" ) ${POODLE_JOB_ALLOC} .gitlab/spack/ci-script.sh
     - match:
-      - 'target=ppc64le:'
+      - 'target=power9le'
       build-job:
         tags: [lassen, shell]
         script::
-        - spack ${MY_SPACK_DEBUG} env activate --without-view ${SPACK_CONCRETE_ENV_DIR}
-        - spack ${MY_SPACK_DEBUG} config blame mirrors
-        - spack ${MY_SPACK_DEBUG} mirror rm buildcache-destination
-        - spack ${MY_SPACK_DEBUG} mirror add --oci-username ${CI_REGISTRY_USER} --oci-password ${CI_REGISTRY_PASSWORD} buildcache-destination oci://${CI_REGISTRY_IMAGE}
-        - spack ${MY_SPACK_DEBUG} config blame mirrors
-        #- spack ${MY_SPACK_DEBUG} ci rebuild
-        - echo Building ${SPACK_JOB_SPEC_PKG_NAME} /${SPACK_JOB_SPEC_DAG_HASH}
-        - spack --color=always --backtrace
-          install
-          --include-build-deps
-          --no-check-signature
-          --use-buildcache=package:never,dependencies:only
-          /${SPACK_JOB_SPEC_DAG_HASH}
-        - echo Pushing ${SPACK_JOB_SPEC_PKG_NAME} /${SPACK_JOB_SPEC_DAG_HASH}
-        - spack buildcache push buildcache-destination /${SPACK_JOB_SPEC_DAG_HASH}
+        - lalloc ${LASSEN_JOB_ALLOC} .gitlab/spack/ci-script.sh
+    - match:
+      - 'target=zen3'
+      build-job:
+        tags: [tioga, shell]
+        script::
+        - export ALLOC_ID=$(flux jobs --name="${TIOGA_ALLOC_NAME}" -n -o "{id}")
+        - echo -e "[Information] Shared allocation ID = ${ALLOC_ID}"
+        - export PROXY="$( [[ -n "${ALLOC_ID}" ]] && echo "flux proxy ${ALLOC_ID}" || echo "" )"
+        - ${PROXY} flux watch $( ${PROXY} flux batch -o output.stdout.type=kvs ${TIOGA_JOB_ALLOC} .gitlab/spack/ci-script.sh)
     match_behavior: first
 
   - reindex-job:
       tags: [oslic, shell]
       before_script:
-        - . ${MY_SPACK_PATH}/share/spack/setup-env.sh
-        - export SPACK_DISABLE_LOCAL_CONFIG=""
-        - export SPACK_USER_CACHE_PATH="${MY_SPACK_USER_CACHE}"
-        - spack --version
-        - spack ${MY_SPACK_DEBUG} config blame mirrors
-        - spack ${MY_SPACK_DEBUG} mirror add --oci-username ${CI_REGISTRY_USER} --oci-password ${CI_REGISTRY_PASSWORD} buildcache-destination oci://${CI_REGISTRY_IMAGE}
-        - spack ${MY_SPACK_DEBUG} config blame mirrors
+        - echo -e "[Information] We override reindex-job in .gitlab/spack/reindex-override.yml."
+        - echo -e "[Information] The jobs are then replaced by their machine specific equivalent named rebuild-index-<machine>."
+        - echo -e "[Information] The content of the reindex-job script moved to .gitlab/spack/reindex-script.sh"
+        - echo -e "[Error] This job should never run, please verify you implemented an override."
+
   - noop-job:
       tags: [oslic, shell]
+
   - cleanup-job:
       tags: [oslic, shell]
diff --git a/.gitlab/spack/generate-script.sh b/.gitlab/spack/generate-script.sh
new file mode 100755
index 0000000..5347ff5
--- /dev/null
+++ b/.gitlab/spack/generate-script.sh
@@ -0,0 +1,18 @@
+#! /bin/bash
+##############################################################################
+# Copyright (c) 2019-2024, Lawrence Livermore National Security, LLC and
+# RADIUSS project contributors. See the COPYRIGHT file for details.
+#
+# SPDX-License-Identifier: (MIT)
+##############################################################################
+
+hostname
+
+. ${MY_SPACK_PARENT_DIR}/spack/share/spack/setup-env.sh
+spack ${MY_SPACK_DEBUG} env activate --without-view spack-environments/${MY_ENV_NAME}
+spack ${MY_SPACK_DEBUG} config blame mirrors
+spack ${MY_SPACK_DEBUG} mirror add --oci-username ${CI_REGISTRY_USER} --oci-password ${CI_REGISTRY_PASSWORD} buildcache-destination oci://${CI_REGISTRY_IMAGE}/${SPACK_TARGET}
+spack ${MY_SPACK_DEBUG} config blame mirrors
+spack ${MY_SPACK_DEBUG} concretize || spack ${MY_SPACK_DEBUG} concretize
+spack ${MY_SPACK_DEBUG} --color=always --config-scope "${CI_PROJECT_DIR}/.gitlab/spack" ci generate --check-index-only --artifacts-root "${CI_PROJECT_DIR}/jobs_scratch_dir" --output-file "${CI_PROJECT_DIR}/jobs_scratch_dir/pipeline.yml"
+cp -r spack-environments/${MY_ENV_NAME}/${LCSCHEDCLUSTER} ${CI_PROJECT_DIR}/jobs_scratch_dir/concrete_environment/
diff --git a/.gitlab/spack/reindex-corona.yml b/.gitlab/spack/reindex-corona.yml
new file mode 100644
index 0000000..86201ec
--- /dev/null
+++ b/.gitlab/spack/reindex-corona.yml
@@ -0,0 +1,19 @@
+##############################################################################
+# Copyright (c) 2019-2024, Lawrence Livermore National Security, LLC and
+# RADIUSS project contributors. See the COPYRIGHT file for details.
+#
+# SPDX-License-Identifier: (MIT)
+##############################################################################
+
+include:
+  - local: ".gitlab/spack/reindex-override.yml"
+
+rebuild-index-corona:
+  stage: stage-rebuild-index
+  tags: [corona, shell]
+  script:
+    - export ALLOC_ID=$(flux jobs --name="${CORONA_ALLOC_NAME}" -n -o "{id}")
+    - echo -e "[Information] Shared allocation ID = ${ALLOC_ID}"
+    - export PROXY="$( [[ -n "${ALLOC_ID}" ]] && echo "flux proxy ${ALLOC_ID}" || echo "" )"
+    - ${PROXY} flux watch $( ${PROXY} flux batch -o output.stdout.type=kvs ${CORONA_JOB_ALLOC} .gitlab/spack/reindex-script.sh)
+  dependencies: []
diff --git a/.gitlab/spack/reindex-lassen.yml b/.gitlab/spack/reindex-lassen.yml
new file mode 100644
index 0000000..749389d
--- /dev/null
+++ b/.gitlab/spack/reindex-lassen.yml
@@ -0,0 +1,16 @@
+##############################################################################
+# Copyright (c) 2019-2024, Lawrence Livermore National Security, LLC and
+# RADIUSS project contributors. See the COPYRIGHT file for details.
+#
+# SPDX-License-Identifier: (MIT)
+##############################################################################
+
+include:
+  - local: ".gitlab/spack/reindex-override.yml"
+
+rebuild-index-lassen:
+  stage: stage-rebuild-index
+  tags: [lassen, shell]
+  script:
+    - lalloc ${LASSEN_JOB_ALLOC} .gitlab/spack/reindex-script.sh
+  dependencies: []
diff --git a/.gitlab/spack/reindex-override.yml b/.gitlab/spack/reindex-override.yml
new file mode 100644
index 0000000..1fa16f0
--- /dev/null
+++ b/.gitlab/spack/reindex-override.yml
@@ -0,0 +1,14 @@
+##############################################################################
+# Copyright (c) 2019-2024, Lawrence Livermore National Security, LLC and
+# RADIUSS project contributors. See the COPYRIGHT file for details.
+#
+# SPDX-License-Identifier: (MIT)
+##############################################################################
+
+rebuild-index:
+  stage: stage-rebuild-index
+  tags: [oslic, shell]
+  rules:
+    - when: never
+  script:
+    - echo "Override the job set by Spack"
diff --git a/.gitlab/spack/reindex-poodle.yml b/.gitlab/spack/reindex-poodle.yml
new file mode 100644
index 0000000..e6d8490
--- /dev/null
+++ b/.gitlab/spack/reindex-poodle.yml
@@ -0,0 +1,17 @@
+##############################################################################
+# Copyright (c) 2019-2024, Lawrence Livermore National Security, LLC and
+# RADIUSS project contributors. See the COPYRIGHT file for details.
+#
+# SPDX-License-Identifier: (MIT)
+##############################################################################
+
+include:
+  - local: ".gitlab/spack/reindex-override.yml"
+
+rebuild-index-poodle:
+  stage: stage-rebuild-index
+  tags: [poodle, shell]
+  script:
+    - export JOBID=$(squeue -h --name=${POODLE_ALLOC_NAME} --format=%A)
+    - srun $( [[ -n "${JOBID}" ]] && echo "--jobid=${JOBID}" ) ${POODLE_JOB_ALLOC} .gitlab/spack/reindex-script.sh
+  dependencies: []
diff --git a/.gitlab/spack/reindex-ruby.yml b/.gitlab/spack/reindex-ruby.yml
new file mode 100644
index 0000000..079eca5
--- /dev/null
+++ b/.gitlab/spack/reindex-ruby.yml
@@ -0,0 +1,17 @@
+##############################################################################
+# Copyright (c) 2019-2024, Lawrence Livermore National Security, LLC and
+# RADIUSS project contributors. See the COPYRIGHT file for details.
+#
+# SPDX-License-Identifier: (MIT)
+##############################################################################
+
+include:
+  - local: ".gitlab/spack/reindex-override.yml"
+
+rebuild-index-ruby:
+  stage: stage-rebuild-index
+  tags: [ruby, shell]
+  script:
+    - export JOBID=$(squeue -h --name=${RUBY_ALLOC_NAME} --format=%A)
+    - srun $( [[ -n "${JOBID}" ]] && echo "--jobid=${JOBID}" ) ${RUBY_JOB_ALLOC} .gitlab/spack/reindex-script.sh
+  dependencies: []
diff --git a/.gitlab/spack/reindex-script.sh b/.gitlab/spack/reindex-script.sh
new file mode 100755
index 0000000..3edfaa7
--- /dev/null
+++ b/.gitlab/spack/reindex-script.sh
@@ -0,0 +1,18 @@
+#! /bin/bash
+##############################################################################
+# Copyright (c) 2019-2024, Lawrence Livermore National Security, LLC and
+# RADIUSS project contributors. See the COPYRIGHT file for details.
+#
+# SPDX-License-Identifier: (MIT)
+##############################################################################
+
+hostname
+
+. ${MY_SPACK_PARENT_DIR}/spack/share/spack/setup-env.sh
+export SPACK_DISABLE_LOCAL_CONFIG=""
+export SPACK_USER_CACHE_PATH="${MY_SPACK_USER_CACHE}"
+spack --version
+spack ${MY_SPACK_DEBUG} config blame mirrors
+spack ${MY_SPACK_DEBUG} mirror add --oci-username ${CI_REGISTRY_USER} --oci-password ${CI_REGISTRY_PASSWORD} buildcache-destination oci://${CI_REGISTRY_IMAGE}/${SPACK_TARGET}
+spack ${MY_SPACK_DEBUG} config blame mirrors
+spack buildcache update-index --keys buildcache-destination
diff --git a/.gitlab/spack/reindex-tioga.yml b/.gitlab/spack/reindex-tioga.yml
new file mode 100644
index 0000000..b68dbb9
--- /dev/null
+++ b/.gitlab/spack/reindex-tioga.yml
@@ -0,0 +1,19 @@
+##############################################################################
+# Copyright (c) 2019-2024, Lawrence Livermore National Security, LLC and
+# RADIUSS project contributors. See the COPYRIGHT file for details.
+#
+# SPDX-License-Identifier: (MIT)
+##############################################################################
+
+include:
+  - local: ".gitlab/spack/reindex-override.yml"
+
+rebuild-index-tioga:
+  stage: stage-rebuild-index
+  tags: [tioga, shell]
+  script:
+    - export ALLOC_ID=$(flux jobs --name="${TIOGA_ALLOC_NAME}" -n -o "{id}")
+    - echo -e "[Information] Shared allocation ID = ${ALLOC_ID}"
+    - export PROXY="$( [[ -n "${ALLOC_ID}" ]] && echo "flux proxy ${ALLOC_ID}" || echo "" )"
+    - ${PROXY} flux watch $( ${PROXY} flux batch -o output.stdout.type=kvs ${TIOGA_JOB_ALLOC} .gitlab/spack/reindex-script.sh)
+  dependencies: []
diff --git a/.gitlab/tioga.yml b/.gitlab/tioga.yml
new file mode 100644
index 0000000..d5d58d1
--- /dev/null
+++ b/.gitlab/tioga.yml
@@ -0,0 +1,97 @@
+##############################################################################
+# Copyright (c) 2019-2024, Lawrence Livermore National Security, LLC and
+# RADIUSS project contributors. See the COPYRIGHT file for details.
+#
+# SPDX-License-Identifier: (MIT)
+##############################################################################
+
+variables:
+  TIOGA_ALLOC_NAME: ${CI_PROJECT_NAME}_ci_${CI_PIPELINE_ID}
+  TIOGA_SHARED_ALLOC: "--queue=pci --exclusive --time-limit=60m --nodes=1"
+  TIOGA_JOB_ALLOC: "--nodes=1 --begin-time=+2s"
+
+.on-tioga:
+  tags:
+    - shell
+    - tioga
+  rules:
+    # Runs except if we explicitly deactivate tioga by variable.
+    - if: '$ON_TIOGA == "OFF"'
+      when: never
+    # We should always release resources allocated in the pipeline.
+    - if: '$CI_JOB_NAME =~ /release-tioga/'
+      when: always
+    # A true statement is expected to allow jobs to run. Here is the default.
+    - when: on_success
+
+allocate-tioga:
+  variables:
+    GIT_STRATEGY: none
+  extends: [.on-tioga, .tioga-variables]
+  stage: .pre
+  script:
+    - |
+      set -x
+      flux --parent alloc ${TIOGA_SHARED_ALLOC} --job-name=${TIOGA_ALLOC_NAME} --bg
+
+.prepare_tioga_proxy:
+  script:
+    - |
+      export ALLOC_ID=$(flux jobs --name="${TIOGA_ALLOC_NAME}" -n -o "{id}")
+      echo -e "[Information] Shared allocation ID = ${ALLOC_ID}"
+      export PROXY="$( [[ -n "${ALLOC_ID}" ]] && echo "flux proxy ${ALLOC_ID}" || echo "" )"
+
+get-spack-tioga:
+  extends: [.on-tioga, .tioga-variables]
+  stage: setup
+  script:
+    - !reference [.prepare_tioga_proxy, script]
+    - ${PROXY} flux watch $( ${PROXY} flux batch -o output.stdout.type=kvs --nodes=1 --begin-time=+2s scripts/get-spack)
+  needs: [allocate-tioga]
+
+generate-on-tioga:
+  extends: [.on-tioga, .tioga-variables]
+  stage: generate
+  script:
+    - scripts/print-variables
+    - !reference [.prepare_tioga_proxy, script]
+    - ${PROXY} flux watch $( ${PROXY} flux batch -o output.stdout.type=kvs --nodes=1 --begin-time=+2s .gitlab/spack/generate-script.sh)
+  artifacts:
+    paths:
+      - "${CI_PROJECT_DIR}/jobs_scratch_dir"
+  needs: [get-spack-tioga]
+
+build-on-tioga:
+  extends: [.tioga-variables]
+  stage: build
+  trigger:
+    include:
+      - artifact: "jobs_scratch_dir/pipeline.yml"
+        job: generate-on-tioga
+      - project: "lc-templates/id_tokens"
+        file: "id_tokens.yml"
+      - local: ".gitlab/spack/reindex-tioga.yml"
+    strategy: depend
+    forward:
+      pipeline_variables: true
+  needs: [generate-on-tioga]
+
+rm-spack-tioga:
+  extends: [.on-tioga, .tioga-variables]
+  stage: clean
+  script:
+    - !reference [.prepare_tioga_proxy, script]
+    - ${PROXY} flux watch $( ${PROXY} flux batch -o output.stdout.type=kvs --nodes=1 --begin-time=+2s scripts/remove-spack)
+  needs: [build-on-tioga]
+
+release-tioga:
+  variables:
+    GIT_STRATEGY: none
+  extends: [.on-tioga, .tioga-variables]
+  stage: .post
+  script:
+    - |
+      set -x
+      export URI=$(flux jobs -o "{id} {name}" | grep ${TIOGA_ALLOC_NAME} | awk '{print $1}')
+      ([[ -n "${URI}" ]] && flux job kill ${URI} || exit 0)
+  needs: [rm-spack-tioga]
diff --git a/.gitlab/variables.yml b/.gitlab/variables.yml
new file mode 100644
index 0000000..d0d3701
--- /dev/null
+++ b/.gitlab/variables.yml
@@ -0,0 +1,56 @@
+##############################################################################
+# Copyright (c) 2019-2024, Lawrence Livermore National Security, LLC and
+# RADIUSS project contributors. See the COPYRIGHT file for details.
+#
+# SPDX-License-Identifier: (MIT)
+##############################################################################
+
+.corona-variables:
+  variables:
+    SPACK_DISABLE_LOCAL_CONFIG: ""
+    MY_SPACK_DEBUG: ""
+    MY_SPACK_PARENT_DIR: /dev/shm/llnl-stack-${CI_PIPELINE_ID}-corona
+    SPACK_USER_CACHE_PATH: /dev/shm/llnl-stack-${CI_PIPELINE_ID}-corona/spack-user-cache
+    MY_SPACK_USER_CACHE: /dev/shm/llnl-stack-${CI_PIPELINE_ID}-${CI_JOB_ID}/spack-cache
+    SPACK_TARGET: zen
+
+.ruby-variables:
+  variables:
+    SPACK_DISABLE_LOCAL_CONFIG: ""
+    MY_SPACK_DEBUG: ""
+#[create-unique-path--]
+    # Spack clone for ruby generated pipeline
+    MY_SPACK_PARENT_DIR: /dev/shm/llnl-stack-${CI_PIPELINE_ID}-ruby
+    # Spack cache for spack at pipeline generation time, then overridden by each CI job
+    SPACK_USER_CACHE_PATH: /dev/shm/llnl-stack-${CI_PIPELINE_ID}-ruby/spack-user-cache
+    # Spack cache for each CI job in the generated pipeline (avoids collision)
+    MY_SPACK_USER_CACHE: /dev/shm/llnl-stack-${CI_PIPELINE_ID}-${CI_JOB_ID}/spack-cache
+#[--create-unique-path]
+    SPACK_TARGET: cascadelake
+
+.poodle-variables:
+  variables:
+    SPACK_DISABLE_LOCAL_CONFIG: ""
+    MY_SPACK_DEBUG: ""
+    MY_SPACK_PARENT_DIR: /dev/shm/llnl-stack-${CI_PIPELINE_ID}-poodle
+    SPACK_USER_CACHE_PATH: /dev/shm/llnl-stack-${CI_PIPELINE_ID}-poodle/spack-user-cache
+    MY_SPACK_USER_CACHE: /dev/shm/llnl-stack-${CI_PIPELINE_ID}-${CI_JOB_ID}/spack-cache
+    SPACK_TARGET: sapphirerapids
+
+.lassen-variables:
+  variables:
+    SPACK_DISABLE_LOCAL_CONFIG: ""
+    MY_SPACK_DEBUG: ""
+    MY_SPACK_PARENT_DIR: ${CUSTOM_CI_BUILDS_DIR}/llnl-stack-${CI_PIPELINE_ID}-lassen
+    SPACK_USER_CACHE_PATH: ${CUSTOM_CI_BUILDS_DIR}/llnl-stack-${CI_PIPELINE_ID}-lassen/spack-user-cache
+    MY_SPACK_USER_CACHE: /dev/shm/llnl-stack-${CI_PIPELINE_ID}-${CI_JOB_ID}/spack-cache
+    SPACK_TARGET: power9le
+
+.tioga-variables:
+  variables:
+    SPACK_DISABLE_LOCAL_CONFIG: ""
+    MY_SPACK_DEBUG: ""
+    MY_SPACK_PARENT_DIR: /dev/shm/llnl-stack-${CI_PIPELINE_ID}-tioga
+    SPACK_USER_CACHE_PATH: /dev/shm/llnl-stack-${CI_PIPELINE_ID}-tioga/spack-user-cache
+    MY_SPACK_USER_CACHE: /dev/shm/llnl-stack-${CI_PIPELINE_ID}-${CI_JOB_ID}/spack-cache
+    SPACK_TARGET: zen3
diff --git a/scripts/get-spack b/scripts/get-spack
index 6ec965f..f75ce42 100755
--- a/scripts/get-spack
+++ b/scripts/get-spack
@@ -10,25 +10,27 @@
 set -e
 set -x
 
+hostname
+
 #[get-spack--]
-if [[ ! -d ${MY_SPACK_PATH} ]]
+if [[ ! -d ${MY_SPACK_PARENT_DIR}/spack ]]
 then
   mkdir -p ${MY_SPACK_PARENT_DIR}
   # A shallow clone is enough, and much faster.
-  git clone ${MY_SPACK_REPO} --depth 1 --branch develop ${MY_SPACK_PATH}
+  git clone ${MY_SPACK_REPO} --depth 1 --branch develop ${MY_SPACK_PARENT_DIR}/spack
 fi
 
 if [[ ${MY_SPACK_COMMIT} ]]
 then
   # MY_SPACK_COMMIT is defined and should have the commit hash to use.
-  cd ${MY_SPACK_PATH}
+  cd ${MY_SPACK_PARENT_DIR}/spack
   git fetch --depth 1 ${MY_SPACK_REPO} ${MY_SPACK_COMMIT}
   git checkout ${MY_SPACK_COMMIT}
   git tag ${CI_PIPELINE_ID}
   cd -
 else
   # empty spack commit, MY_SPACK_BRANCH which should have a branch name.
-  cd ${MY_SPACK_PATH}
+  cd ${MY_SPACK_PARENT_DIR}/spack
   git checkout -b temp
   git branch -D ${MY_SPACK_BRANCH} || true
   git fetch --depth 1 ${MY_SPACK_REPO} ${MY_SPACK_BRANCH}:${MY_SPACK_BRANCH}
diff --git a/scripts/print-variables b/scripts/print-variables
index 7265c6c..a216bcc 100755
--- a/scripts/print-variables
+++ b/scripts/print-variables
@@ -1,6 +1,8 @@
 #!/bin/bash
 
-vars="MY_ENV_NAME MY_SPACK_COMMIT MY_SPACK_BRANCH MY_SPACK_REPO MY_SPACK_PATH"
+hostname
+
+vars="MY_ENV_NAME MY_SPACK_COMMIT MY_SPACK_BRANCH MY_SPACK_REPO MY_SPACK_PARENT_DIR"
 
 echo "--------------------------------"
 echo "---- Variables of interest "
diff --git a/scripts/remove-spack b/scripts/remove-spack
index b56e65b..4d10cc3 100755
--- a/scripts/remove-spack
+++ b/scripts/remove-spack
@@ -2,6 +2,8 @@
 
 set -e
 
+hostname
+
 #[rm-spack--]
 if [[ ! -d ${MY_SPACK_PARENT_DIR} ]]
 then
diff --git a/spack-environments/blt-test/spack.yaml b/spack-environments/blt-test/spack.yaml
index 47a8be0..e7b6ea2 100644
--- a/spack-environments/blt-test/spack.yaml
+++ b/spack-environments/blt-test/spack.yaml
@@ -6,7 +6,7 @@
 ##############################################################################
 
 spack:
-  include: [$SYS_TYPE]
+  include: [$LCSCHEDCLUSTER]
   concretization: separately
   view: false
   config:
@@ -26,10 +26,10 @@ spack:
   definitions:
   - compilers:
       - '%gcc@8.3.1'
-    when: env.get("SYS_TYPE", "") == "toss_3_x86_64_ib"
+    when: env.get("LCSCHEDCLUSTER", "") == "toss_3_x86_64_ib"
   - compilers:
       - '%xl@16.1.1.7'
-    when: env.get("SYS_TYPE", "") == "blueos_3_ppc64le_ib_p9"
+    when: env.get("LCSCHEDCLUSTER", "") == "blueos_3_ppc64le_ib_p9"
   - projects:
     - blt-test@develop
     - blt-test@main
diff --git a/spack-environments/empty/spack.yaml b/spack-environments/empty/spack.yaml
index e86f819..2aaa7bd 100644
--- a/spack-environments/empty/spack.yaml
+++ b/spack-environments/empty/spack.yaml
@@ -6,6 +6,6 @@
 ###############################################################################
 
 spack:
-  include: [../radiuss/$SYS_TYPE]
+  include: [../radiuss/$LCSCHEDCLUSTER]
   view: false
   concretization: separately
diff --git a/spack-environments/radiuss/blueos_3_ppc64le_ib_p9/packages.yaml b/spack-environments/radiuss/blueos_3_ppc64le_ib_p9/packages.yaml
deleted file mode 100644
index 11e8f7c..0000000
--- a/spack-environments/radiuss/blueos_3_ppc64le_ib_p9/packages.yaml
+++ /dev/null
@@ -1,159 +0,0 @@
-packages:
-  all:
-    # This defaults us to machine specific flags of ivybridge which allows
-    # us to run on broadwell as well
-    target: [ppc64le]
-    compiler: [gcc, pgi, clang, xl]
-    providers:
-      mpi: [spectrum-mpi]
-  cmake:
-    version: [3.23.1, 3.22.4, 3.21.1, 3.20.2, 3.18.0, 3.16.8, 3.14.5]
-    buildable: false
-    externals:
-    - spec: cmake@3.14.5
-      prefix: /usr/tce/packages/cmake/cmake-3.14.5
-    - spec: cmake@3.16.8
-      prefix: /usr/tce/packages/cmake/cmake-3.16.8
-    - spec: cmake@3.18.0
-      prefix: /usr/tce/packages/cmake/cmake-3.18.0
-    - spec: cmake@3.20.2
-      prefix: /usr/tce/packages/cmake/cmake-3.20.2
-    - spec: cmake@3.21.1
-      prefix: /usr/tce/packages/cmake/cmake-3.21.1
-    - spec: cmake@3.22.4
-      prefix: /usr/tce/packages/cmake/cmake-3.22.4
-    - spec: cmake@3.23.1
-      prefix: /usr/tce/packages/cmake/cmake-3.23.1
-  cuda:
-    version: [12.0.0, 11.7.0, 11.5.0, 11.2.0, 11.1.0, 11.0.2, 10.2.89, 10.1.243, 10.1.168, 9.2.148, 8.0]
-    buildable: false
-    externals:
-    - spec: cuda@12.0.0+allow-unsupported-compilers
-      prefix: /usr/tce/packages/cuda/cuda-12.0.0
-    - spec: cuda@11.7.0+allow-unsupported-compilers
-      prefix: /usr/tce/packages/cuda/cuda-11.7.0
-    - spec: cuda@11.5.0+allow-unsupported-compilers
-      prefix: /usr/tce/packages/cuda/cuda-11.5.0
-    - spec: cuda@11.2.0+allow-unsupported-compilers
-      prefix: /usr/tce/packages/cuda/cuda-11.2.0
-    - spec: cuda@11.1.0+allow-unsupported-compilers
-      prefix: /usr/tce/packages/cuda/cuda-11.1.0
-    - spec: cuda@11.0.2+allow-unsupported-compilers
-      prefix: /usr/tce/packages/cuda/cuda-11.0.2
-    - spec: cuda@10.2.89+allow-unsupported-compilers
-      prefix: /usr/tce/packages/cuda/cuda-10.2.89
-    - spec: cuda@10.1.243+allow-unsupported-compilers
-      prefix: /usr/tce/packages/cuda/cuda-10.1.243
-    - spec: cuda@10.1.168+allow-unsupported-compilers
-      prefix: /usr/tce/packages/cuda/cuda-10.1.168
-    - spec: cuda@9.2.148+allow-unsupported-compilers
-      prefix: /usr/tce/packages/cuda/cuda-9.2.148
-    - spec: cuda@8.0+allow-unsupported-compilers
-      prefix: /usr/tce/packages/cuda/cuda-8.0
-  spectrum-mpi:
-    buildable: false
-    externals:
-    - spec: spectrum-mpi@10.3.1.03rtm0%pgi@=19.10
-      prefix: /usr/tce/packages/spectrum-mpi/spectrum-mpi-rolling-release-pgi-19.10
-    - spec: spectrum-mpi@10.3.1.03rtm0%pgi@=20.4
-      prefix: /usr/tce/packages/spectrum-mpi/spectrum-mpi-rolling-release-pgi-20.4
-    - spec: spectrum-mpi@10.3.1.03rtm0%pgi@=21.11
-      prefix: /usr/tce/packages/spectrum-mpi/spectrum-mpi-rolling-release-pgi-21.11
-    - spec: spectrum-mpi@10.3.1.03rtm0%pgi@=22.7
-      prefix: /usr/tce/packages/spectrum-mpi/spectrum-mpi-rolling-release-pgi-22.7
-    - spec: spectrum-mpi@10.3.1.03rtm0%pgi@=22.11
-      prefix: /usr/tce/packages/spectrum-mpi/spectrum-mpi-rolling-release-pgi-22.11
-    - spec: spectrum-mpi@10.3.1.03rtm0%pgi@=23.1
-      prefix: /usr/tce/packages/spectrum-mpi/spectrum-mpi-rolling-release-pgi-23.1
-    - spec: spectrum-mpi@10.3.1.03rtm0%gcc@=4.9.3
-      prefix: /usr/tce/packages/spectrum-mpi/spectrum-mpi-rolling-release-gcc-4.9.3
-    - spec: spectrum-mpi@10.3.1.03rtm0%gcc@=8.3.1
-      prefix: /usr/tce/packages/spectrum-mpi/spectrum-mpi-rolling-release-gcc-8.3.1
-    - spec: spectrum-mpi@10.3.1.03rtm0%clang@=3.9.1
-      prefix: /usr/tce/packages/spectrum-mpi/spectrum-mpi-rolling-release-clang-3.9.1
-    - spec: spectrum-mpi@10.3.1.03rtm0%clang@=4.0.0
-      prefix: /usr/tce/packages/spectrum-mpi/spectrum-mpi-rolling-release-clang-4.0.0
-    - spec: spectrum-mpi@10.3.1.03rtm0%clang@=9.0.0
-      prefix: /usr/tce/packages/spectrum-mpi/spectrum-mpi-rolling-release-clang-9.0.0
-    - spec: spectrum-mpi@10.3.1.03rtm0%clang@=10.0.1
-      prefix: /usr/tce/packages/spectrum-mpi/spectrum-mpi-rolling-release-clang-10.0.1
-    - spec: spectrum-mpi@10.3.1.03rtm0%clang@=11.0.0
-      prefix: /usr/tce/packages/spectrum-mpi/spectrum-mpi-rolling-release-clang-11.0.0
-    - spec: spectrum-mpi@10.3.1.03rtm0%clang@=12.0.1
-      prefix: /usr/tce/packages/spectrum-mpi/spectrum-mpi-rolling-release-clang-12.0.1
-    - spec: spectrum-mpi@10.3.1.03rtm0%clang@=12.0.1.gcc.8.3.1
-      prefix: /usr/tce/packages/spectrum-mpi/spectrum-mpi-rolling-release-clang-12.0.1-gcc-8.3.1
-    - spec: spectrum-mpi@10.3.1.03rtm0%clang@=13.0.1
-      prefix: /usr/tce/packages/spectrum-mpi/spectrum-mpi-rolling-release-clang-13.0.1
-    - spec: spectrum-mpi@10.3.1.03rtm0%clang@=14.0.5
-      prefix: /usr/tce/packages/spectrum-mpi/spectrum-mpi-rolling-release-clang-14.0.5
-    - spec: spectrum-mpi@10.3.1.03rtm0%clang@=14.0.5.gcc.8.3.1
-      prefix: /usr/tce/packages/spectrum-mpi/spectrum-mpi-rolling-release-clang-14.0.5-gcc-8.3.1
-    - spec: spectrum-mpi@10.3.1.03rtm0%clang@=15.0.6
-      prefix: /usr/tce/packages/spectrum-mpi/spectrum-mpi-rolling-release-clang-15.0.6
-    - spec: spectrum-mpi@10.3.1.03rtm0%clang@=16.0.6
-      prefix: /usr/tce/packages/spectrum-mpi/spectrum-mpi-rolling-release-clang-16.0.6
-    - spec: spectrum-mpi@10.3.1.03rtm0%clang@=16.0.6.gcc.8.3.1
-      prefix: /usr/tce/packages/spectrum-mpi/spectrum-mpi-rolling-release-clang-16.0.6-gcc-8.3.1
-    - spec: spectrum-mpi@10.3.1.03rtm0%clang@=9.0.0.ibm
-      prefix: /usr/tce/packages/spectrum-mpi/spectrum-mpi-rolling-release-clang-ibm-2019.10.03
-    - spec: spectrum-mpi@10.3.1.03rtm0%clang@=10.0.1.ibm
-      prefix: /usr/tce/packages/spectrum-mpi/spectrum-mpi-rolling-release-clang-ibm-10.0.1
-    - spec: spectrum-mpi@10.3.1.03rtm0%clang@=11.0.0.ibm
-      prefix: /usr/tce/packages/spectrum-mpi/spectrum-mpi-rolling-release-clang-ibm-11.0.0
-    - spec: spectrum-mpi@10.3.1.03rtm0%clang@=12.0.1.ibm
-      prefix: /usr/tce/packages/spectrum-mpi/spectrum-mpi-rolling-release-clang-ibm-12.0.1
-    - spec: spectrum-mpi@10.3.1.03rtm0%clang@=12.0.1.ibm.gcc.8.3.1
-      prefix: /usr/tce/packages/spectrum-mpi/spectrum-mpi-rolling-release-clang-ibm-12.0.1-gcc-8.3.1
-    - spec: spectrum-mpi@10.3.1.03rtm0%clang@=13.0.1.ibm
-      prefix: /usr/tce/packages/spectrum-mpi/spectrum-mpi-rolling-release-clang-ibm-13.0.1
-    - spec: spectrum-mpi@10.3.1.03rtm0%clang@=14.0.5.ibm
-      prefix: /usr/tce/packages/spectrum-mpi/spectrum-mpi-rolling-release-clang-ibm-14.0.5
-    - spec: spectrum-mpi@10.3.1.03rtm0%clang@=14.0.5.ibm.gcc.8.3.1
-      prefix: /usr/tce/packages/spectrum-mpi/spectrum-mpi-rolling-release-clang-ibm-14.0.5-gcc-8.3.1
-    - spec: spectrum-mpi@10.3.1.03rtm0%clang@=15.0.6.ibm
-      prefix: /usr/tce/packages/spectrum-mpi/spectrum-mpi-rolling-release-clang-ibm-15.0.6
-    - spec: spectrum-mpi@10.3.1.03rtm0%clang@=16.0.6.ibm
-      prefix: /usr/tce/packages/spectrum-mpi/spectrum-mpi-rolling-release-clang-ibm-16.0.6
-    - spec: spectrum-mpi@10.3.1.03rtm0%clang@=16.0.6.ibm.gcc.8.3.1
-      prefix: /usr/tce/packages/spectrum-mpi/spectrum-mpi-rolling-release-clang-ibm-16.0.6-gcc-8.3.1
-    - spec: spectrum-mpi@10.3.1.03rtm0%xl@=16.1.1.10
-      prefix: /usr/tce/packages/spectrum-mpi/spectrum-mpi-rolling-release-xl-2021.09.22
-    - spec: spectrum-mpi@10.3.1.03rtm0%xl@=16.1.1.10.gcc.8.3.1
-      prefix: /usr/tce/packages/spectrum-mpi/spectrum-mpi-rolling-release-xl-2021.09.22-gcc-8.3.1
-    - spec: spectrum-mpi@10.3.1.03rtm0%xl@=16.1.1.11
-      prefix: /usr/tce/packages/spectrum-mpi/spectrum-mpi-rolling-release-xl-2021.12.22
-    - spec: spectrum-mpi@10.3.1.03rtm0%xl@=16.1.1.12
-      prefix: /usr/tce/packages/spectrum-mpi/spectrum-mpi-rolling-release-xl-2022.08.19
-    - spec: spectrum-mpi@10.3.1.03rtm0%xl@=16.1.1.12.gcc.8.3.1
-      prefix: /usr/tce/packages/spectrum-mpi/spectrum-mpi-rolling-release-xl-2022.08.19-gcc-8.3.1
-    - spec: spectrum-mpi@10.3.1.03rtm0%xl@=16.1.1.14
-      prefix: /usr/tce/packages/spectrum-mpi/spectrum-mpi-rolling-release-xl-2023.06.28
-    - spec: spectrum-mpi@10.3.1.03rtm0%xl@=16.1.1.14.gcc.8.3.1
-      prefix: /usr/tce/packages/spectrum-mpi/spectrum-mpi-rolling-release-xl-2023.06.28-gcc-8.3.1
-    - spec: spectrum-mpi@10.3.1.03rtm0%xl@=beta2019.06.20
-      prefix: /usr/tce/packages/spectrum-mpi/spectrum-mpi-rolling-release-xl-beta-2019.06.20
-  python:
-    buildable: false
-    version: [3.8.2]
-    externals:
-    - spec: python@3.8.2
-      prefix: /usr/tce/packages/python/python-3.8.2
-  elfutils:
-    buildable: false
-    version: [0.176]
-    externals:
-    - spec: elfutils@0.176
-      prefix: /usr
-  libunwind:
-    buildable: false
-    version: [8.0.1]
-    externals:
-    - spec: libunwind@8.0.1
-      prefix: /usr
-  papi:
-    buildable: false
-    version: [6.0.0.1]
-    externals:
-    - spec: papi@6.0.0.1
-      prefix: /usr/papi600
diff --git a/spack-environments/radiuss/corona/compilers.yaml b/spack-environments/radiuss/corona/compilers.yaml
new file mode 100644
index 0000000..4eee22c
--- /dev/null
+++ b/spack-environments/radiuss/corona/compilers.yaml
@@ -0,0 +1,311 @@
+compilers::
+- compiler:
+    spec: rocmcc@=5.0.2
+    paths:
+      cc: /opt/rocm-5.0.2/llvm/bin/amdclang
+      cxx: /opt/rocm-5.0.2/llvm/bin/amdclang++
+      f77: /opt/rocm-5.0.2/llvm/bin/amdflang
+      fc: /opt/rocm-5.0.2/llvm/bin/amdflang
+    flags: {}
+    operating_system: rhel8
+    target: x86_64
+    modules: []
+    environment: {}
+    extra_rpaths: []
+- compiler:
+    spec: rocmcc@=5.1.1
+    paths:
+      cc: /opt/rocm-5.1.1/llvm/bin/amdclang
+      cxx: /opt/rocm-5.1.1/llvm/bin/amdclang++
+      f77: /opt/rocm-5.1.1/llvm/bin/amdflang
+      fc: /opt/rocm-5.1.1/llvm/bin/amdflang
+    flags: {}
+    operating_system: rhel8
+    target: x86_64
+    modules: []
+    environment: {}
+    extra_rpaths: []
+- compiler:
+    spec: rocmcc@=5.2.3
+    paths:
+      cc: /opt/rocm-5.2.3/llvm/bin/amdclang
+      cxx: /opt/rocm-5.2.3/llvm/bin/amdclang++
+      f77: /opt/rocm-5.2.3/llvm/bin/amdflang
+      fc: /opt/rocm-5.2.3/llvm/bin/amdflang
+    flags: {}
+    operating_system: rhel8
+    target: x86_64
+    modules: []
+    environment: {}
+    extra_rpaths: []
+- compiler:
+    spec: rocmcc@=5.4.3
+    paths:
+      cc: /opt/rocm-5.4.3/llvm/bin/amdclang
+      cxx: /opt/rocm-5.4.3/llvm/bin/amdclang++
+      f77: /opt/rocm-5.4.3/llvm/bin/amdflang
+      fc: /opt/rocm-5.4.3/llvm/bin/amdflang
+    flags: {}
+    operating_system: rhel8
+    target: x86_64
+    modules: []
+    environment: {}
+    extra_rpaths: []
+- compiler:
+    spec: rocmcc@=5.5.0
+    paths:
+      cc: /opt/rocm-5.5.0/llvm/bin/amdclang
+      cxx: /opt/rocm-5.5.0/llvm/bin/amdclang++
+      f77: /opt/rocm-5.5.0/llvm/bin/amdflang
+      fc: /opt/rocm-5.5.0/llvm/bin/amdflang
+    flags: {}
+    operating_system: rhel8
+    target: x86_64
+    modules: []
+    environment: {}
+    extra_rpaths: []
+- compiler:
+    spec: rocmcc@=5.5.1
+    paths:
+      cc: /opt/rocm-5.5.1/llvm/bin/amdclang
+      cxx: /opt/rocm-5.5.1/llvm/bin/amdclang++
+      f77: /opt/rocm-5.5.1/llvm/bin/amdflang
+      fc: /opt/rocm-5.5.1/llvm/bin/amdflang
+    flags: {}
+    operating_system: rhel8
+    target: x86_64
+    modules: []
+    environment: {}
+    extra_rpaths: []
+- compiler:
+    spec: rocmcc@=5.6.1
+    paths:
+      cc: /opt/rocm-5.6.1/llvm/bin/amdclang
+      cxx: /opt/rocm-5.6.1/llvm/bin/amdclang++
+      f77: /opt/rocm-5.6.1/llvm/bin/amdflang
+      fc: /opt/rocm-5.6.1/llvm/bin/amdflang
+    flags: {}
+    operating_system: rhel8
+    target: x86_64
+    modules: []
+    environment: {}
+    extra_rpaths: []
+- compiler:
+    spec: rocmcc@=5.7.1
+    paths:
+      cc: /opt/rocm-5.7.1/llvm/bin/amdclang
+      cxx: /opt/rocm-5.7.1/llvm/bin/amdclang++
+      f77: /opt/rocm-5.7.1/llvm/bin/amdflang
+      fc: /opt/rocm-5.7.1/llvm/bin/amdflang
+    flags: {}
+    operating_system: rhel8
+    target: x86_64
+    modules: []
+    environment: {}
+    extra_rpaths: []
+- compiler:
+    spec: rocmcc@=6.0.2
+    paths:
+      cc: /opt/rocm-6.0.2/llvm/bin/amdclang
+      cxx: /opt/rocm-6.0.2/llvm/bin/amdclang++
+      f77: /opt/rocm-6.0.2/llvm/bin/amdflang
+      fc: /opt/rocm-6.0.2/llvm/bin/amdflang
+    flags: {}
+    operating_system: rhel8
+    target: x86_64
+    modules: []
+    environment: {}
+    extra_rpaths: []
+- compiler:
+    spec: intel@=2021.6.0
+    paths:
+      cc: /usr/tce/packages/intel-classic/intel-classic-2021.6.0/bin/icc
+      cxx: /usr/tce/packages/intel-classic/intel-classic-2021.6.0/bin/icpc
+      f77: /usr/tce/packages/intel-classic/intel-classic-2021.6.0/bin/ifort
+      fc: /usr/tce/packages/intel-classic/intel-classic-2021.6.0/bin/ifort
+    flags: {}
+    operating_system: rhel8
+    target: x86_64
+    modules: []
+    environment: {}
+    extra_rpaths: []
+- compiler:
+    spec: intel@=2021.6.0.gcc.10.3.1
+    paths:
+      cc: /usr/tce/packages/intel-classic/intel-classic-2021.6.0/bin/icc
+      cxx: /usr/tce/packages/intel-classic/intel-classic-2021.6.0/bin/icpc
+      f77: /usr/tce/packages/intel-classic/intel-classic-2021.6.0/bin/ifort
+      fc: /usr/tce/packages/intel-classic/intel-classic-2021.6.0/bin/ifort
+    flags:
+      cflags: -gcc-name=/usr/tce/packages/gcc/gcc-10.3.1/bin/gcc
+      cxxflags: -gxx-name=/usr/tce/packages/gcc/gcc-10.3.1/bin/g++
+      fflags: -gcc-name=/usr/tce/packages/gcc/gcc-10.3.1/bin/gcc
+    operating_system: rhel8
+    target: x86_64
+    modules: []
+    environment: {}
+    extra_rpaths: []
+- compiler:
+    spec: oneapi@=2022.1.0
+    paths:
+      cc: /usr/tce/packages/intel/intel-2022.1.0/compiler/2022.1.0/linux/bin/icx
+      cxx: /usr/tce/packages/intel/intel-2022.1.0/compiler/2022.1.0/linux/bin/icpx
+      f77: /usr/tce/packages/intel/intel-2022.1.0/compiler/2022.1.0/linux/bin/ifx
+      fc: /usr/tce/packages/intel/intel-2022.1.0/compiler/2022.1.0/linux/bin/ifx
+    flags: {}
+    operating_system: rhel8
+    target: x86_64
+    modules: []
+    environment: {}
+    extra_rpaths: []
+- compiler:
+    spec: oneapi@=2022.1.0.gcc.10.3.1
+    paths:
+      cc: /usr/tce/packages/intel/intel-2022.1.0/compiler/2022.1.0/linux/bin/icx
+      cxx: /usr/tce/packages/intel/intel-2022.1.0/compiler/2022.1.0/linux/bin/icpx
+      f77: /usr/tce/packages/intel/intel-2022.1.0/compiler/2022.1.0/linux/bin/ifx
+      fc: /usr/tce/packages/intel/intel-2022.1.0/compiler/2022.1.0/linux/bin/ifx
+    flags:
+      cflags: --gcc-toolchain=/usr/tce/packages/gcc/gcc-10.3.1
+      cxxflags: --gcc-toolchain=/usr/tce/packages/gcc/gcc-10.3.1
+      fflags: -gcc-name=/usr/tce/packages/gcc/gcc-10.3.1/bin/gcc
+    operating_system: rhel8
+    target: x86_64
+    modules: []
+    environment: {}
+    extra_rpaths: []
+- compiler:
+    spec: oneapi@=2023.2.1
+    paths:
+      cc: /usr/tce/packages/intel/intel-2023.2.1/compiler/2023.2.1/linux/bin/icx
+      cxx: /usr/tce/packages/intel/intel-2023.2.1/compiler/2023.2.1/linux/bin/icpx
+      f77: /usr/tce/packages/intel/intel-2023.2.1/compiler/2023.2.1/linux/bin/ifx
+      fc: /usr/tce/packages/intel/intel-2023.2.1/compiler/2023.2.1/linux/bin/ifx
+    flags: {}
+    operating_system: rhel8
+    target: x86_64
+    modules: []
+    environment: {}
+    extra_rpaths: []
+- compiler:
+    spec: oneapi@=2023.2.1.gcc.10.3.1
+    paths:
+      cc: /usr/tce/packages/intel/intel-2023.2.1/compiler/2023.2.1/linux/bin/icx
+      cxx: /usr/tce/packages/intel/intel-2023.2.1/compiler/2023.2.1/linux/bin/icpx
+      f77: /usr/tce/packages/intel/intel-2023.2.1/compiler/2023.2.1/linux/bin/ifx
+      fc: /usr/tce/packages/intel/intel-2023.2.1/compiler/2023.2.1/linux/bin/ifx
+    flags:
+      cflags: --gcc-toolchain=/usr/tce/packages/gcc/gcc-10.3.1
+      cxxflags: --gcc-toolchain=/usr/tce/packages/gcc/gcc-10.3.1
+      fflags: -gcc-name=/usr/tce/packages/gcc/gcc-10.3.1/bin/gcc
+    operating_system: rhel8
+    target: x86_64
+    modules: []
+    environment: {}
+    extra_rpaths: []
+- compiler:
+    spec: oneapi@=2024.2.1
+    paths:
+      cc: /collab/usr/global/tools/intel/toss_4_x86_64_ib/oneapi-2024.2.1/2024.2/bin/icx
+      cxx: /collab/usr/global/tools/intel/toss_4_x86_64_ib/oneapi-2024.2.1/2024.2/bin/icpx
+      f77: /collab/usr/global/tools/intel/toss_4_x86_64_ib/oneapi-2024.2.1/2024.2/bin/ifx
+      fc: /collab/usr/global/tools/intel/toss_4_x86_64_ib/oneapi-2024.2.1/2024.2/bin/ifx
+    flags: {}
+    operating_system: rhel8
+    target: x86_64
+    modules: []
+    environment: {}
+    extra_rpaths: []
+- compiler:
+    spec: clang@=14.0.6
+    paths:
+      cc: /usr/tce/packages/clang/clang-14.0.6/bin/clang
+      cxx: /usr/tce/packages/clang/clang-14.0.6/bin/clang++
+      f77: /usr/tce/packages/gcc/gcc-10.3.1/bin/gfortran
+      fc: /usr/tce/packages/gcc/gcc-10.3.1/bin/gfortran
+    flags: {}
+    operating_system: rhel8
+    target: x86_64
+    modules: []
+    environment: {}
+    extra_rpaths: []
+- compiler:
+    spec: clang@=14.0.6.gcc.10.3.1
+    paths:
+      cc: /usr/tce/packages/clang/clang-14.0.6/bin/clang
+      cxx: /usr/tce/packages/clang/clang-14.0.6/bin/clang++
+      f77: /usr/tce/packages/gcc/gcc-10.3.1/bin/gfortran
+      fc: /usr/tce/packages/gcc/gcc-10.3.1/bin/gfortran
+    flags:
+      cflags: --gcc-toolchain=/usr/tce/packages/gcc/gcc-10.3.1
+      cxxflags: --gcc-toolchain=/usr/tce/packages/gcc/gcc-10.3.1
+    operating_system: rhel8
+    target: x86_64
+    modules: []
+    environment: {}
+    extra_rpaths: []
+- compiler:
+    spec: clang@=19.0.0
+    paths:
+      cc: /usr/workspace/raja-dev/clang_sycl_2f03ef85fee5_hip_gcc10.3.1_rocm5.7.1/bin/clang
+      cxx: /usr/workspace/raja-dev/clang_sycl_2f03ef85fee5_hip_gcc10.3.1_rocm5.7.1/bin/clang++
+      f77: /usr/tce/packages/gcc/gcc-10.3.1/bin/gfortran
+      fc: /usr/tce/packages/gcc/gcc-10.3.1/bin/gfortran
+    flags: {}
+    operating_system: rhel8
+    target: x86_64
+    modules: []
+    environment: {}
+    extra_rpaths: [/usr/workspace/raja-dev/clang_sycl_2f03ef85fee5_hip_gcc10.3.1_rocm5.7.1/lib, /usr/workspace/raja-dev/clang_sycl_2f03ef85fee5_hip_gcc10.3.1_rocm5.7.1/lib64]
+- compiler:
+    spec: clang@=20.0.0
+    paths:
+      cc: /usr/workspace/raja-dev/clang_sycl_730cd3a5275f_hip_gcc10.3.1_rocm6.0.2/bin/clang
+      cxx: /usr/workspace/raja-dev/clang_sycl_730cd3a5275f_hip_gcc10.3.1_rocm6.0.2/bin/clang++
+      f77: /usr/tce/packages/gcc/gcc-10.3.1/bin/gfortran
+      fc: /usr/tce/packages/gcc/gcc-10.3.1/bin/gfortran
+    flags: {}
+    operating_system: rhel8
+    target: x86_64
+    modules: []
+    environment: {}
+    extra_rpaths: [/usr/workspace/raja-dev/clang_sycl_730cd3a5275f_hip_gcc10.3.1_rocm6.0.2/lib, /usr/workspace/raja-dev/clang_sycl_730cd3a5275f_hip_gcc10.3.1_rocm6.0.2/lib64]
+- compiler:
+    spec: gcc@=10.3.1
+    paths:
+      cc: /usr/tce/packages/gcc/gcc-10.3.1/bin/gcc
+      cxx: /usr/tce/packages/gcc/gcc-10.3.1/bin/g++
+      f77: /usr/tce/packages/gcc/gcc-10.3.1/bin/gfortran
+      fc: /usr/tce/packages/gcc/gcc-10.3.1/bin/gfortran
+    flags: {}
+    operating_system: rhel8
+    target: x86_64
+    modules: []
+    environment: {}
+    extra_rpaths: []
+- compiler:
+    spec: gcc@=11.2.1
+    paths:
+      cc: /usr/tce/packages/gcc/gcc-11.2.1/bin/gcc
+      cxx: /usr/tce/packages/gcc/gcc-11.2.1/bin/g++
+      f77: /usr/tce/packages/gcc/gcc-11.2.1/bin/gfortran
+      fc: /usr/tce/packages/gcc/gcc-11.2.1/bin/gfortran
+    flags: {}
+    operating_system: rhel8
+    target: x86_64
+    modules: []
+    environment: {}
+    extra_rpaths: []
+- compiler:
+    spec: gcc@=12.1.1
+    paths:
+      cc: /usr/tce/packages/gcc/gcc-12.1.1/bin/gcc
+      cxx: /usr/tce/packages/gcc/gcc-12.1.1/bin/g++
+      f77: /usr/tce/packages/gcc/gcc-12.1.1/bin/gfortran
+      fc: /usr/tce/packages/gcc/gcc-12.1.1/bin/gfortran
+    flags: {}
+    operating_system: rhel8
+    target: x86_64
+    modules: []
+    environment: {}
+    extra_rpaths: []
diff --git a/spack-environments/radiuss/blueos_3_ppc64le_ib_p9/config.yaml b/spack-environments/radiuss/corona/config.yaml
similarity index 53%
rename from spack-environments/radiuss/blueos_3_ppc64le_ib_p9/config.yaml
rename to spack-environments/radiuss/corona/config.yaml
index 60bcc77..874ad98 100644
--- a/spack-environments/radiuss/blueos_3_ppc64le_ib_p9/config.yaml
+++ b/spack-environments/radiuss/corona/config.yaml
@@ -1,3 +1,2 @@
 config:
   build_jobs: 32
-  concretizer: clingo
diff --git a/spack-environments/radiuss/corona/packages.yaml b/spack-environments/radiuss/corona/packages.yaml
new file mode 100644
index 0000000..4953c3e
--- /dev/null
+++ b/spack-environments/radiuss/corona/packages.yaml
@@ -0,0 +1,424 @@
+packages::
+  all:
+    require: target=zen
+    compiler: [gcc, intel, clang, rocmcc, oneapi]
+    providers:
+      blas: [openblas]
+      lapack: [netlib-lapack]
+      mpi: [mvapich2]
+  cmake:
+    version: [3.23.1, 3.22.4, 3.21.1, 3.19.2, 3.14.5]
+    buildable: false
+    externals:
+    - spec: cmake@3.14.5
+      prefix: /usr/tce/packages/cmake/cmake-3.14.5
+    - spec: cmake@3.19.2
+      prefix: /usr/tce/packages/cmake/cmake-3.19.2
+    - spec: cmake@3.21.1
+      prefix: /usr/tce/packages/cmake/cmake-3.21.1
+    - spec: cmake@3.22.4
+      prefix: /usr/tce/packages/cmake/cmake-3.22.4
+    - spec: cmake@3.23.1
+      prefix: /usr/tce/packages/cmake/cmake-3.23.1
+  cuda:
+    version: [11.8.0, 10.1.168]
+    buildable: false
+    externals:
+    - spec: cuda@10.1.168
+      prefix: /usr/tce/packages/cuda/cuda-10.1.168
+    - spec: cuda@11.8.0
+      prefix: /usr/tce/packages/cuda/cuda-11.8.0
+  hip:
+    version: [5.0.2, 5.1.1, 5.2.3, 5.4.3, 5.5.0, 5.5.1, 5.6.1, 5.7.1, 6.0.2]
+    buildable: false
+    externals:
+    - spec: hip@5.0.2%rocmcc@5.0.2
+      prefix: /opt/rocm-5.0.2/hip
+    - spec: hip@5.1.1%rocmcc@5.1.1
+      prefix: /opt/rocm-5.1.1/hip
+    - spec: hip@5.2.3%rocmcc@5.2.3
+      prefix: /opt/rocm-5.2.3/hip
+    - spec: hip@5.4.3%rocmcc@5.4.3
+      prefix: /opt/rocm-5.4.3/hip
+    - spec: hip@5.5.0%rocmcc@5.5.0
+      prefix: /opt/rocm-5.5.0/hip
+    - spec: hip@5.5.1%rocmcc@5.5.1
+      prefix: /opt/rocm-5.5.1/hip
+    - spec: hip@5.6.1%rocmcc@5.6.1
+      prefix: /opt/rocm-5.6.1/hip
+    - spec: hip@5.7.1%rocmcc@5.7.1
+      prefix: /opt/rocm-5.7.1/hip
+    - spec: hip@6.0.2%rocmcc@6.0.2
+      prefix: /opt/rocm-6.0.2
+  hipsparse:
+    version: [5.0.2, 5.1.1, 5.2.3, 5.4.3, 5.5.0, 5.5.1, 5.6.1, 5.7.1, 6.0.2]
+    buildable: false
+    externals:
+    - spec: hipsparse@5.0.2%rocmcc@5.0.2
+      prefix: /opt/rocm-5.0.2
+    - spec: hipsparse@5.1.1%rocmcc@5.1.1
+      prefix: /opt/rocm-5.1.1
+    - spec: hipsparse@5.2.3%rocmcc@5.2.3
+      prefix: /opt/rocm-5.2.3
+    - spec: hipsparse@5.4.3%rocmcc@5.4.3
+      prefix: /opt/rocm-5.4.3
+    - spec: hipsparse@5.5.0%rocmcc@5.5.0
+      prefix: /opt/rocm-5.5.0
+    - spec: hipsparse@5.5.1%rocmcc@5.5.1
+      prefix: /opt/rocm-5.5.1
+    - spec: hipsparse@5.6.1%rocmcc@5.6.1
+      prefix: /opt/rocm-5.6.1
+    - spec: hipsparse@5.7.1%rocmcc@5.7.1
+      prefix: /opt/rocm-5.7.1
+    - spec: hipsparse@6.0.2%rocmcc@6.0.2
+      prefix: /opt/rocm-6.0.2
+  llvm-amdgpu:
+    version: [5.0.2, 5.1.1, 5.2.3, 5.4.3, 5.5.0, 5.5.1, 5.6.1, 5.7.1, 6.0.2]
+    buildable: false
+    externals:
+    - spec: llvm-amdgpu@5.0.2%rocmcc@5.0.2
+      prefix: /opt/rocm-5.0.2/llvm
+    - spec: llvm-amdgpu@5.1.1%rocmcc@5.1.1
+      prefix: /opt/rocm-5.1.1/llvm
+    - spec: llvm-amdgpu@5.2.3%rocmcc@5.2.3
+      prefix: /opt/rocm-5.2.3/llvm
+    - spec: llvm-amdgpu@5.4.3%rocmcc@5.4.3
+      prefix: /opt/rocm-5.4.3/llvm
+    - spec: llvm-amdgpu@5.5.0%rocmcc@5.5.0
+      prefix: /opt/rocm-5.5.0/llvm
+    - spec: llvm-amdgpu@5.5.1%rocmcc@5.5.1
+      prefix: /opt/rocm-5.5.1/llvm
+    - spec: llvm-amdgpu@5.6.1%rocmcc@5.6.1
+      prefix: /opt/rocm-5.6.1/llvm
+    - spec: llvm-amdgpu@5.7.1%rocmcc@5.7.1
+      prefix: /opt/rocm-5.7.1/llvm
+    - spec: llvm-amdgpu@6.0.2%rocmcc@6.0.2
+      prefix: /opt/rocm-6.0.2/llvm
+  hsa-rocr-dev:
+    version: [5.0.2, 5.1.1, 5.2.3, 5.4.3, 5.5.0, 5.5.1, 5.6.1, 5.7.1, 6.0.2]
+    buildable: false
+    externals:
+    - spec: hsa-rocr-dev@5.0.2%rocmcc@5.0.2
+      prefix: /opt/rocm-5.0.2
+    - spec: hsa-rocr-dev@5.1.1%rocmcc@5.1.1
+      prefix: /opt/rocm-5.1.1
+    - spec: hsa-rocr-dev@5.2.3%rocmcc@5.2.3
+      prefix: /opt/rocm-5.2.3
+    - spec: hsa-rocr-dev@5.4.3%rocmcc@5.4.3
+      prefix: /opt/rocm-5.4.3
+    - spec: hsa-rocr-dev@5.5.0%rocmcc@5.5.0
+      prefix: /opt/rocm-5.5.0
+    - spec: hsa-rocr-dev@5.5.1%rocmcc@5.5.1
+      prefix: /opt/rocm-5.5.1
+    - spec: hsa-rocr-dev@5.6.1%rocmcc@5.6.1
+      prefix: /opt/rocm-5.6.1
+    - spec: hsa-rocr-dev@5.7.1%rocmcc@5.7.1
+      prefix: /opt/rocm-5.7.1
+    - spec: hsa-rocr-dev@6.0.2%rocmcc@6.0.2
+      prefix: /opt/rocm-6.0.2
+  rocminfo:
+    version: [5.0.2, 5.1.1, 5.2.3, 5.4.3, 5.5.0, 5.5.1, 5.6.1, 5.7.1, 6.0.2]
+    buildable: false
+    externals:
+    - spec: rocminfo@5.0.2%rocmcc@5.0.2
+      prefix: /opt/rocm-5.0.2
+    - spec: rocminfo@5.1.1%rocmcc@5.1.1
+      prefix: /opt/rocm-5.1.1
+    - spec: rocminfo@5.2.3%rocmcc@5.2.3
+      prefix: /opt/rocm-5.2.3
+    - spec: rocminfo@5.4.3%rocmcc@5.4.3
+      prefix: /opt/rocm-5.4.3
+    - spec: rocminfo@5.5.0%rocmcc@5.5.0
+      prefix: /opt/rocm-5.5.0
+    - spec: rocminfo@5.5.1%rocmcc@5.5.1
+      prefix: /opt/rocm-5.5.1
+    - spec: rocminfo@5.6.1%rocmcc@5.6.1
+      prefix: /opt/rocm-5.6.1
+    - spec: rocminfo@5.7.1%rocmcc@5.7.1
+      prefix: /opt/rocm-5.7.1
+    - spec: rocminfo@6.0.2%rocmcc@6.0.2
+      prefix: /opt/rocm-6.0.2
+  rocm-device-libs:
+    version: [5.0.2, 5.1.1, 5.2.3, 5.4.3, 5.5.0, 5.5.1, 5.6.1, 5.7.1, 6.0.2]
+    buildable: false
+    externals:
+    - spec: rocm-device-libs@5.0.2%rocmcc@5.0.2
+      prefix: /opt/rocm-5.0.2/
+    - spec: rocm-device-libs@5.1.1%rocmcc@5.1.1
+      prefix: /opt/rocm-5.1.1/
+    - spec: rocm-device-libs@5.2.3%rocmcc@5.2.3
+      prefix: /opt/rocm-5.2.3/
+    - spec: rocm-device-libs@5.4.3%rocmcc@5.4.3
+      prefix: /opt/rocm-5.4.3/
+    - spec: rocm-device-libs@5.5.0%rocmcc@5.5.0
+      prefix: /opt/rocm-5.5.0/
+    - spec: rocm-device-libs@5.5.1%rocmcc@5.5.1
+      prefix: /opt/rocm-5.5.1/
+    - spec: rocm-device-libs@5.6.1%rocmcc@5.6.1
+      prefix: /opt/rocm-5.6.1/
+    - spec: rocm-device-libs@5.7.1%rocmcc@5.7.1
+      prefix: /opt/rocm-5.7.1/
+    - spec: rocm-device-libs@6.0.2%rocmcc@6.0.2
+      prefix: /opt/rocm-6.0.2/
+  rocprim:
+    version: [5.1.1, 5.2.3, 5.4.3, 5.5.0, 5.5.1, 5.6.1, 5.7.1, 6.0.2]
+    buildable: false
+    externals:
+    - spec: rocprim@5.1.1%rocmcc@5.1.1
+      prefix: /opt/rocm-5.1.1/
+    - spec: rocprim@5.2.3%rocmcc@5.2.3
+      prefix: /opt/rocm-5.2.3/
+    - spec: rocprim@5.4.3%rocmcc@5.4.3
+      prefix: /opt/rocm-5.4.3/
+    - spec: rocprim@5.5.0%rocmcc@5.5.0
+      prefix: /opt/rocm-5.5.0/
+    - spec: rocprim@5.5.1%rocmcc@5.5.1
+      prefix: /opt/rocm-5.5.1/
+    - spec: rocprim@5.6.1%rocmcc@5.6.1
+      prefix: /opt/rocm-5.6.1/
+    - spec: rocprim@5.7.1%rocmcc@5.7.1
+      prefix: /opt/rocm-5.7.1/
+    - spec: rocprim@6.0.2%rocmcc@6.0.2
+      prefix: /opt/rocm-6.0.2/
+  mvapich2:
+    buildable: false
+    externals:
+    - spec: mvapich2@2.3.7%intel@=19.1.2 ~cuda~debug~regcache~wrapperrpath ch3_rank_bits=32
+        file_systems=lustre,nfs,ufs process_managers=slurm
+      prefix: /usr/tce/packages/mvapich2/mvapich2-2.3.7-intel-classic-19.1.2
+    - spec: mvapich2@2.3.7%intel@=19.1.2.gcc.10.3.1 ~cuda~debug~regcache~wrapperrpath ch3_rank_bits=32
+        file_systems=lustre,nfs,ufs process_managers=slurm
+      prefix: /usr/tce/packages/mvapich2/mvapich2-2.3.7-intel-classic-19.1.2
+    - spec: mvapich2@2.3.7%intel@=2021.6.0 ~cuda~debug~regcache~wrapperrpath ch3_rank_bits=32
+        file_systems=lustre,nfs,ufs process_managers=slurm
+      prefix: /usr/tce/packages/mvapich2/mvapich2-2.3.7-intel-classic-2021.6.0
+    - spec: mvapich2@2.3.7%intel@=2021.6.0.gcc.10.3.1 ~cuda~debug~regcache~wrapperrpath ch3_rank_bits=32
+        file_systems=lustre,nfs,ufs process_managers=slurm
+      prefix: /usr/tce/packages/mvapich2/mvapich2-2.3.7-intel-classic-2021.6.0
+    - spec: mvapich2@2.3.7%oneapi@=2022.1.0 ~cuda~debug~regcache~wrapperrpath ch3_rank_bits=32
+        file_systems=lustre,nfs,ufs process_managers=slurm
+      prefix: /usr/tce/packages/mvapich2/mvapich2-2.3.7-intel-2022.1.0
+    - spec: mvapich2@2.3.7%oneapi@=2022.1.0.gcc.10.3.1 ~cuda~debug~regcache~wrapperrpath ch3_rank_bits=32
+        file_systems=lustre,nfs,ufs process_managers=slurm
+      prefix: /usr/tce/packages/mvapich2/mvapich2-2.3.7-intel-2022.1.0
+    - spec: mvapich2@2.3.7%oneapi@=2023.2.1 ~cuda~debug~regcache~wrapperrpath ch3_rank_bits=32
+        file_systems=lustre,nfs,ufs process_managers=slurm
+      prefix: /usr/tce/packages/mvapich2/mvapich2-2.3.7-intel-2023.2.1
+    - spec: mvapich2@2.3.7%oneapi@=2023.2.1.gcc.10.3.1 ~cuda~debug~regcache~wrapperrpath ch3_rank_bits=32
+        file_systems=lustre,nfs,ufs process_managers=slurm
+      prefix: /usr/tce/packages/mvapich2/mvapich2-2.3.7-intel-2023.2.1
+    - spec: mvapich2@2.3.7%clang@=14.0.6 ~cuda~debug~regcache~wrapperrpath ch3_rank_bits=32
+        file_systems=lustre,nfs,ufs process_managers=slurm
+      prefix: /usr/tce/packages/mvapich2/mvapich2-2.3.7-clang-14.0.6
+    - spec: mvapich2@2.3.7%clang@=14.0.6.gcc.10.3.1 ~cuda~debug~regcache~wrapperrpath ch3_rank_bits=32
+        file_systems=lustre,nfs,ufs process_managers=slurm
+      prefix: /usr/tce/packages/mvapich2/mvapich2-2.3.7-clang-14.0.6
+    - spec: mvapich2@2.3.7%gcc@=10.3.1 ~cuda~debug~regcache~wrapperrpath ch3_rank_bits=32
+        file_systems=lustre,nfs,ufs process_managers=slurm
+      prefix: /usr/tce/packages/mvapich2/mvapich2-2.3.7-gcc-10.3.1
+    - spec: mvapich2@2.3.7%gcc@=11.2.1 ~cuda~debug~regcache~wrapperrpath ch3_rank_bits=32
+        file_systems=lustre,nfs,ufs process_managers=slurm
+      prefix: /usr/tce/packages/mvapich2/mvapich2-2.3.7-gcc-11.2.1
+    - spec: mvapich2@2.3.7%gcc@=12.1.1 ~cuda~debug~regcache~wrapperrpath ch3_rank_bits=32
+        file_systems=lustre,nfs,ufs process_managers=slurm
+      prefix: /usr/tce/packages/mvapich2/mvapich2-2.3.7-gcc-12.1.1
+
+  autoconf:
+    buildable: false
+    externals:
+    - spec: autoconf@2.69
+      prefix: /usr
+  automake:
+    buildable: false
+    externals:
+    - spec: automake@1.16.1
+      prefix: /usr
+  binutils:
+    buildable: false
+    externals:
+    - spec: binutils@2.30
+      prefix: /usr
+  bison:
+    buildable: false
+    externals:
+    - spec: bison@3.0.4
+      prefix: /usr
+  bzip2:
+    buildable: false
+    externals:
+    - spec: bzip2@1.0.6
+      prefix: /usr
+  curl:
+    buildable: false
+    externals:
+    - spec: curl@7.61.1
+      prefix: /usr
+  diffutils:
+    buildable: false
+    externals:
+    - spec: diffutils@3.6
+      prefix: /usr
+  elfutils:
+    buildable: false
+    externals:
+    - spec: elfutils@0.190
+      prefix: /usr
+  expat:
+    buildable: false
+    externals:
+    - spec: expat@2.2.5
+      prefix: /usr
+  flex:
+    buildable: false
+    externals:
+    - spec: flex@2.6.1
+      prefix: /usr
+  findutils:
+    buildable: false
+    externals:
+    - spec: findutils@4.6.0
+      prefix: /usr
+  gettext:
+    buildable: false
+    externals:
+    - spec: gettext@0.19.8.1
+      prefix: /usr
+  ghostscript:
+    buildable: false
+    externals:
+    - spec: ghostscript@9.27
+      prefix: /usr
+  gmake:
+    buildable: false
+    externals:
+    - spec: gmake@4.2.1
+      prefix: /usr
+  graphviz:
+    buildable: false
+    externals:
+    - spec: graphviz@2.40.1
+      prefix: /usr
+  groff:
+    buildable: false
+    externals:
+    - spec: groff@1.22.3
+      prefix: /usr
+  hwloc:
+    buildable: false
+    externals:
+    - spec: hwloc@2.11.1
+      prefix: /usr
+  libepoxy:
+    buildable: false
+    externals:
+    - spec: libepoxy@1.5.8
+      prefix: /usr
+  libtool:
+    buildable: false
+    externals:
+    - spec: libtool@2.4.6
+      prefix: /usr
+# NOTE: removed since fails on clang builds
+# libunwind:
+#   buildable: false
+#   externals:
+#   - spec: libunwind@1.3.1
+#     prefix: /usr
+  libunwind:
+    buildable: false
+    version: [8.0.1]
+    externals:
+    - spec: libunwind@8.0.1
+      prefix: /usr
+  libx11:
+    buildable: false
+    externals:
+    - spec: libx11@1.6.8
+      prefix: /usr
+  lua:
+    buildable: false
+    externals:
+    - spec: lua@5.3.4
+      prefix: /usr
+  m4:
+    buildable: false
+    externals:
+    - spec: m4@1.4.18
+      prefix: /usr
+  netlib-lapack:
+    buildable: false
+    externals:
+    - spec: netlib-lapack@3.8.0
+      prefix: /usr
+  ninja:
+    buildable: false
+    externals:
+    - spec: ninja@1.11.1
+      prefix: /usr/tce/packages/ninja/ninja-1.11.1
+  openblas:
+    buildable: false
+    externals:
+    - prefix: /usr
+      spec: openblas@0.3.15
+  opengl:
+    buildable: false
+    externals:
+    - spec: opengl@1.7.0
+      prefix: /usr
+  openglu:
+    buildable: false
+    externals:
+    - spec: openglu@1.3.1
+      prefix: /usr
+  openssl:
+    buildable: false
+    externals:
+    - spec: openssl@1.1.1k
+      prefix: /usr
+  papi:
+    buildable: false
+    version: [6.0.0.1]
+    externals:
+    - spec: papi@6.0.0.1
+      prefix: /usr/tce/packages/papi/papi-6.0.0.1
+  perl:
+    buildable: false
+    externals:
+    - spec: perl@5.26.3
+      prefix: /usr
+  pkg-config:
+    buildable: false
+    externals:
+    - spec: pkg-config@1.4.2
+      prefix: /usr
+  python:
+    buildable: false
+    version: [3.10.8]
+    externals:
+    - spec: python@3.10.8
+      prefix: /usr/tce/packages/python/python-3.10.8
+  readline:
+    buildable: false
+    externals:
+    - spec: readline@7.0
+      prefix: /usr
+  swig:
+    buildable: false
+    externals:
+    - spec: swig@3.0.12
+      prefix: /usr
+  tar:
+    buildable: false
+    externals:
+    - spec: tar@1.30
+      prefix: /usr
+  unzip:
+    buildable: false
+    externals:
+    - spec: unzip@6.0
+      prefix: /usr
+  zlib:
+    buildable: false
+    externals:
+    - spec: zlib@1.2.11
+      prefix: /usr
diff --git a/spack-environments/radiuss/blueos_3_ppc64le_ib_p9/compilers.yaml b/spack-environments/radiuss/lassen/compilers.yaml
similarity index 91%
rename from spack-environments/radiuss/blueos_3_ppc64le_ib_p9/compilers.yaml
rename to spack-environments/radiuss/lassen/compilers.yaml
index d53d12e..991d486 100644
--- a/spack-environments/radiuss/blueos_3_ppc64le_ib_p9/compilers.yaml
+++ b/spack-environments/radiuss/lassen/compilers.yaml
@@ -1,30 +1,4 @@
-compilers:
-- compiler:
-    spec: clang@=3.9.1
-    paths:
-      cc: /usr/tcetmp/packages/clang/clang-3.9.1/bin/clang
-      cxx: /usr/tcetmp/packages/clang/clang-3.9.1/bin/clang++
-      fc: /usr/tce/packages/xl/xl-beta-2019.06.20/bin/xlf2003_r
-      f77: /usr/tce/packages/xl/xl-beta-2019.06.20/bin/xlf_r
-    flags: {}
-    operating_system: rhel7
-    target: ppc64le
-    modules: []
-    environment: {}
-    extra_rpaths: []
-- compiler:
-    spec: clang@=4.0.0
-    paths:
-      cc: /usr/tcetmp/packages/clang/clang-4.0.0/bin/clang
-      cxx: /usr/tcetmp/packages/clang/clang-4.0.0/bin/clang++
-      fc: /usr/tce/packages/xl/xl-beta-2019.06.20/bin/xlf2003_r
-      f77: /usr/tce/packages/xl/xl-beta-2019.06.20/bin/xlf_r
-    flags: {}
-    operating_system: rhel7
-    target: ppc64le
-    modules: []
-    environment: {}
-    extra_rpaths: []
+compilers::
 - compiler:
     spec: clang@=9.0.0
     paths:
@@ -168,6 +142,19 @@ compilers:
     modules: []
     environment: {}
     extra_rpaths: []
+- compiler:
+    spec: clang@=16.0.6.cuda.11.8.0.gcc.11.2.1
+    paths:
+      cc: /usr/tce/packages/clang/clang-16.0.6-cuda-11.8.0-gcc-11.2.1/bin/clang
+      cxx: /usr/tce/packages/clang/clang-16.0.6-cuda-11.8.0-gcc-11.2.1/bin/clang++
+      fc: /usr/tce/packages/xl/xl-2023.06.28-cuda-11.8.0-gcc-11.2.1/bin/xlf2003_r
+      f77: /usr/tce/packages/xl/xl-2023.06.28-cuda-11.8.0-gcc-11.2.1/bin/xlf_r
+    flags: {}
+    operating_system: rhel7
+    target: ppc64le
+    modules: []
+    environment: {}
+    extra_rpaths: []
 - compiler:
     spec: clang@=9.0.0.ibm
     paths:
@@ -311,6 +298,19 @@ compilers:
     modules: []
     environment: {}
     extra_rpaths: []
+- compiler:
+    spec: clang@=16.0.6.ibm.cuda.11.8.0.gcc.11.2.1
+    paths:
+      cc: /usr/tce/packages/clang/clang-ibm-16.0.6-cuda-11.8.0-gcc-11.2.1/bin/clang
+      cxx: /usr/tce/packages/clang/clang-ibm-16.0.6-cuda-11.8.0-gcc-11.2.1/bin/clang++
+      fc: /usr/tce/packages/xl/xl-2023.06.28-cuda-11.8.0-gcc-11.2.1//bin/xlf2003_r
+      f77: /usr/tce/packages/xl/xl-2023.06.28-cuda-11.8.0-gcc-11.2.1//bin/xlf_r
+    flags: {}
+    operating_system: rhel7
+    target: ppc64le
+    modules: []
+    environment: {}
+    extra_rpaths: []
 - compiler:
     spec: clang@=coral2018.08.08
     paths:
@@ -376,6 +376,19 @@ compilers:
     modules: []
     environment: {}
     extra_rpaths: []
+- compiler:
+    spec: gcc@=11.2.1
+    paths:
+      cc: /usr/tce/packages/gcc/gcc-11.2.1/bin/gcc
+      cxx: /usr/tce/packages/gcc/gcc-11.2.1/bin/g++
+      f77: /usr/tce/packages/gcc/gcc-11.2.1/bin/gfortran
+      fc: /usr/tce/packages/gcc/gcc-11.2.1/bin/gfortran
+    flags: {}
+    operating_system: rhel7
+    target: ppc64le
+    modules: []
+    environment: {}
+    extra_rpaths: []
 - compiler:
     spec: xl@=default
     paths:
@@ -480,6 +493,19 @@ compilers:
     modules: []
     environment: {}
     extra_rpaths: []
+- compiler:
+    spec: xl@=16.1.1.14.cuda.11.8.0.gcc.11.2.1
+    paths:
+      cc: /usr/tce/packages/xl/xl-2023.06.28-cuda-11.8.0-gcc-11.2.1/bin/xlc_r
+      cxx: /usr/tce/packages/xl/xl-2023.06.28-cuda-11.8.0-gcc-11.2.1/bin/xlC_r
+      fc: /usr/tce/packages/xl/xl-2023.06.28-cuda-11.8.0-gcc-11.2.1/bin/xlf2003_r
+      f77: /usr/tce/packages/xl/xl-2023.06.28-cuda-11.8.0-gcc-11.2.1/bin/xlf_r
+    flags: {}
+    operating_system: rhel7
+    target: ppc64le
+    modules: []
+    environment: {}
+    extra_rpaths: []
 - compiler:
     spec: pgi@=default
     paths:
diff --git a/spack-environments/radiuss/lassen/config.yaml b/spack-environments/radiuss/lassen/config.yaml
new file mode 100644
index 0000000..874ad98
--- /dev/null
+++ b/spack-environments/radiuss/lassen/config.yaml
@@ -0,0 +1,2 @@
+config:
+  build_jobs: 32
diff --git a/spack-environments/radiuss/lassen/packages.yaml b/spack-environments/radiuss/lassen/packages.yaml
new file mode 100644
index 0000000..bcd58cb
--- /dev/null
+++ b/spack-environments/radiuss/lassen/packages.yaml
@@ -0,0 +1,382 @@
+packages::
+  all:
+    require: target=power9le
+    compiler: [gcc, pgi, clang, xl]
+    providers:
+      blas: [netlib-lapack]
+      lapack: [netlib-lapack]
+      mpi: [spectrum-mpi]
+      zlib-api: [zlib]
+  cmake:
+    version: [3.23.1, 3.22.4, 3.21.1, 3.20.2, 3.18.0, 3.16.8, 3.14.5]
+    buildable: false
+    externals:
+    - spec: cmake@3.14.5
+      prefix: /usr/tce/packages/cmake/cmake-3.14.5
+    - spec: cmake@3.16.8
+      prefix: /usr/tce/packages/cmake/cmake-3.16.8
+    - spec: cmake@3.18.0
+      prefix: /usr/tce/packages/cmake/cmake-3.18.0
+    - spec: cmake@3.20.2
+      prefix: /usr/tce/packages/cmake/cmake-3.20.2
+    - spec: cmake@3.21.1
+      prefix: /usr/tce/packages/cmake/cmake-3.21.1
+    - spec: cmake@3.22.4
+      prefix: /usr/tce/packages/cmake/cmake-3.22.4
+    - spec: cmake@3.23.1
+      prefix: /usr/tce/packages/cmake/cmake-3.23.1
+  cuda:
+    version: [12.0.0, 11.8.0, 11.7.0, 11.5.0, 11.2.0, 11.1.0, 11.0.2, 10.2.89, 10.1.243, 10.1.168, 9.2.148, 8.0]
+    buildable: false
+    externals:
+    - spec: cuda@12.0.0+allow-unsupported-compilers
+      prefix: /usr/tce/packages/cuda/cuda-12.0.0
+    - spec: cuda@11.8.0+allow-unsupported-compilers
+      prefix: /usr/tce/packages/cuda/cuda-11.8.0
+    - spec: cuda@11.7.0+allow-unsupported-compilers
+      prefix: /usr/tce/packages/cuda/cuda-11.7.0
+    - spec: cuda@11.5.0+allow-unsupported-compilers
+      prefix: /usr/tce/packages/cuda/cuda-11.5.0
+    - spec: cuda@11.2.0+allow-unsupported-compilers
+      prefix: /usr/tce/packages/cuda/cuda-11.2.0
+    - spec: cuda@11.1.0+allow-unsupported-compilers
+      prefix: /usr/tce/packages/cuda/cuda-11.1.0
+    - spec: cuda@11.0.2+allow-unsupported-compilers
+      prefix: /usr/tce/packages/cuda/cuda-11.0.2
+    - spec: cuda@10.2.89+allow-unsupported-compilers
+      prefix: /usr/tce/packages/cuda/cuda-10.2.89
+    - spec: cuda@10.1.243+allow-unsupported-compilers
+      prefix: /usr/tce/packages/cuda/cuda-10.1.243
+    - spec: cuda@10.1.168+allow-unsupported-compilers
+      prefix: /usr/tce/packages/cuda/cuda-10.1.168
+    - spec: cuda@9.2.148+allow-unsupported-compilers
+      prefix: /usr/tce/packages/cuda/cuda-9.2.148
+    - spec: cuda@8.0+allow-unsupported-compilers
+      prefix: /usr/tce/packages/cuda/cuda-8.0
+  spectrum-mpi:
+    buildable: false
+    externals:
+    - spec: spectrum-mpi@10.3.1.03rtm0%clang@=9.0.0
+      prefix: /usr/tce/packages/spectrum-mpi/spectrum-mpi-rolling-release-clang-9.0.0
+    - spec: spectrum-mpi@10.3.1.03rtm0%clang@=10.0.1
+      prefix: /usr/tce/packages/spectrum-mpi/spectrum-mpi-rolling-release-clang-10.0.1
+    - spec: spectrum-mpi@10.3.1.03rtm0%clang@=11.0.0
+      prefix: /usr/tce/packages/spectrum-mpi/spectrum-mpi-rolling-release-clang-11.0.0
+    - spec: spectrum-mpi@10.3.1.03rtm0%clang@=12.0.1
+      prefix: /usr/tce/packages/spectrum-mpi/spectrum-mpi-rolling-release-clang-12.0.1
+    - spec: spectrum-mpi@10.3.1.03rtm0%clang@=12.0.1.gcc.8.3.1
+      prefix: /usr/tce/packages/spectrum-mpi/spectrum-mpi-rolling-release-clang-12.0.1-gcc-8.3.1
+    - spec: spectrum-mpi@10.3.1.03rtm0%clang@=13.0.1
+      prefix: /usr/tce/packages/spectrum-mpi/spectrum-mpi-rolling-release-clang-13.0.1
+    - spec: spectrum-mpi@10.3.1.03rtm0%clang@=14.0.5
+      prefix: /usr/tce/packages/spectrum-mpi/spectrum-mpi-rolling-release-clang-14.0.5
+    - spec: spectrum-mpi@10.3.1.03rtm0%clang@=14.0.5.gcc.8.3.1
+      prefix: /usr/tce/packages/spectrum-mpi/spectrum-mpi-rolling-release-clang-14.0.5-gcc-8.3.1
+    - spec: spectrum-mpi@10.3.1.03rtm0%clang@=15.0.6
+      prefix: /usr/tce/packages/spectrum-mpi/spectrum-mpi-rolling-release-clang-15.0.6
+    - spec: spectrum-mpi@10.3.1.03rtm0%clang@=16.0.6
+      prefix: /usr/tce/packages/spectrum-mpi/spectrum-mpi-rolling-release-clang-16.0.6
+    - spec: spectrum-mpi@10.3.1.03rtm0%clang@=16.0.6.gcc.8.3.1
+      prefix: /usr/tce/packages/spectrum-mpi/spectrum-mpi-rolling-release-clang-16.0.6-gcc-8.3.1
+    - spec: spectrum-mpi@10.3.1.03rtm0%clang@=16.0.6.cuda.11.8.0.gcc.11.2.1
+      prefix: /usr/tce/packages/spectrum-mpi/spectrum-mpi-rolling-release-clang-16.0.6-cuda-11.8.0-gcc-11.2.1
+    - spec: spectrum-mpi@10.3.1.03rtm0%clang@=9.0.0.ibm
+      prefix: /usr/tce/packages/spectrum-mpi/spectrum-mpi-rolling-release-clang-ibm-2019.10.03
+    - spec: spectrum-mpi@10.3.1.03rtm0%clang@=10.0.1.ibm
+      prefix: /usr/tce/packages/spectrum-mpi/spectrum-mpi-rolling-release-clang-ibm-10.0.1
+    - spec: spectrum-mpi@10.3.1.03rtm0%clang@=11.0.0.ibm
+      prefix: /usr/tce/packages/spectrum-mpi/spectrum-mpi-rolling-release-clang-ibm-11.0.0
+    - spec: spectrum-mpi@10.3.1.03rtm0%clang@=12.0.1.ibm
+      prefix: /usr/tce/packages/spectrum-mpi/spectrum-mpi-rolling-release-clang-ibm-12.0.1
+    - spec: spectrum-mpi@10.3.1.03rtm0%clang@=12.0.1.ibm.gcc.8.3.1
+      prefix: /usr/tce/packages/spectrum-mpi/spectrum-mpi-rolling-release-clang-ibm-12.0.1-gcc-8.3.1
+    - spec: spectrum-mpi@10.3.1.03rtm0%clang@=13.0.1.ibm
+      prefix: /usr/tce/packages/spectrum-mpi/spectrum-mpi-rolling-release-clang-ibm-13.0.1
+    - spec: spectrum-mpi@10.3.1.03rtm0%clang@=14.0.5.ibm
+      prefix: /usr/tce/packages/spectrum-mpi/spectrum-mpi-rolling-release-clang-ibm-14.0.5
+    - spec: spectrum-mpi@10.3.1.03rtm0%clang@=14.0.5.ibm.gcc.8.3.1
+      prefix: /usr/tce/packages/spectrum-mpi/spectrum-mpi-rolling-release-clang-ibm-14.0.5-gcc-8.3.1
+    - spec: spectrum-mpi@10.3.1.03rtm0%clang@=15.0.6.ibm
+      prefix: /usr/tce/packages/spectrum-mpi/spectrum-mpi-rolling-release-clang-ibm-15.0.6
+    - spec: spectrum-mpi@10.3.1.03rtm0%clang@=16.0.6.ibm
+      prefix: /usr/tce/packages/spectrum-mpi/spectrum-mpi-rolling-release-clang-ibm-16.0.6
+    - spec: spectrum-mpi@10.3.1.03rtm0%clang@=16.0.6.ibm.gcc.8.3.1
+      prefix: /usr/tce/packages/spectrum-mpi/spectrum-mpi-rolling-release-clang-ibm-16.0.6-gcc-8.3.1
+    - spec: spectrum-mpi@10.3.1.03rtm0%clang@=16.0.6.ibm.cuda.11.8.0.gcc.11.2.1
+      prefix: /usr/tce/packages/spectrum-mpi/spectrum-mpi-rolling-release-clang-ibm-16.0.6-cuda-11.8.0-gcc-11.2.1
+    - spec: spectrum-mpi@10.3.1.03rtm0%gcc@=4.9.3
+      prefix: /usr/tce/packages/spectrum-mpi/spectrum-mpi-rolling-release-gcc-4.9.3
+    - spec: spectrum-mpi@10.3.1.03rtm0%gcc@=8.3.1
+      prefix: /usr/tce/packages/spectrum-mpi/spectrum-mpi-rolling-release-gcc-8.3.1
+    - spec: spectrum-mpi@10.3.1.03rtm0%gcc@=11.2.1
+      prefix: /usr/tce/packages/spectrum-mpi/spectrum-mpi-rolling-release-gcc-11.2.1
+    - spec: spectrum-mpi@10.3.1.03rtm0%xl@=16.1.1.10
+      prefix: /usr/tce/packages/spectrum-mpi/spectrum-mpi-rolling-release-xl-2021.09.22
+    - spec: spectrum-mpi@10.3.1.03rtm0%xl@=16.1.1.10.gcc.8.3.1
+      prefix: /usr/tce/packages/spectrum-mpi/spectrum-mpi-rolling-release-xl-2021.09.22-gcc-8.3.1
+    - spec: spectrum-mpi@10.3.1.03rtm0%xl@=16.1.1.11
+      prefix: /usr/tce/packages/spectrum-mpi/spectrum-mpi-rolling-release-xl-2021.12.22
+    - spec: spectrum-mpi@10.3.1.03rtm0%xl@=16.1.1.12
+      prefix: /usr/tce/packages/spectrum-mpi/spectrum-mpi-rolling-release-xl-2022.08.19
+    - spec: spectrum-mpi@10.3.1.03rtm0%xl@=16.1.1.12.gcc.8.3.1
+      prefix: /usr/tce/packages/spectrum-mpi/spectrum-mpi-rolling-release-xl-2022.08.19-gcc-8.3.1
+    - spec: spectrum-mpi@10.3.1.03rtm0%xl@=16.1.1.14
+      prefix: /usr/tce/packages/spectrum-mpi/spectrum-mpi-rolling-release-xl-2023.06.28
+    - spec: spectrum-mpi@10.3.1.03rtm0%xl@=16.1.1.14.gcc.8.3.1
+      prefix: /usr/tce/packages/spectrum-mpi/spectrum-mpi-rolling-release-xl-2023.06.28-gcc-8.3.1
+    - spec: spectrum-mpi@10.3.1.03rtm0%xl@=beta2019.06.20
+      prefix: /usr/tce/packages/spectrum-mpi/spectrum-mpi-rolling-release-xl-beta-2019.06.20
+    - spec: spectrum-mpi@10.3.1.03rtm0%pgi@=19.10
+      prefix: /usr/tce/packages/spectrum-mpi/spectrum-mpi-rolling-release-pgi-19.10
+    - spec: spectrum-mpi@10.3.1.03rtm0%pgi@=20.4
+      prefix: /usr/tce/packages/spectrum-mpi/spectrum-mpi-rolling-release-pgi-20.4
+    - spec: spectrum-mpi@10.3.1.03rtm0%pgi@=21.11
+      prefix: /usr/tce/packages/spectrum-mpi/spectrum-mpi-rolling-release-pgi-21.11
+    - spec: spectrum-mpi@10.3.1.03rtm0%pgi@=22.7
+      prefix: /usr/tce/packages/spectrum-mpi/spectrum-mpi-rolling-release-pgi-22.7
+    - spec: spectrum-mpi@10.3.1.03rtm0%pgi@=22.11
+      prefix: /usr/tce/packages/spectrum-mpi/spectrum-mpi-rolling-release-pgi-22.11
+    - spec: spectrum-mpi@10.3.1.03rtm0%pgi@=23.1
+      prefix: /usr/tce/packages/spectrum-mpi/spectrum-mpi-rolling-release-pgi-23.1
+  # blas is a bit more complicated because its a virtual package so fake it with
+  # the following per spack docs
+  netlib-lapack:
+    buildable: false
+    externals:
+    #- spec: netlib-lapack@3.    %clang@=9.0.0
+    #  prefix: /usr/tce/packages/lapack/lapack-3.    -clang-9.0.0
+    #- spec: netlib-lapack@3.    %clang@=10.0.1
+    #  prefix: /usr/tce/packages/lapack/lapack-3.    -clang-10.0.1
+    #- spec: netlib-lapack@3.    %clang@=11.0.0
+    #  prefix: /usr/tce/packages/lapack/lapack-3.    -clang-11.0.0
+    #- spec: netlib-lapack@3.    %clang@=12.0.1
+    #  prefix: /usr/tce/packages/lapack/lapack-3.    -clang-12.0.1
+    #- spec: netlib-lapack@3.    %clang@=12.0.1.gcc.8.3.1
+    #  prefix: /usr/tce/packages/lapack/lapack-3.    -clang-12.0.1-gcc-8.3.1
+    #- spec: netlib-lapack@3.    %clang@=13.0.1
+    #  prefix: /usr/tce/packages/lapack/lapack-3.    -clang-13.0.1
+    #- spec: netlib-lapack@3.    %clang@=14.0.5
+    #  prefix: /usr/tce/packages/lapack/lapack-3.    -clang-14.0.5
+    #- spec: netlib-lapack@3.    %clang@=14.0.5.gcc.8.3.1
+    #  prefix: /usr/tce/packages/lapack/lapack-3.    -clang-14.0.5-gcc-8.3.1
+    #- spec: netlib-lapack@3.    %clang@=15.0.6
+    #  prefix: /usr/tce/packages/lapack/lapack-3.    -clang-15.0.6
+    #- spec: netlib-lapack@3.    %clang@=16.0.6
+    #  prefix: /usr/tce/packages/lapack/lapack-3.    -clang-16.0.6
+    #- spec: netlib-lapack@3.    %clang@=16.0.6.gcc.8.3.1
+    #  prefix: /usr/tce/packages/lapack/lapack-3.    -clang-16.0.6-gcc-8.3.1
+    #- spec: netlib-lapack@3.    %clang@=16.0.6.cuda.11.8.0.gcc.11.2.1
+    #  prefix: /usr/tce/packages/lapack/lapack-3.    -clang-16.0.6-cuda-11.8.0-gcc-11.2.1
+    #- spec: netlib-lapack@3.    %clang@=9.0.0.ibm
+    #  prefix: /usr/tce/packages/lapack/lapack-3.    -clang-ibm-2019.10.03
+    #- spec: netlib-lapack@3.    %clang@=10.0.1.ibm
+    #  prefix: /usr/tce/packages/lapack/lapack-3.    -clang-ibm-10.0.1
+    #- spec: netlib-lapack@3.    %clang@=11.0.0.ibm
+    #  prefix: /usr/tce/packages/lapack/lapack-3.    -clang-ibm-11.0.0
+    #- spec: netlib-lapack@3.    %clang@=12.0.1.ibm
+    #  prefix: /usr/tce/packages/lapack/lapack-3.    -clang-ibm-12.0.1
+    #- spec: netlib-lapack@3.    %clang@=12.0.1.ibm.gcc.8.3.1
+    #  prefix: /usr/tce/packages/lapack/lapack-3.    -clang-ibm-12.0.1-gcc-8.3.1
+    #- spec: netlib-lapack@3.    %clang@=13.0.1.ibm
+    #  prefix: /usr/tce/packages/lapack/lapack-3.    -clang-ibm-13.0.1
+    #- spec: netlib-lapack@3.    %clang@=14.0.5.ibm
+    #  prefix: /usr/tce/packages/lapack/lapack-3.    -clang-ibm-14.0.5
+    #- spec: netlib-lapack@3.    %clang@=14.0.5.ibm.gcc.8.3.1
+    #  prefix: /usr/tce/packages/lapack/lapack-3.    -clang-ibm-14.0.5-gcc-8.3.1
+    #- spec: netlib-lapack@3.    %clang@=15.0.6.ibm
+    #  prefix: /usr/tce/packages/lapack/lapack-3.    -clang-ibm-15.0.6
+    #- spec: netlib-lapack@3.    %clang@=16.0.6.ibm
+    #  prefix: /usr/tce/packages/lapack/lapack-3.    -clang-ibm-16.0.6
+    #- spec: netlib-lapack@3.    %clang@=16.0.6.ibm.gcc.8.3.1
+    #  prefix: /usr/tce/packages/lapack/lapack-3.    -clang-ibm-16.0.6-gcc-8.3.1
+    #- spec: netlib-lapack@3.    %clang@=16.0.6.ibm.cuda.11.8.0.gcc.11.2.1
+    #  prefix: /usr/tce/packages/lapack/lapack--clang-ibm-16.0.6-cuda-11.8.0-gcc-11.2.1
+    - spec: netlib-lapack@3.8.0%gcc@=4.9.3
+      prefix: /usr/tce/packages/lapack/lapack-3.8.0-P9-gcc-4.9.3
+    - spec: netlib-lapack@3.9.0%gcc@=8.3.1
+      prefix: /usr/tce/packages/lapack/lapack-3.9.0-P9-gcc-7.3.1
+    - spec: netlib-lapack@3.11.0%gcc@=11.2.1
+      prefix: /usr/tce/packages/lapack/lapack-3.11.0-P9-gcc-11.2.1
+    #- spec: netlib-lapack@3.    %xl@=16.1.1.10
+    #  prefix: /usr/tce/packages/lapack/lapack-3.    -xl-2021.09.22
+    #- spec: netlib-lapack@3.    %xl@=16.1.1.10.gcc.8.3.1
+    #  prefix: /usr/tce/packages/lapack/lapack-3.    -xl-2021.09.22-gcc-8.3.1
+    #- spec: netlib-lapack@3.    %xl@=16.1.1.11
+    #  prefix: /usr/tce/packages/lapack/lapack-3.    -xl-2021.12.22
+    #- spec: netlib-lapack@3.    %xl@=16.1.1.12
+    #  prefix: /usr/tce/packages/lapack/lapack-3.    -xl-2022.08.19
+    #- spec: netlib-lapack@3.    %xl@=16.1.1.12.gcc.8.3.1
+    #  prefix: /usr/tce/packages/lapack/lapack-3.    -xl-2022.08.19-gcc-8.3.1
+    - spec: netlib-lapack@3.12.0%xl@=16.1.1.14
+      prefix: /usr/tce/packages/lapack/lapack-3.12.0-xl-2023.06.28
+    - spec: netlib-lapack@3.12.0%xl@=16.1.1.14.gcc.8.3.1
+      prefix: /usr/tce/packages/lapack/lapack-3.12.0-xl-2023.06.28-gcc-8.3.1
+    #- spec: netlib-lapack@%xl@=beta2019.06.20
+    #  prefix: /usr/tce/packages/lapack/lapack--xl-beta-2019.06.20
+    #- spec: netlib-lapack@%pgi@=19.10
+    #  prefix: /usr/tce/packages/lapack/lapack--pgi-19.10
+    #- spec: netlib-lapack@%pgi@=20.4
+    #  prefix: /usr/tce/packages/lapack/lapack--pgi-20.4
+    #- spec: netlib-lapack@%pgi@=21.11
+    #  prefix: /usr/tce/packages/lapack/lapack--pgi-21.11
+    #- spec: netlib-lapack@%pgi@=22.7
+    #  prefix: /usr/tce/packages/lapack/lapack--pgi-22.7
+    #- spec: netlib-lapack@%pgi@=22.11
+    #  prefix: /usr/tce/packages/lapack/lapack--pgi-22.11
+    #- spec: netlib-lapack@%pgi@=23.1
+    #  prefix: /usr/tce/packages/lapack/lapack--pgi-23.1
+    - spec: netlib-lapack
+      prefix: /usr/tcetmp/packages/lapack/lapack-3.9.0-xl-2020.11.12
+
+  # System level packages to not build
+  autoconf:
+    buildable: false
+    externals:
+    - spec: autoconf@2.69
+      prefix: /usr
+  automake:
+    buildable: false
+    externals:
+    - spec: automake@1.13.4
+      prefix: /usr
+  binutils:
+    buildable: false
+    externals:
+    - spec: binutils@2.27
+      prefix: /usr
+  bzip2:
+    buildable: false
+    externals:
+    - spec: bzip2@1.0.6
+      prefix: /usr
+  curl:
+    buildable: false
+    externals:
+    - spec: curl@7.29.0
+      prefix: /usr
+  diffutils:
+    buildable: false
+    externals:
+    - spec: diffutils@3.3
+      prefix: /usr
+  elfutils:
+    buildable: false
+    externals:
+    - spec: elfutils@0.176
+      prefix: /usr
+  libepoxy:
+    buildable: false
+    externals:
+    - spec: libepoxy@0.0.0
+      prefix: /usr
+  findutils:
+    buildable: false
+    externals:
+    - spec: findutils@4.5.11
+      prefix: /usr
+  gettext:
+    buildable: false
+    externals:
+    - spec: gettext@0.19.8.1
+      prefix: /usr
+  ghostscript:
+    buildable: false
+    externals:
+    - spec: ghostscript@9.25
+      prefix: /usr
+  gmake:
+    buildable: false
+    externals:
+    - spec: gmake@4.2.1
+      prefix: /usr/tcetmp
+  groff:
+    buildable: false
+    externals:
+    - spec: groff@1.22.2
+      prefix: /usr
+  libtool:
+    buildable: false
+    externals:
+    - spec: libtool@2.4.2
+      prefix: /usr
+  libunwind:
+    buildable: false
+    externals:
+    - spec: libunwind@8.0.1
+      prefix: /usr
+  ncurses:
+    buildable: false
+    externals:
+    - spec: ncurses@5.9
+      prefix: /usr
+  m4:
+    buildable: false
+    externals:
+    - spec: m4@1.4.16
+      prefix: /usr
+  papi:
+    buildable: false
+    version: [6.0.0.1]
+    externals:
+    - spec: papi@6.0.0.1
+      prefix: /usr/papi600
+  perl:
+    buildable: false
+    externals:
+    - spec: perl@5.16.3
+      prefix: /usr
+  pkg-config:
+    buildable: false
+    externals:
+    - spec: pkg-config@0.27.1
+      prefix: /usr
+  python:
+    buildable: false
+    version: [3.8.2]
+    externals:
+    - spec: python@3.8.2
+      prefix: /usr/tce/packages/python/python-3.8.2
+  readline:
+    buildable: false
+    externals:
+    - spec: readline@6.2
+      prefix: /usr
+  tar:
+    externals:
+    - spec: tar@1.26
+      prefix: /usr
+    buildable: false
+  unzip:
+    buildable: false
+    externals:
+    - spec: unzip@6.0
+      prefix: /usr
+  zlib:
+    buildable: false
+    externals:
+    - spec: zlib@1.2.7
+      prefix: /usr
+
+  # External dependencies for SCR
+  lsf:
+    buildable: False
+    externals:
+    - spec: lsf@10.1
+      prefix: /opt/ibm/spectrumcomputing/lsf/10.1
+  slurm:
+    buildable: false
+    externals:
+    - spec: slurm@20
+      prefix: /usr
+  libyogrt:
+    buildable: false
+    externals:
+    - spec: libyogrt@1.0.0 scheduler=lsf
+      prefix: /usr
+    - spec: libyogrt@1.0.0 scheduler=slurm
+      prefix: /usr
+  pdsh:
+    buildable: false
+    externals:
+    - spec: pdsh@2.34
+      prefix: /usr
diff --git a/spack-environments/radiuss/pipeline.yml b/spack-environments/radiuss/pipeline.yml
index 0156d93..c4bbe59 100644
--- a/spack-environments/radiuss/pipeline.yml
+++ b/spack-environments/radiuss/pipeline.yml
@@ -10,8 +10,13 @@ variables:
   #MY_SPACK_COMMIT: 2d464f8c8903ce57cabe411bbe979583d4ccdb5d # develop-2024-06-16
   #MY_SPACK_COMMIT: aeaa922eef45b14199b486fa2c188252df8c9544 # develop-2024-07-07
   #MY_SPACK_COMMIT: 38643e5a797b708192d2463fde05caf5ccb66ccd # Test PR https://github.com/spack/spack/pull/45648
-  MY_SPACK_COMMIT: d7f5dbaf8911387d6c38035f0d508702ee71b03a # Merge commit of radiuss packages update
+  #MY_SPACK_COMMIT: d7f5dbaf8911387d6c38035f0d508702ee71b03a # Merge commit of radiuss packages update
+  #MY_SPACK_COMMIT: 7ad08213dc343c50f3cea2d3627e92d4e54a6421 # develop-2024-10-06
+  MY_SPACK_COMMIT: 70534ac9d457da9bc884feb10a64974ad32c19e3 # develop-2025-01-12
 
 include:
+  - local: .gitlab/corona.yml
   - local: .gitlab/ruby.yml
+  - local: .gitlab/poodle.yml
   - local: .gitlab/lassen.yml
+  - local: .gitlab/tioga.yml
diff --git a/spack-environments/radiuss/toss_4_x86_64_ib/compilers.yaml b/spack-environments/radiuss/poodle/compilers.yaml
similarity index 79%
rename from spack-environments/radiuss/toss_4_x86_64_ib/compilers.yaml
rename to spack-environments/radiuss/poodle/compilers.yaml
index 93428fa..1085f54 100644
--- a/spack-environments/radiuss/toss_4_x86_64_ib/compilers.yaml
+++ b/spack-environments/radiuss/poodle/compilers.yaml
@@ -1,47 +1,4 @@
 compilers::
-- compiler:
-    spec: pgi@=20.4
-    paths:
-      cc: /opt/toss/pgi/20.4/linux86-64-llvm/20.4/bin/pgcc
-      cxx: /opt/toss/pgi/20.4/linux86-64-llvm/20.4/bin/pgc++
-      f77: /opt/toss/pgi/20.4/linux86-64-llvm/20.4/bin/pgfortran
-      fc: /opt/toss/pgi/20.4/linux86-64-llvm/20.4/bin/pgfortran
-    flags: {}
-    operating_system: rhel8
-    target: x86_64
-    modules: []
-    environment: {}
-    extra_rpaths: []
-- compiler:
-    spec: intel@=19.1.2
-    paths:
-      cc: /usr/tce/packages/intel-classic/intel-classic-19.1.2/bin/icc
-      cxx: /usr/tce/packages/intel-classic/intel-classic-19.1.2/bin/icpc
-      f77: /usr/tce/packages/intel-classic/intel-classic-19.1.2/bin/ifort
-      fc: /usr/tce/packages/intel-classic/intel-classic-19.1.2/bin/ifort
-    flags: {}
-    operating_system: rhel8
-    target: x86_64
-    modules:
-    - intel-classic/19.1.2
-    environment: {}
-    extra_rpaths: []
-- compiler:
-    spec: intel@=19.1.2.gcc.10.3.1
-    paths:
-      cc: /usr/tce/packages/intel-classic/intel-classic-19.1.2/bin/icc
-      cxx: /usr/tce/packages/intel-classic/intel-classic-19.1.2/bin/icpc
-      f77: /usr/tce/packages/intel-classic/intel-classic-19.1.2/bin/ifort
-      fc: /usr/tce/packages/intel-classic/intel-classic-19.1.2/bin/ifort
-    flags:
-      cflags: -gcc-name=/usr/tce/packages/gcc/gcc-10.3.1/bin/gcc
-      cxxflags: -gxx-name=/usr/tce/packages/gcc/gcc-10.3.1/bin/g++
-      fflags: -gcc-name=/usr/tce/packages/gcc/gcc-10.3.1/bin/gcc
-    operating_system: rhel8
-    target: x86_64
-    modules: []
-    environment: {}
-    extra_rpaths: []
 - compiler:
     spec: intel@=2021.6.0
     paths:
@@ -72,7 +29,7 @@ compilers::
     environment: {}
     extra_rpaths: []
 - compiler:
-    spec: intel@=2022.1.0
+    spec: oneapi@=2022.1.0
     paths:
       cc: /usr/tce/packages/intel/intel-2022.1.0/compiler/2022.1.0/linux/bin/icx
       cxx: /usr/tce/packages/intel/intel-2022.1.0/compiler/2022.1.0/linux/bin/icpx
@@ -85,7 +42,7 @@ compilers::
     environment: {}
     extra_rpaths: []
 - compiler:
-    spec: intel@=2022.1.0.gcc.10.3.1
+    spec: oneapi@=2022.1.0.gcc.10.3.1
     paths:
       cc: /usr/tce/packages/intel/intel-2022.1.0/compiler/2022.1.0/linux/bin/icx
       cxx: /usr/tce/packages/intel/intel-2022.1.0/compiler/2022.1.0/linux/bin/icpx
@@ -101,7 +58,7 @@ compilers::
     environment: {}
     extra_rpaths: []
 - compiler:
-    spec: intel@=2023.2.1
+    spec: oneapi@=2023.2.1
     paths:
       cc: /usr/tce/packages/intel/intel-2023.2.1/compiler/2023.2.1/linux/bin/icx
       cxx: /usr/tce/packages/intel/intel-2023.2.1/compiler/2023.2.1/linux/bin/icpx
@@ -114,7 +71,7 @@ compilers::
     environment: {}
     extra_rpaths: []
 - compiler:
-    spec: intel@=2023.2.1.gcc.10.3.1
+    spec: oneapi@=2023.2.1.gcc.10.3.1
     paths:
       cc: /usr/tce/packages/intel/intel-2023.2.1/compiler/2023.2.1/linux/bin/icx
       cxx: /usr/tce/packages/intel/intel-2023.2.1/compiler/2023.2.1/linux/bin/icpx
@@ -129,6 +86,19 @@ compilers::
     modules: []
     environment: {}
     extra_rpaths: []
+- compiler:
+    spec: oneapi@=2024.2.1
+    paths:
+      cc: /collab/usr/global/tools/intel/toss_4_x86_64_ib/oneapi-2024.2.1/2024.2/bin/icx
+      cxx: /collab/usr/global/tools/intel/toss_4_x86_64_ib/oneapi-2024.2.1/2024.2/bin/icpx
+      f77: /collab/usr/global/tools/intel/toss_4_x86_64_ib/oneapi-2024.2.1/2024.2/bin/ifx
+      fc: /collab/usr/global/tools/intel/toss_4_x86_64_ib/oneapi-2024.2.1/2024.2/bin/ifx
+    flags: {}
+    operating_system: rhel8
+    target: x86_64
+    modules: []
+    environment: {}
+    extra_rpaths: []
 - compiler:
     spec: clang@=14.0.6
     paths:
@@ -157,6 +127,32 @@ compilers::
     modules: []
     environment: {}
     extra_rpaths: []
+- compiler:
+    spec: clang@=19.0.0
+    paths:
+      cc: /usr/workspace/raja-dev/clang_sycl_2f03ef85fee5_hip_gcc10.3.1_rocm5.7.1/bin/clang
+      cxx: /usr/workspace/raja-dev/clang_sycl_2f03ef85fee5_hip_gcc10.3.1_rocm5.7.1/bin/clang++
+      f77: /usr/tce/packages/gcc/gcc-10.3.1/bin/gfortran
+      fc: /usr/tce/packages/gcc/gcc-10.3.1/bin/gfortran
+    flags: {}
+    operating_system: rhel8
+    target: x86_64
+    modules: []
+    environment: {}
+    extra_rpaths: [/usr/workspace/raja-dev/clang_sycl_2f03ef85fee5_hip_gcc10.3.1_rocm5.7.1/lib, /usr/workspace/raja-dev/clang_sycl_2f03ef85fee5_hip_gcc10.3.1_rocm5.7.1/lib64]
+- compiler:
+    spec: clang@=20.0.0
+    paths:
+      cc: /usr/workspace/raja-dev/clang_sycl_730cd3a5275f_hip_gcc10.3.1_rocm6.0.2/bin/clang
+      cxx: /usr/workspace/raja-dev/clang_sycl_730cd3a5275f_hip_gcc10.3.1_rocm6.0.2/bin/clang++
+      f77: /usr/tce/packages/gcc/gcc-10.3.1/bin/gfortran
+      fc: /usr/tce/packages/gcc/gcc-10.3.1/bin/gfortran
+    flags: {}
+    operating_system: rhel8
+    target: x86_64
+    modules: []
+    environment: {}
+    extra_rpaths: [/usr/workspace/raja-dev/clang_sycl_730cd3a5275f_hip_gcc10.3.1_rocm6.0.2/lib, /usr/workspace/raja-dev/clang_sycl_730cd3a5275f_hip_gcc10.3.1_rocm6.0.2/lib64]
 - compiler:
     spec: gcc@=10.3.1
     paths:
diff --git a/spack-environments/radiuss/toss_4_x86_64_ib/config.yaml b/spack-environments/radiuss/poodle/config.yaml
similarity index 53%
rename from spack-environments/radiuss/toss_4_x86_64_ib/config.yaml
rename to spack-environments/radiuss/poodle/config.yaml
index 2a64da3..6be0e9e 100644
--- a/spack-environments/radiuss/toss_4_x86_64_ib/config.yaml
+++ b/spack-environments/radiuss/poodle/config.yaml
@@ -1,3 +1,2 @@
 config:
   build_jobs: 28
-  concretizer: clingo
diff --git a/spack-environments/radiuss/poodle/packages.yaml b/spack-environments/radiuss/poodle/packages.yaml
new file mode 100644
index 0000000..e659257
--- /dev/null
+++ b/spack-environments/radiuss/poodle/packages.yaml
@@ -0,0 +1,282 @@
+packages::
+  all:
+    require:
+    - 'target=sapphirerapids'
+    - spec: '^blt%oneapi'
+      when: '%oneapi ^blt'
+    - spec: '^blt%gcc'
+      when: '%gcc ^blt'
+    - spec: '^blt%intel'
+      when: '%intel ^blt'
+    compiler: [gcc, intel, clang, oneapi]
+    providers:
+      blas: [openblas]
+      lapack: [netlib-lapack]
+      mpi: [mvapich2]
+  gcc-runtime:
+    require:
+    - '%gcc'
+  intel-oneapi-runtime:
+    require:
+    - '%oneapi'
+  cmake:
+    version: [3.23.1, 3.22.4, 3.21.1, 3.19.2, 3.14.5]
+    buildable: false
+    externals:
+    - spec: cmake@3.14.5
+      prefix: /usr/tce/packages/cmake/cmake-3.14.5
+    - spec: cmake@3.19.2
+      prefix: /usr/tce/packages/cmake/cmake-3.19.2
+    - spec: cmake@3.21.1
+      prefix: /usr/tce/packages/cmake/cmake-3.21.1
+    - spec: cmake@3.22.4
+      prefix: /usr/tce/packages/cmake/cmake-3.22.4
+    - spec: cmake@3.23.1
+      prefix: /usr/tce/packages/cmake/cmake-3.23.1
+  mvapich2:
+    buildable: false
+    externals:
+    - spec: mvapich2@2.3.7%intel@=19.1.2 ~cuda~debug~regcache~wrapperrpath ch3_rank_bits=32
+        file_systems=lustre,nfs,ufs process_managers=slurm
+      prefix: /usr/tce/packages/mvapich2/mvapich2-2.3.7-intel-classic-19.1.2
+    - spec: mvapich2@2.3.7%intel@=19.1.2.gcc.10.3.1 ~cuda~debug~regcache~wrapperrpath ch3_rank_bits=32
+        file_systems=lustre,nfs,ufs process_managers=slurm
+      prefix: /usr/tce/packages/mvapich2/mvapich2-2.3.7-intel-classic-19.1.2
+    - spec: mvapich2@2.3.7%intel@=2021.6.0 ~cuda~debug~regcache~wrapperrpath ch3_rank_bits=32
+        file_systems=lustre,nfs,ufs process_managers=slurm
+      prefix: /usr/tce/packages/mvapich2/mvapich2-2.3.7-intel-classic-2021.6.0
+    - spec: mvapich2@2.3.7%intel@=2021.6.0.gcc.10.3.1 ~cuda~debug~regcache~wrapperrpath ch3_rank_bits=32
+        file_systems=lustre,nfs,ufs process_managers=slurm
+      prefix: /usr/tce/packages/mvapich2/mvapich2-2.3.7-intel-classic-2021.6.0
+    - spec: mvapich2@2.3.7%oneapi@=2022.1.0 ~cuda~debug~regcache~wrapperrpath ch3_rank_bits=32
+        file_systems=lustre,nfs,ufs process_managers=slurm
+      prefix: /usr/tce/packages/mvapich2/mvapich2-2.3.7-intel-2022.1.0
+    - spec: mvapich2@2.3.7%oneapi@=2022.1.0.gcc.10.3.1 ~cuda~debug~regcache~wrapperrpath ch3_rank_bits=32
+        file_systems=lustre,nfs,ufs process_managers=slurm
+      prefix: /usr/tce/packages/mvapich2/mvapich2-2.3.7-intel-2022.1.0
+    - spec: mvapich2@2.3.7%oneapi@=2023.2.1 ~cuda~debug~regcache~wrapperrpath ch3_rank_bits=32
+        file_systems=lustre,nfs,ufs process_managers=slurm
+      prefix: /usr/tce/packages/mvapich2/mvapich2-2.3.7-intel-2023.2.1
+    - spec: mvapich2@2.3.7%oneapi@=2023.2.1.gcc.10.3.1 ~cuda~debug~regcache~wrapperrpath ch3_rank_bits=32
+        file_systems=lustre,nfs,ufs process_managers=slurm
+      prefix: /usr/tce/packages/mvapich2/mvapich2-2.3.7-intel-2023.2.1
+    - spec: mvapich2@2.3.7%clang@=14.0.6 ~cuda~debug~regcache~wrapperrpath ch3_rank_bits=32
+        file_systems=lustre,nfs,ufs process_managers=slurm
+      prefix: /usr/tce/packages/mvapich2/mvapich2-2.3.7-clang-14.0.6
+    - spec: mvapich2@2.3.7%clang@=14.0.6.gcc.10.3.1 ~cuda~debug~regcache~wrapperrpath ch3_rank_bits=32
+        file_systems=lustre,nfs,ufs process_managers=slurm
+      prefix: /usr/tce/packages/mvapich2/mvapich2-2.3.7-clang-14.0.6
+    - spec: mvapich2@2.3.7%gcc@=10.3.1 ~cuda~debug~regcache~wrapperrpath ch3_rank_bits=32
+        file_systems=lustre,nfs,ufs process_managers=slurm
+      prefix: /usr/tce/packages/mvapich2/mvapich2-2.3.7-gcc-10.3.1
+    - spec: mvapich2@2.3.7%gcc@=11.2.1 ~cuda~debug~regcache~wrapperrpath ch3_rank_bits=32
+        file_systems=lustre,nfs,ufs process_managers=slurm
+      prefix: /usr/tce/packages/mvapich2/mvapich2-2.3.7-gcc-11.2.1
+    - spec: mvapich2@2.3.7%gcc@=12.1.1 ~cuda~debug~regcache~wrapperrpath ch3_rank_bits=32
+        file_systems=lustre,nfs,ufs process_managers=slurm
+      prefix: /usr/tce/packages/mvapich2/mvapich2-2.3.7-gcc-12.1.1
+
+  autoconf:
+    buildable: false
+    externals:
+    - spec: autoconf@2.69
+      prefix: /usr
+  automake:
+    buildable: false
+    externals:
+    - spec: automake@1.16.1
+      prefix: /usr
+  binutils:
+    buildable: false
+    externals:
+    - spec: binutils@2.30
+      prefix: /usr
+  bison:
+    buildable: false
+    externals:
+    - spec: bison@3.0.4
+      prefix: /usr
+  bzip2:
+    buildable: false
+    externals:
+    - spec: bzip2@1.0.6
+      prefix: /usr
+  curl:
+    buildable: false
+    externals:
+    - spec: curl@7.61.1
+      prefix: /usr
+  diffutils:
+    buildable: false
+    externals:
+    - spec: diffutils@3.6
+      prefix: /usr
+  elfutils:
+    buildable: false
+    externals:
+    - spec: elfutils@0.190
+      prefix: /usr
+  expat:
+    buildable: false
+    externals:
+    - spec: expat@2.2.5
+      prefix: /usr
+  flex:
+    buildable: false
+    externals:
+    - spec: flex@2.6.1
+      prefix: /usr
+  findutils:
+    buildable: false
+    externals:
+    - spec: findutils@4.6.0
+      prefix: /usr
+  gettext:
+    buildable: false
+    externals:
+    - spec: gettext@0.19.8.1
+      prefix: /usr
+  ghostscript:
+    buildable: false
+    externals:
+    - spec: ghostscript@9.27
+      prefix: /usr
+  gmake:
+    buildable: false
+    externals:
+    - spec: gmake@4.2.1
+      prefix: /usr
+  graphviz:
+    buildable: false
+    externals:
+    - spec: graphviz@2.40.1
+      prefix: /usr
+  groff:
+    buildable: false
+    externals:
+    - spec: groff@1.22.3
+      prefix: /usr
+  hwloc:
+    buildable: false
+    externals:
+    - spec: hwloc@2.11.1
+      prefix: /usr
+  libepoxy:
+    buildable: false
+    externals:
+    - spec: libepoxy@1.5.8
+      prefix: /usr
+  libtool:
+    buildable: false
+    externals:
+    - spec: libtool@2.4.6
+      prefix: /usr
+# NOTE: removed since fails on clang builds
+# libunwind:
+#   buildable: false
+#   externals:
+#   - spec: libunwind@1.3.1
+#     prefix: /usr
+  libunwind:
+    buildable: false
+    version: [8.0.1]
+    externals:
+    - spec: libunwind@8.0.1
+      prefix: /usr
+  libx11:
+    buildable: false
+    externals:
+    - spec: libx11@1.6.8
+      prefix: /usr
+  lua:
+    buildable: false
+    externals:
+    - spec: lua@5.3.4
+      prefix: /usr
+  m4:
+    buildable: false
+    externals:
+    - spec: m4@1.4.18
+      prefix: /usr
+  netlib-lapack:
+    buildable: false
+    externals:
+    - spec: netlib-lapack@3.8.0
+      prefix: /usr
+  ninja:
+    buildable: false
+    externals:
+    - spec: ninja@1.11.1
+      prefix: /usr/tce/packages/ninja/ninja-1.11.1
+  openblas:
+    buildable: false
+    externals:
+    - prefix: /usr
+      spec: openblas@0.3.15
+  opengl:
+    buildable: false
+    externals:
+    - spec: opengl@1.7.0
+      prefix: /usr
+  openglu:
+    buildable: false
+    externals:
+    - spec: openglu@1.3.1
+      prefix: /usr
+  openssl:
+    buildable: false
+    externals:
+    - spec: openssl@1.1.1k
+      prefix: /usr
+  papi:
+    buildable: false
+    version: [6.0.0.1]
+    externals:
+    - spec: papi@6.0.0.1
+      prefix: /usr/tce/packages/papi/papi-6.0.0.1
+  perl:
+    buildable: false
+    externals:
+    - spec: perl@5.26.3
+      prefix: /usr
+  pkg-config:
+    buildable: false
+    externals:
+    - spec: pkg-config@1.4.2
+      prefix: /usr
+  python:
+    buildable: false
+    version: [3.10.8]
+    externals:
+    - spec: python@3.10.8
+      prefix: /usr/tce/packages/python/python-3.10.8
+  readline:
+    buildable: false
+    externals:
+    - spec: readline@7.0
+      prefix: /usr
+  slurm:
+    buildable: false
+    externals:
+    - spec: slurm@23-11-1-1
+      prefix: /usr
+  swig:
+    buildable: false
+    externals:
+    - spec: swig@3.0.12
+      prefix: /usr
+  tar:
+    buildable: false
+    externals:
+    - spec: tar@1.30
+      prefix: /usr
+  unzip:
+    buildable: false
+    externals:
+    - spec: unzip@6.0
+      prefix: /usr
+  zlib:
+    buildable: false
+    externals:
+    - spec: zlib@1.2.11
+      prefix: /usr
diff --git a/spack-environments/radiuss/ruby/compilers.yaml b/spack-environments/radiuss/ruby/compilers.yaml
new file mode 100644
index 0000000..1085f54
--- /dev/null
+++ b/spack-environments/radiuss/ruby/compilers.yaml
@@ -0,0 +1,194 @@
+compilers::
+- compiler:
+    spec: intel@=2021.6.0
+    paths:
+      cc: /usr/tce/packages/intel-classic/intel-classic-2021.6.0/bin/icc
+      cxx: /usr/tce/packages/intel-classic/intel-classic-2021.6.0/bin/icpc
+      f77: /usr/tce/packages/intel-classic/intel-classic-2021.6.0/bin/ifort
+      fc: /usr/tce/packages/intel-classic/intel-classic-2021.6.0/bin/ifort
+    flags: {}
+    operating_system: rhel8
+    target: x86_64
+    modules: []
+    environment: {}
+    extra_rpaths: []
+- compiler:
+    spec: intel@=2021.6.0.gcc.10.3.1
+    paths:
+      cc: /usr/tce/packages/intel-classic/intel-classic-2021.6.0/bin/icc
+      cxx: /usr/tce/packages/intel-classic/intel-classic-2021.6.0/bin/icpc
+      f77: /usr/tce/packages/intel-classic/intel-classic-2021.6.0/bin/ifort
+      fc: /usr/tce/packages/intel-classic/intel-classic-2021.6.0/bin/ifort
+    flags:
+      cflags: -gcc-name=/usr/tce/packages/gcc/gcc-10.3.1/bin/gcc
+      cxxflags: -gxx-name=/usr/tce/packages/gcc/gcc-10.3.1/bin/g++
+      fflags: -gcc-name=/usr/tce/packages/gcc/gcc-10.3.1/bin/gcc
+    operating_system: rhel8
+    target: x86_64
+    modules: []
+    environment: {}
+    extra_rpaths: []
+- compiler:
+    spec: oneapi@=2022.1.0
+    paths:
+      cc: /usr/tce/packages/intel/intel-2022.1.0/compiler/2022.1.0/linux/bin/icx
+      cxx: /usr/tce/packages/intel/intel-2022.1.0/compiler/2022.1.0/linux/bin/icpx
+      f77: /usr/tce/packages/intel/intel-2022.1.0/compiler/2022.1.0/linux/bin/ifx
+      fc: /usr/tce/packages/intel/intel-2022.1.0/compiler/2022.1.0/linux/bin/ifx
+    flags: {}
+    operating_system: rhel8
+    target: x86_64
+    modules: []
+    environment: {}
+    extra_rpaths: []
+- compiler:
+    spec: oneapi@=2022.1.0.gcc.10.3.1
+    paths:
+      cc: /usr/tce/packages/intel/intel-2022.1.0/compiler/2022.1.0/linux/bin/icx
+      cxx: /usr/tce/packages/intel/intel-2022.1.0/compiler/2022.1.0/linux/bin/icpx
+      f77: /usr/tce/packages/intel/intel-2022.1.0/compiler/2022.1.0/linux/bin/ifx
+      fc: /usr/tce/packages/intel/intel-2022.1.0/compiler/2022.1.0/linux/bin/ifx
+    flags:
+      cflags: --gcc-toolchain=/usr/tce/packages/gcc/gcc-10.3.1
+      cxxflags: --gcc-toolchain=/usr/tce/packages/gcc/gcc-10.3.1
+      fflags: -gcc-name=/usr/tce/packages/gcc/gcc-10.3.1/bin/gcc
+    operating_system: rhel8
+    target: x86_64
+    modules: []
+    environment: {}
+    extra_rpaths: []
+- compiler:
+    spec: oneapi@=2023.2.1
+    paths:
+      cc: /usr/tce/packages/intel/intel-2023.2.1/compiler/2023.2.1/linux/bin/icx
+      cxx: /usr/tce/packages/intel/intel-2023.2.1/compiler/2023.2.1/linux/bin/icpx
+      f77: /usr/tce/packages/intel/intel-2023.2.1/compiler/2023.2.1/linux/bin/ifx
+      fc: /usr/tce/packages/intel/intel-2023.2.1/compiler/2023.2.1/linux/bin/ifx
+    flags: {}
+    operating_system: rhel8
+    target: x86_64
+    modules: []
+    environment: {}
+    extra_rpaths: []
+- compiler:
+    spec: oneapi@=2023.2.1.gcc.10.3.1
+    paths:
+      cc: /usr/tce/packages/intel/intel-2023.2.1/compiler/2023.2.1/linux/bin/icx
+      cxx: /usr/tce/packages/intel/intel-2023.2.1/compiler/2023.2.1/linux/bin/icpx
+      f77: /usr/tce/packages/intel/intel-2023.2.1/compiler/2023.2.1/linux/bin/ifx
+      fc: /usr/tce/packages/intel/intel-2023.2.1/compiler/2023.2.1/linux/bin/ifx
+    flags:
+      cflags: --gcc-toolchain=/usr/tce/packages/gcc/gcc-10.3.1
+      cxxflags: --gcc-toolchain=/usr/tce/packages/gcc/gcc-10.3.1
+      fflags: -gcc-name=/usr/tce/packages/gcc/gcc-10.3.1/bin/gcc
+    operating_system: rhel8
+    target: x86_64
+    modules: []
+    environment: {}
+    extra_rpaths: []
+- compiler:
+    spec: oneapi@=2024.2.1
+    paths:
+      cc: /collab/usr/global/tools/intel/toss_4_x86_64_ib/oneapi-2024.2.1/2024.2/bin/icx
+      cxx: /collab/usr/global/tools/intel/toss_4_x86_64_ib/oneapi-2024.2.1/2024.2/bin/icpx
+      f77: /collab/usr/global/tools/intel/toss_4_x86_64_ib/oneapi-2024.2.1/2024.2/bin/ifx
+      fc: /collab/usr/global/tools/intel/toss_4_x86_64_ib/oneapi-2024.2.1/2024.2/bin/ifx
+    flags: {}
+    operating_system: rhel8
+    target: x86_64
+    modules: []
+    environment: {}
+    extra_rpaths: []
+- compiler:
+    spec: clang@=14.0.6
+    paths:
+      cc: /usr/tce/packages/clang/clang-14.0.6/bin/clang
+      cxx: /usr/tce/packages/clang/clang-14.0.6/bin/clang++
+      f77: /usr/tce/packages/gcc/gcc-10.3.1/bin/gfortran
+      fc: /usr/tce/packages/gcc/gcc-10.3.1/bin/gfortran
+    flags: {}
+    operating_system: rhel8
+    target: x86_64
+    modules: []
+    environment: {}
+    extra_rpaths: []
+- compiler:
+    spec: clang@=14.0.6.gcc.10.3.1
+    paths:
+      cc: /usr/tce/packages/clang/clang-14.0.6/bin/clang
+      cxx: /usr/tce/packages/clang/clang-14.0.6/bin/clang++
+      f77: /usr/tce/packages/gcc/gcc-10.3.1/bin/gfortran
+      fc: /usr/tce/packages/gcc/gcc-10.3.1/bin/gfortran
+    flags:
+      cflags: --gcc-toolchain=/usr/tce/packages/gcc/gcc-10.3.1
+      cxxflags: --gcc-toolchain=/usr/tce/packages/gcc/gcc-10.3.1
+    operating_system: rhel8
+    target: x86_64
+    modules: []
+    environment: {}
+    extra_rpaths: []
+- compiler:
+    spec: clang@=19.0.0
+    paths:
+      cc: /usr/workspace/raja-dev/clang_sycl_2f03ef85fee5_hip_gcc10.3.1_rocm5.7.1/bin/clang
+      cxx: /usr/workspace/raja-dev/clang_sycl_2f03ef85fee5_hip_gcc10.3.1_rocm5.7.1/bin/clang++
+      f77: /usr/tce/packages/gcc/gcc-10.3.1/bin/gfortran
+      fc: /usr/tce/packages/gcc/gcc-10.3.1/bin/gfortran
+    flags: {}
+    operating_system: rhel8
+    target: x86_64
+    modules: []
+    environment: {}
+    extra_rpaths: [/usr/workspace/raja-dev/clang_sycl_2f03ef85fee5_hip_gcc10.3.1_rocm5.7.1/lib, /usr/workspace/raja-dev/clang_sycl_2f03ef85fee5_hip_gcc10.3.1_rocm5.7.1/lib64]
+- compiler:
+    spec: clang@=20.0.0
+    paths:
+      cc: /usr/workspace/raja-dev/clang_sycl_730cd3a5275f_hip_gcc10.3.1_rocm6.0.2/bin/clang
+      cxx: /usr/workspace/raja-dev/clang_sycl_730cd3a5275f_hip_gcc10.3.1_rocm6.0.2/bin/clang++
+      f77: /usr/tce/packages/gcc/gcc-10.3.1/bin/gfortran
+      fc: /usr/tce/packages/gcc/gcc-10.3.1/bin/gfortran
+    flags: {}
+    operating_system: rhel8
+    target: x86_64
+    modules: []
+    environment: {}
+    extra_rpaths: [/usr/workspace/raja-dev/clang_sycl_730cd3a5275f_hip_gcc10.3.1_rocm6.0.2/lib, /usr/workspace/raja-dev/clang_sycl_730cd3a5275f_hip_gcc10.3.1_rocm6.0.2/lib64]
+- compiler:
+    spec: gcc@=10.3.1
+    paths:
+      cc: /usr/tce/packages/gcc/gcc-10.3.1/bin/gcc
+      cxx: /usr/tce/packages/gcc/gcc-10.3.1/bin/g++
+      f77: /usr/tce/packages/gcc/gcc-10.3.1/bin/gfortran
+      fc: /usr/tce/packages/gcc/gcc-10.3.1/bin/gfortran
+    flags: {}
+    operating_system: rhel8
+    target: x86_64
+    modules: []
+    environment: {}
+    extra_rpaths: []
+- compiler:
+    spec: gcc@=11.2.1
+    paths:
+      cc: /usr/tce/packages/gcc/gcc-11.2.1/bin/gcc
+      cxx: /usr/tce/packages/gcc/gcc-11.2.1/bin/g++
+      f77: /usr/tce/packages/gcc/gcc-11.2.1/bin/gfortran
+      fc: /usr/tce/packages/gcc/gcc-11.2.1/bin/gfortran
+    flags: {}
+    operating_system: rhel8
+    target: x86_64
+    modules: []
+    environment: {}
+    extra_rpaths: []
+- compiler:
+    spec: gcc@=12.1.1
+    paths:
+      cc: /usr/tce/packages/gcc/gcc-12.1.1/bin/gcc
+      cxx: /usr/tce/packages/gcc/gcc-12.1.1/bin/g++
+      f77: /usr/tce/packages/gcc/gcc-12.1.1/bin/gfortran
+      fc: /usr/tce/packages/gcc/gcc-12.1.1/bin/gfortran
+    flags: {}
+    operating_system: rhel8
+    target: x86_64
+    modules: []
+    environment: {}
+    extra_rpaths: []
diff --git a/spack-environments/radiuss/ruby/config.yaml b/spack-environments/radiuss/ruby/config.yaml
new file mode 100644
index 0000000..6be0e9e
--- /dev/null
+++ b/spack-environments/radiuss/ruby/config.yaml
@@ -0,0 +1,2 @@
+config:
+  build_jobs: 28
diff --git a/spack-environments/radiuss/ruby/packages.yaml b/spack-environments/radiuss/ruby/packages.yaml
new file mode 100644
index 0000000..ec95540
--- /dev/null
+++ b/spack-environments/radiuss/ruby/packages.yaml
@@ -0,0 +1,282 @@
+packages::
+  all:
+    require:
+    - 'target=cascadelake'
+    - spec: '^blt%oneapi'
+      when: '%oneapi ^blt'
+    - spec: '^blt%gcc'
+      when: '%gcc ^blt'
+    - spec: '^blt%intel'
+      when: '%intel ^blt'
+    compiler: [gcc, intel, clang, oneapi]
+    providers:
+      blas: [openblas]
+      lapack: [netlib-lapack]
+      mpi: [mvapich2]
+  gcc-runtime:
+    require:
+    - '%gcc'
+  intel-oneapi-runtime:
+    require:
+    - '%oneapi'
+  cmake:
+    version: [3.23.1, 3.22.4, 3.21.1, 3.19.2, 3.14.5]
+    buildable: false
+    externals:
+    - spec: cmake@3.14.5
+      prefix: /usr/tce/packages/cmake/cmake-3.14.5
+    - spec: cmake@3.19.2
+      prefix: /usr/tce/packages/cmake/cmake-3.19.2
+    - spec: cmake@3.21.1
+      prefix: /usr/tce/packages/cmake/cmake-3.21.1
+    - spec: cmake@3.22.4
+      prefix: /usr/tce/packages/cmake/cmake-3.22.4
+    - spec: cmake@3.23.1
+      prefix: /usr/tce/packages/cmake/cmake-3.23.1
+  mvapich2:
+    buildable: false
+    externals:
+    - spec: mvapich2@2.3.7%intel@=19.1.2 ~cuda~debug~regcache~wrapperrpath ch3_rank_bits=32
+        file_systems=lustre,nfs,ufs process_managers=slurm
+      prefix: /usr/tce/packages/mvapich2/mvapich2-2.3.7-intel-classic-19.1.2
+    - spec: mvapich2@2.3.7%intel@=19.1.2.gcc.10.3.1 ~cuda~debug~regcache~wrapperrpath ch3_rank_bits=32
+        file_systems=lustre,nfs,ufs process_managers=slurm
+      prefix: /usr/tce/packages/mvapich2/mvapich2-2.3.7-intel-classic-19.1.2
+    - spec: mvapich2@2.3.7%intel@=2021.6.0 ~cuda~debug~regcache~wrapperrpath ch3_rank_bits=32
+        file_systems=lustre,nfs,ufs process_managers=slurm
+      prefix: /usr/tce/packages/mvapich2/mvapich2-2.3.7-intel-classic-2021.6.0
+    - spec: mvapich2@2.3.7%intel@=2021.6.0.gcc.10.3.1 ~cuda~debug~regcache~wrapperrpath ch3_rank_bits=32
+        file_systems=lustre,nfs,ufs process_managers=slurm
+      prefix: /usr/tce/packages/mvapich2/mvapich2-2.3.7-intel-classic-2021.6.0
+    - spec: mvapich2@2.3.7%oneapi@=2022.1.0 ~cuda~debug~regcache~wrapperrpath ch3_rank_bits=32
+        file_systems=lustre,nfs,ufs process_managers=slurm
+      prefix: /usr/tce/packages/mvapich2/mvapich2-2.3.7-intel-2022.1.0
+    - spec: mvapich2@2.3.7%oneapi@=2022.1.0.gcc.10.3.1 ~cuda~debug~regcache~wrapperrpath ch3_rank_bits=32
+        file_systems=lustre,nfs,ufs process_managers=slurm
+      prefix: /usr/tce/packages/mvapich2/mvapich2-2.3.7-intel-2022.1.0
+    - spec: mvapich2@2.3.7%oneapi@=2023.2.1 ~cuda~debug~regcache~wrapperrpath ch3_rank_bits=32
+        file_systems=lustre,nfs,ufs process_managers=slurm
+      prefix: /usr/tce/packages/mvapich2/mvapich2-2.3.7-intel-2023.2.1
+    - spec: mvapich2@2.3.7%oneapi@=2023.2.1.gcc.10.3.1 ~cuda~debug~regcache~wrapperrpath ch3_rank_bits=32
+        file_systems=lustre,nfs,ufs process_managers=slurm
+      prefix: /usr/tce/packages/mvapich2/mvapich2-2.3.7-intel-2023.2.1
+    - spec: mvapich2@2.3.7%clang@=14.0.6 ~cuda~debug~regcache~wrapperrpath ch3_rank_bits=32
+        file_systems=lustre,nfs,ufs process_managers=slurm
+      prefix: /usr/tce/packages/mvapich2/mvapich2-2.3.7-clang-14.0.6
+    - spec: mvapich2@2.3.7%clang@=14.0.6.gcc.10.3.1 ~cuda~debug~regcache~wrapperrpath ch3_rank_bits=32
+        file_systems=lustre,nfs,ufs process_managers=slurm
+      prefix: /usr/tce/packages/mvapich2/mvapich2-2.3.7-clang-14.0.6
+    - spec: mvapich2@2.3.7%gcc@=10.3.1 ~cuda~debug~regcache~wrapperrpath ch3_rank_bits=32
+        file_systems=lustre,nfs,ufs process_managers=slurm
+      prefix: /usr/tce/packages/mvapich2/mvapich2-2.3.7-gcc-10.3.1
+    - spec: mvapich2@2.3.7%gcc@=11.2.1 ~cuda~debug~regcache~wrapperrpath ch3_rank_bits=32
+        file_systems=lustre,nfs,ufs process_managers=slurm
+      prefix: /usr/tce/packages/mvapich2/mvapich2-2.3.7-gcc-11.2.1
+    - spec: mvapich2@2.3.7%gcc@=12.1.1 ~cuda~debug~regcache~wrapperrpath ch3_rank_bits=32
+        file_systems=lustre,nfs,ufs process_managers=slurm
+      prefix: /usr/tce/packages/mvapich2/mvapich2-2.3.7-gcc-12.1.1
+
+  autoconf:
+    buildable: false
+    externals:
+    - spec: autoconf@2.69
+      prefix: /usr
+  automake:
+    buildable: false
+    externals:
+    - spec: automake@1.16.1
+      prefix: /usr
+  binutils:
+    buildable: false
+    externals:
+    - spec: binutils@2.30
+      prefix: /usr
+  bison:
+    buildable: false
+    externals:
+    - spec: bison@3.0.4
+      prefix: /usr
+  bzip2:
+    buildable: false
+    externals:
+    - spec: bzip2@1.0.6
+      prefix: /usr
+  curl:
+    buildable: false
+    externals:
+    - spec: curl@7.61.1
+      prefix: /usr
+  diffutils:
+    buildable: false
+    externals:
+    - spec: diffutils@3.6
+      prefix: /usr
+  elfutils:
+    buildable: false
+    externals:
+    - spec: elfutils@0.190
+      prefix: /usr
+  expat:
+    buildable: false
+    externals:
+    - spec: expat@2.2.5
+      prefix: /usr
+  flex:
+    buildable: false
+    externals:
+    - spec: flex@2.6.1
+      prefix: /usr
+  findutils:
+    buildable: false
+    externals:
+    - spec: findutils@4.6.0
+      prefix: /usr
+  gettext:
+    buildable: false
+    externals:
+    - spec: gettext@0.19.8.1
+      prefix: /usr
+  ghostscript:
+    buildable: false
+    externals:
+    - spec: ghostscript@9.27
+      prefix: /usr
+  gmake:
+    buildable: false
+    externals:
+    - spec: gmake@4.2.1
+      prefix: /usr
+  graphviz:
+    buildable: false
+    externals:
+    - spec: graphviz@2.40.1
+      prefix: /usr
+  groff:
+    buildable: false
+    externals:
+    - spec: groff@1.22.3
+      prefix: /usr
+  hwloc:
+    buildable: false
+    externals:
+    - spec: hwloc@2.11.1
+      prefix: /usr
+  libepoxy:
+    buildable: false
+    externals:
+    - spec: libepoxy@1.5.8
+      prefix: /usr
+  libtool:
+    buildable: false
+    externals:
+    - spec: libtool@2.4.6
+      prefix: /usr
+# NOTE: removed since fails on clang builds
+# libunwind:
+#   buildable: false
+#   externals:
+#   - spec: libunwind@1.3.1
+#     prefix: /usr
+  libunwind:
+    buildable: false
+    version: [8.0.1]
+    externals:
+    - spec: libunwind@8.0.1
+      prefix: /usr
+  libx11:
+    buildable: false
+    externals:
+    - spec: libx11@1.6.8
+      prefix: /usr
+  lua:
+    buildable: false
+    externals:
+    - spec: lua@5.3.4
+      prefix: /usr
+  m4:
+    buildable: false
+    externals:
+    - spec: m4@1.4.18
+      prefix: /usr
+  netlib-lapack:
+    buildable: false
+    externals:
+    - spec: netlib-lapack@3.8.0
+      prefix: /usr
+  ninja:
+    buildable: false
+    externals:
+    - spec: ninja@1.11.1
+      prefix: /usr/tce/packages/ninja/ninja-1.11.1
+  openblas:
+    buildable: false
+    externals:
+    - prefix: /usr
+      spec: openblas@0.3.15
+  opengl:
+    buildable: false
+    externals:
+    - spec: opengl@1.7.0
+      prefix: /usr
+  openglu:
+    buildable: false
+    externals:
+    - spec: openglu@1.3.1
+      prefix: /usr
+  openssl:
+    buildable: false
+    externals:
+    - spec: openssl@1.1.1k
+      prefix: /usr
+  papi:
+    buildable: false
+    version: [6.0.0.1]
+    externals:
+    - spec: papi@6.0.0.1
+      prefix: /usr/tce/packages/papi/papi-6.0.0.1
+  perl:
+    buildable: false
+    externals:
+    - spec: perl@5.26.3
+      prefix: /usr
+  pkg-config:
+    buildable: false
+    externals:
+    - spec: pkg-config@1.4.2
+      prefix: /usr
+  python:
+    buildable: false
+    version: [3.10.8]
+    externals:
+    - spec: python@3.10.8
+      prefix: /usr/tce/packages/python/python-3.10.8
+  readline:
+    buildable: false
+    externals:
+    - spec: readline@7.0
+      prefix: /usr
+  slurm:
+    buildable: false
+    externals:
+    - spec: slurm@23-11-1-1
+      prefix: /usr
+  swig:
+    buildable: false
+    externals:
+    - spec: swig@3.0.12
+      prefix: /usr
+  tar:
+    buildable: false
+    externals:
+    - spec: tar@1.30
+      prefix: /usr
+  unzip:
+    buildable: false
+    externals:
+    - spec: unzip@6.0
+      prefix: /usr
+  zlib:
+    buildable: false
+    externals:
+    - spec: zlib@1.2.11
+      prefix: /usr
diff --git a/spack-environments/radiuss/spack.yaml b/spack-environments/radiuss/spack.yaml
index 8802829..e52799f 100644
--- a/spack-environments/radiuss/spack.yaml
+++ b/spack-environments/radiuss/spack.yaml
@@ -8,8 +8,9 @@
 
 spack:
   #[general--]
-  include: [$SYS_TYPE]
+  include: [$LCSCHEDCLUSTER]
   concretizer:
+    reuse: false
     unify: false
   view: false
   #[--general]
@@ -26,20 +27,57 @@ spack:
     test_stage: $user_cache_path/test
     misc_cache: $user_cache_path/misc
     flags:
-      keep_werror: all
+      keep_werror: 'all'
   #[--config-override]
 
   #[definitions--]
   definitions:
   - compilers:
+    - '+rocm amdgpu_target=gfx906 %rocmcc@=5.7.1 ^hip@5.7.1'
+    when: env.get("LCSCHEDCLUSTER", "") == "corona"
+  - compilers:
+    - '%oneapi@=2023.2.1'
+    - '%clang@=14.0.6'
     - '%gcc@=10.3.1'
+    when: env.get("LCSCHEDCLUSTER", "") == "ruby"
+  - compilers:
+    - '%oneapi@=2023.2.1'
     - '%clang@=14.0.6'
-    when: env.get("SYS_TYPE", "") == "toss_4_x86_64_ib"
+    - '%gcc@=11.2.1'
+    when: env.get("LCSCHEDCLUSTER", "") == "poodle"
   - compilers:
-    - '%xl@=16.1.1.12.gcc.8.3.1'
-    when: env.get("SYS_TYPE", "") == "blueos_3_ppc64le_ib_p9"
+    - '+cuda %clang@=12.0.1.ibm.gcc.8.3.1 ^cuda@11.2.0+allow-unsupported-compilers'
+    - '+cuda %clang@=12.0.1.gcc.8.3.1 ^cuda@11.2.0+allow-unsupported-compilers'
+    - '+cuda %clang@=14.0.5.gcc.8.3.1 ^cuda@11.7.0+allow-unsupported-compilers'
+    - '+cuda %clang@=16.0.6.ibm.cuda.11.8.0.gcc.11.2.1 ^cuda@11.8.0+allow-unsupported-compilers'
+    - '+cuda %clang@=16.0.6.cuda.11.8.0.gcc.11.2.1 ^cuda@11.8.0+allow-unsupported-compilers'
+    - '+cuda %gcc@=11.2.1 ^cuda@11.8.0+allow-unsupported-compilers'
+    when: env.get("LCSCHEDCLUSTER", "") == "lassen"
+  - compilers:
+    - '+rocm amdgpu_target=gfx90a %rocmcc@=6.3.0 ^hip@6.3.0'
+    - '%cce@=18.0.1'
+    when: env.get("LCSCHEDCLUSTER", "") == "tioga"
   #[definitions--]
 
+  - radiuss-projects:
+    - mfem
+    - hypre
+    - sundials
+#    - samrai
+#    - xbraid
+    - umpire
+    - raja
+    - raja-perf
+    - chai
+    - care
+#    - py-maestrowf
+#    - conduit
+#    - zfp
+    - axom
+    - caliper
+#    - ascent
+#    - scr
+    when: env.get("LCSCHEDCLUSTER", "") in ["corona", "tioga"]
   - radiuss-projects:
     - mfem
     - hypre
@@ -48,6 +86,9 @@ spack:
     - xbraid
     - umpire
     - raja
+    - raja-perf
+    - chai
+    - care
     - py-maestrowf
     - conduit
     - zfp
@@ -55,23 +96,26 @@ spack:
     - caliper
     - ascent
     - scr
-    when: env.get("SYS_TYPE", "") == "toss_4_x86_64_ib"
+    when: env.get("LCSCHEDCLUSTER", "") in ["ruby", "poodle"]
   - radiuss-projects:
     - mfem
     - hypre
     - sundials
-    - samrai
-    - xbraid
+#    - samrai
+#    - xbraid
     - umpire
     - raja
-    - py-maestrowf
-    - conduit
+    - raja-perf
+    - chai
+    - care
+#    - py-maestrowf
+#    - conduit
     - zfp
     - axom
     - caliper
     - ascent
-    - scr
-    when: env.get("SYS_TYPE", "") == "blueos_3_ppc64le_ib_p9"
+#    - scr
+    when: env.get("LCSCHEDCLUSTER", "") == "lassen"
   - dependencies: []
   #[--definitions]
 
diff --git a/spack-environments/radiuss/tioga/compilers.yaml b/spack-environments/radiuss/tioga/compilers.yaml
new file mode 100644
index 0000000..222c995
--- /dev/null
+++ b/spack-environments/radiuss/tioga/compilers.yaml
@@ -0,0 +1,261 @@
+compilers::
+- compiler:
+    spec: cce@=12.0.3
+    paths:
+      cc: /usr/tce/packages/cce-tce/cce-12.0.3/bin/craycc
+      cxx: /usr/tce/packages/cce-tce/cce-12.0.3/bin/crayCC
+      f77: /usr/tce/packages/cce-tce/cce-12.0.3/bin/crayftn
+      fc: /usr/tce/packages/cce-tce/cce-12.0.3/bin/crayftn
+    flags: {}
+    operating_system: rhel8
+    target: x86_64
+    modules: []
+    environment: {}
+    extra_rpaths: []
+- compiler:
+    spec: cce@=13.0.2
+    paths:
+      cc: /usr/tce/packages/cce-tce/cce-13.0.2/bin/craycc
+      cxx: /usr/tce/packages/cce-tce/cce-13.0.2/bin/crayCC
+      f77: /usr/tce/packages/cce-tce/cce-13.0.2/bin/crayftn
+      fc: /usr/tce/packages/cce-tce/cce-13.0.2/bin/crayftn
+    flags: {}
+    operating_system: rhel8
+    target: x86_64
+    modules: []
+    environment: {}
+    extra_rpaths: []
+- compiler:
+    spec: cce@=14.0.3
+    paths:
+      cc: /usr/tce/packages/cce-tce/cce-14.0.3/bin/craycc
+      cxx: /usr/tce/packages/cce-tce/cce-14.0.3/bin/crayCC
+      f77: /usr/tce/packages/cce-tce/cce-14.0.3/bin/crayftn
+      fc: /usr/tce/packages/cce-tce/cce-14.0.3/bin/crayftn
+    flags: {}
+    operating_system: rhel8
+    target: x86_64
+    modules: []
+    environment: {}
+    extra_rpaths: []
+- compiler:
+    spec: cce@=15.0.1
+    paths:
+      cc: /usr/tce/packages/cce-tce/cce-15.0.1/bin/craycc
+      cxx: /usr/tce/packages/cce-tce/cce-15.0.1/bin/crayCC
+      f77: /usr/tce/packages/cce-tce/cce-15.0.1/bin/crayftn
+      fc: /usr/tce/packages/cce-tce/cce-15.0.1/bin/crayftn
+    flags: {}
+    operating_system: rhel8
+    target: x86_64
+    modules: []
+    environment: {}
+    extra_rpaths: []
+- compiler:
+    spec: cce@=16.0.1
+    paths:
+      cc: /usr/tce/packages/cce-tce/cce-16.0.1/bin/craycc
+      cxx: /usr/tce/packages/cce-tce/cce-16.0.1/bin/crayCC
+      f77: /usr/tce/packages/cce-tce/cce-16.0.1/bin/crayftn
+      fc: /usr/tce/packages/cce-tce/cce-16.0.1/bin/crayftn
+    flags: {}
+    operating_system: rhel8
+    target: x86_64
+    modules: []
+    environment: {}
+    extra_rpaths: []
+- compiler:
+    spec: cce@=17.0.1
+    paths:
+      cc: /usr/tce/packages/cce-tce/cce-17.0.1/bin/craycc
+      cxx: /usr/tce/packages/cce-tce/cce-17.0.1/bin/crayCC
+      f77: /usr/tce/packages/cce-tce/cce-17.0.1/bin/crayftn
+      fc: /usr/tce/packages/cce-tce/cce-17.0.1/bin/crayftn
+    flags: {}
+    operating_system: rhel8
+    target: x86_64
+    modules: []
+    environment: {}
+    extra_rpaths: [/opt/cray/pe/mpich/8.1.31/gtl/lib]
+- compiler:
+    spec: cce@=18.0.1
+    paths:
+      cc: /usr/tce/packages/cce-tce/cce-18.0.1/bin/craycc
+      cxx: /usr/tce/packages/cce-tce/cce-18.0.1/bin/crayCC
+      f77: /usr/tce/packages/cce-tce/cce-18.0.1/bin/crayftn
+      fc: /usr/tce/packages/cce-tce/cce-18.0.1/bin/crayftn
+    flags: {}
+    operating_system: rhel8
+    target: x86_64
+    modules: []
+    environment: {}
+    extra_rpaths: [/opt/cray/pe/mpich/8.1.31/gtl/lib]
+- compiler:
+    spec: clang@=13.0.1
+    paths:
+      cc: /usr/bin/clang
+      cxx: /usr/bin/clang++
+      f77: /usr/bin/gfortran
+      fc: /usr/bin/gfortran
+    flags: {}
+    operating_system: rhel8
+    target: x86_64
+    modules: []
+    environment: {}
+    extra_rpaths: []
+- compiler:
+    spec: gcc@=10.3.1
+    paths:
+      cc: /usr/tce/packages/gcc/gcc-10.3.1-magic/bin/gcc
+      cxx: /usr/tce/packages/gcc/gcc-10.3.1-magic/bin/g++
+      f77: /usr/tce/packages/gcc/gcc-10.3.1-magic/bin/gfortran
+      fc: /usr/tce/packages/gcc/gcc-10.3.1-magic/bin/gfortran
+    flags: {}
+    operating_system: rhel8
+    target: x86_64
+    modules: []
+    environment: {}
+    extra_rpaths: []
+- compiler:
+    spec: gcc@=11.2.1
+    paths:
+      cc: /usr/tce/packages/gcc/gcc-11.2.1-magic/bin/gcc
+      cxx: /usr/tce/packages/gcc/gcc-11.2.1-magic/bin/g++
+      f77: /usr/tce/packages/gcc/gcc-11.2.1-magic/bin/gfortran
+      fc: /usr/tce/packages/gcc/gcc-11.2.1-magic/bin/gfortran
+    flags: {}
+    operating_system: rhel8
+    target: x86_64
+    modules: []
+    environment: {}
+    extra_rpaths: []
+- compiler:
+    spec: gcc@=12.2.1
+    paths:
+      cc: /usr/tce/packages/gcc/gcc-12.2.1-magic/bin/gcc
+      cxx: /usr/tce/packages/gcc/gcc-12.2.1-magic/bin/g++
+      f77: /usr/tce/packages/gcc/gcc-12.2.1-magic/bin/gfortran
+      fc: /usr/tce/packages/gcc/gcc-12.2.1-magic/bin/gfortran
+    flags: {}
+    operating_system: rhel8
+    target: x86_64
+    modules: []
+    environment: {}
+    extra_rpaths: []
+- compiler:
+    spec: rocmcc@=5.2.3
+    paths:
+      cc: /opt/rocm-5.2.3/llvm/bin/amdclang
+      cxx: /opt/rocm-5.2.3/llvm/bin/amdclang++
+      f77: /opt/rocm-5.2.3/llvm/bin/amdflang
+      fc: /opt/rocm-5.2.3/llvm/bin/amdflang
+    flags: {}
+    operating_system: rhel8
+    target: x86_64
+    modules: []
+    environment: {}
+    extra_rpaths: [/opt/rocm-5.2.3/lib, /opt/rocm-5.2.3/llvm/lib]
+- compiler:
+    spec: rocmcc@=5.3.0
+    paths:
+      cc: /opt/rocm-5.3.0/llvm/bin/amdclang
+      cxx: /opt/rocm-5.3.0/llvm/bin/amdclang++
+      f77: /opt/rocm-5.3.0/llvm/bin/amdflang
+      fc: /opt/rocm-5.3.0/llvm/bin/amdflang
+    flags: {}
+    operating_system: rhel8
+    target: x86_64
+    modules: []
+    environment: {}
+    extra_rpaths: [/opt/rocm-5.3.0/lib, /opt/rocm-5.3.0/llvm/lib]
+- compiler:
+    spec: rocmcc@=5.4.3
+    paths:
+      cc: /opt/rocm-5.4.3/llvm/bin/amdclang
+      cxx: /opt/rocm-5.4.3/llvm/bin/amdclang++
+      f77: /opt/rocm-5.4.3/llvm/bin/amdflang
+      fc: /opt/rocm-5.4.3/llvm/bin/amdflang
+    flags: {}
+    operating_system: rhel8
+    target: x86_64
+    modules: []
+    environment: {}
+    extra_rpaths: [/opt/rocm-5.4.3/lib, /opt/rocm-5.4.3/llvm/lib]
+- compiler:
+    spec: rocmcc@=5.5.1
+    paths:
+      cc: /opt/rocm-5.5.1/llvm/bin/amdclang
+      cxx: /opt/rocm-5.5.1/llvm/bin/amdclang++
+      f77: /opt/rocm-5.5.1/llvm/bin/amdflang
+      fc: /opt/rocm-5.5.1/llvm/bin/amdflang
+    flags: {}
+    operating_system: rhel8
+    target: x86_64
+    modules: []
+    environment: {}
+    extra_rpaths: [/opt/rocm-5.5.1/lib, /opt/rocm-5.5.1/llvm/lib]
+- compiler:
+    spec: rocmcc@=5.6.1
+    paths:
+      cc: /opt/rocm-5.6.1/llvm/bin/amdclang
+      cxx: /opt/rocm-5.6.1/llvm/bin/amdclang++
+      f77: /opt/rocm-5.6.1/llvm/bin/amdflang
+      fc: /opt/rocm-5.6.1/llvm/bin/amdflang
+    flags: {}
+    operating_system: rhel8
+    target: x86_64
+    modules: []
+    environment: {}
+    extra_rpaths: [/opt/rocm-5.6.1/lib, /opt/rocm-5.6.1/llvm/lib]
+- compiler:
+    spec: rocmcc@=5.7.1
+    paths:
+      cc: /opt/rocm-5.7.1/llvm/bin/amdclang
+      cxx: /opt/rocm-5.7.1/llvm/bin/amdclang++
+      f77: /opt/rocm-5.7.1/llvm/bin/amdflang
+      fc: /opt/rocm-5.7.1/llvm/bin/amdflang
+    flags: {}
+    operating_system: rhel8
+    target: x86_64
+    modules: []
+    environment: {}
+    extra_rpaths: [/opt/rocm-5.7.1/lib, /opt/rocm-5.7.1/llvm/lib]
+- compiler:
+    spec: rocmcc@=6.1.2
+    paths:
+      cc: /opt/rocm-6.1.2/llvm/bin/amdclang
+      cxx: /opt/rocm-6.1.2/llvm/bin/amdclang++
+      f77: /opt/rocm-6.1.2/llvm/bin/amdflang
+      fc: /opt/rocm-6.1.2/llvm/bin/amdflang
+    flags: {}
+    operating_system: rhel8
+    target: x86_64
+    modules: []
+    environment: {}
+    extra_rpaths: [/opt/rocm-6.1.2/lib, /opt/rocm-6.1.2/llvm/lib, /opt/cray/pe/mpich/8.1.31/gtl/lib]
+- compiler:
+    spec: rocmcc@=6.2.4
+    paths:
+      cc: /opt/rocm-6.2.4/llvm/bin/amdclang
+      cxx: /opt/rocm-6.2.4/llvm/bin/amdclang++
+      f77: /opt/rocm-6.2.4/llvm/bin/amdflang
+      fc: /opt/rocm-6.2.4/llvm/bin/amdflang
+    flags: {}
+    operating_system: rhel8
+    target: x86_64
+    modules: []
+    environment: {}
+    extra_rpaths: [/opt/rocm-6.2.4/lib, /opt/rocm-6.2.4/llvm/lib, /opt/cray/pe/mpich/8.1.31/gtl/lib]
+- compiler:
+    spec: rocmcc@=6.3.0
+    paths:
+      cc: /opt/rocm-6.3.0/llvm/bin/amdclang
+      cxx: /opt/rocm-6.3.0/llvm/bin/amdclang++
+      f77: /opt/rocm-6.3.0/llvm/bin/amdflang
+      fc: /opt/rocm-6.3.0/llvm/bin/amdflang
+    flags: {}
+    operating_system: rhel8
+    target: x86_64
+    modules: []
+    environment: {}
+    extra_rpaths: [/opt/rocm-6.3.0/lib, /opt/rocm-6.3.0/llvm/lib, /opt/cray/pe/mpich/8.1.31/gtl/lib]
diff --git a/spack-environments/radiuss/tioga/config.yaml b/spack-environments/radiuss/tioga/config.yaml
new file mode 100644
index 0000000..874ad98
--- /dev/null
+++ b/spack-environments/radiuss/tioga/config.yaml
@@ -0,0 +1,2 @@
+config:
+  build_jobs: 32
diff --git a/spack-environments/radiuss/tioga/packages.yaml b/spack-environments/radiuss/tioga/packages.yaml
new file mode 100644
index 0000000..6038592
--- /dev/null
+++ b/spack-environments/radiuss/tioga/packages.yaml
@@ -0,0 +1,436 @@
+packages::
+  all:
+    require: target=zen3
+    compiler: [rocmcc, cce, clang, gcc]
+    providers:
+      blas: [netlib-lapack]
+      lapack: [netlib-lapack]
+      mpi: [cray-mpich]
+  cmake:
+    version: [3.24.2, 3.23.1, 3.22.4, 3.21.1, 3.19.2, 3.14.5]
+    buildable: false
+    externals:
+    - spec: cmake@3.14.5
+      prefix: /usr/tce/packages/cmake/cmake-3.14.5
+    - spec: cmake@3.19.2
+      prefix: /usr/tce/packages/cmake/cmake-3.19.2
+    - spec: cmake@3.21.1
+      prefix: /usr/tce/packages/cmake/cmake-3.21.1
+    - spec: cmake@3.22.4
+      prefix: /usr/tce/packages/cmake/cmake-3.22.4
+    - spec: cmake@3.23.1
+      prefix: /usr/tce/packages/cmake/cmake-3.23.1
+    - spec: cmake@3.24.2
+      prefix: /usr/tce/packages/cmake/cmake-3.24.2
+  cuda:
+    version: [11.4.120]
+    buildable: false
+    externals:
+    - spec: cuda@11.4.120
+      prefix: /opt/toss/cudatoolkit/11.4/
+  hip:
+    version: [5.2.3, 5.3.0, 5.4.3, 5.5.1, 5.6.1, 5.7.1, 6.1.2, 6.2.4, 6.3.0]
+    buildable: false
+    externals:
+    - spec: hip@5.2.3%rocmcc@5.2.3
+      prefix: /opt/rocm-5.2.3/hip
+    - spec: hip@5.3.0%rocmcc@5.3.0
+      prefix: /opt/rocm-5.3.0/hip
+    - spec: hip@5.4.3%rocmcc@5.4.3
+      prefix: /opt/rocm-5.4.3/hip
+    - spec: hip@5.5.1%rocmcc@5.5.1
+      prefix: /opt/rocm-5.5.1/hip
+    - spec: hip@5.6.1%rocmcc@5.6.1
+      prefix: /opt/rocm-5.6.1/hip
+    - spec: hip@5.7.1%rocmcc@5.7.1
+      prefix: /opt/rocm-5.7.1/hip
+    - spec: hip@6.1.2%rocmcc@6.1.2
+      prefix: /opt/rocm-6.1.2
+    - spec: hip@6.2.4%rocmcc@6.2.4
+      prefix: /opt/rocm-6.2.4
+    - spec: hip@6.3.0%rocmcc@6.3.0
+      prefix: /opt/rocm-6.3.0
+  hipsparse:
+    version: [5.2.3, 5.3.0, 5.4.3, 5.5.1, 5.6.1, 5.7.1, 6.1.2, 6.2.4, 6.3.0]
+    buildable: false
+    externals:
+    - spec: hipsparse@5.2.3%rocmcc@5.2.3
+      prefix: /opt/rocm-5.2.3
+    - spec: hipsparse@5.3.0%rocmcc@5.3.0
+      prefix: /opt/rocm-5.3.0
+    - spec: hipsparse@5.4.3%rocmcc@5.4.3
+      prefix: /opt/rocm-5.4.3
+    - spec: hipsparse@5.5.1%rocmcc@5.5.1
+      prefix: /opt/rocm-5.5.1
+    - spec: hipsparse@5.6.1%rocmcc@5.6.1
+      prefix: /opt/rocm-5.6.1
+    - spec: hipsparse@5.7.1%rocmcc@5.7.1
+      prefix: /opt/rocm-5.7.1
+    - spec: hipsparse@6.1.2%rocmcc@6.1.2
+      prefix: /opt/rocm-6.1.2
+    - spec: hipsparse@6.2.4%rocmcc@6.2.4
+      prefix: /opt/rocm-6.2.4
+    - spec: hipsparse@6.3.0%rocmcc@6.3.0
+      prefix: /opt/rocm-6.3.0
+  llvm-amdgpu:
+    version: [5.2.3, 5.3.0, 5.4.3, 5.5.1, 5.6.1, 5.7.1, 6.1.2, 6.2.4, 6.3.0]
+    buildable: false
+    externals:
+    - spec: llvm-amdgpu@5.2.3%rocmcc@5.2.3
+      prefix: /opt/rocm-5.2.3/llvm
+    - spec: llvm-amdgpu@5.3.0%rocmcc@5.3.0
+      prefix: /opt/rocm-5.3.0/llvm
+    - spec: llvm-amdgpu@5.4.3%rocmcc@5.4.3
+      prefix: /opt/rocm-5.4.3/llvm
+    - spec: llvm-amdgpu@5.5.1%rocmcc@5.5.1
+      prefix: /opt/rocm-5.5.1/llvm
+    - spec: llvm-amdgpu@5.6.1%rocmcc@5.6.1
+      prefix: /opt/rocm-5.6.1/llvm
+    - spec: llvm-amdgpu@5.7.1%rocmcc@5.7.1
+      prefix: /opt/rocm-5.7.1/llvm
+    - spec: llvm-amdgpu@6.1.2%rocmcc@6.1.2
+      prefix: /opt/rocm-6.1.2/llvm
+    - spec: llvm-amdgpu@6.2.4%rocmcc@6.2.4
+      prefix: /opt/rocm-6.2.4/llvm
+    - spec: llvm-amdgpu@6.3.0%rocmcc@6.3.0
+      prefix: /opt/rocm-6.3.0/llvm
+  hsa-rocr-dev:
+    version: [5.2.3, 5.3.0, 5.4.3, 5.5.1, 5.6.1, 5.7.1, 6.1.2, 6.2.4, 6.3.0]
+    buildable: false
+    externals:
+    - spec: hsa-rocr-dev@5.2.3%rocmcc@5.2.3
+      prefix: /opt/rocm-5.2.3
+    - spec: hsa-rocr-dev@5.3.0%rocmcc@5.3.0
+      prefix: /opt/rocm-5.3.0
+    - spec: hsa-rocr-dev@5.4.3%rocmcc@5.4.3
+      prefix: /opt/rocm-5.4.3
+    - spec: hsa-rocr-dev@5.5.1%rocmcc@5.5.1
+      prefix: /opt/rocm-5.5.1
+    - spec: hsa-rocr-dev@5.6.1%rocmcc@5.6.1
+      prefix: /opt/rocm-5.6.1
+    - spec: hsa-rocr-dev@5.7.1%rocmcc@5.7.1
+      prefix: /opt/rocm-5.7.1
+    - spec: hsa-rocr-dev@6.1.2%rocmcc@6.1.2
+      prefix: /opt/rocm-6.1.2
+    - spec: hsa-rocr-dev@6.2.4%rocmcc@6.2.4
+      prefix: /opt/rocm-6.2.4
+    - spec: hsa-rocr-dev@6.3.0%rocmcc@6.3.0
+      prefix: /opt/rocm-6.3.0
+  rocminfo:
+    version: [5.2.3, 5.3.0, 5.4.3, 5.5.1, 5.6.1, 5.7.1, 6.1.2, 6.2.4, 6.3.0]
+    buildable: false
+    externals:
+    - spec: rocminfo@5.2.3%rocmcc@5.2.3
+      prefix: /opt/rocm-5.2.3
+    - spec: rocminfo@5.3.0%rocmcc@5.3.0
+      prefix: /opt/rocm-5.3.0
+    - spec: rocminfo@5.4.3%rocmcc@5.4.3
+      prefix: /opt/rocm-5.4.3
+    - spec: rocminfo@5.5.1%rocmcc@5.5.1
+      prefix: /opt/rocm-5.5.1
+    - spec: rocminfo@5.6.1%rocmcc@5.6.1
+      prefix: /opt/rocm-5.6.1
+    - spec: rocminfo@5.7.1%rocmcc@5.7.1
+      prefix: /opt/rocm-5.7.1
+    - spec: rocminfo@6.1.2%rocmcc@6.1.2
+      prefix: /opt/rocm-6.1.2
+    - spec: rocminfo@6.2.4%rocmcc@6.2.4
+      prefix: /opt/rocm-6.2.4
+    - spec: rocminfo@6.3.0%rocmcc@6.3.0
+      prefix: /opt/rocm-6.3.0
+  rocm-device-libs:
+    version: [5.2.3, 5.3.0, 5.4.3, 5.5.1, 5.6.1, 5.7.1, 6.1.2, 6.2.4, 6.3.0]
+    buildable: false
+    externals:
+    - spec: rocm-device-libs@5.2.3%rocmcc@5.2.3
+      prefix: /opt/rocm-5.2.3
+    - spec: rocm-device-libs@5.3.0%rocmcc@5.3.0
+      prefix: /opt/rocm-5.3.0
+    - spec: rocm-device-libs@5.4.3%rocmcc@5.4.3
+      prefix: /opt/rocm-5.4.3
+    - spec: rocm-device-libs@5.5.1%rocmcc@5.5.1
+      prefix: /opt/rocm-5.5.1
+    - spec: rocm-device-libs@5.6.1%rocmcc@5.6.1
+      prefix: /opt/rocm-5.6.1
+    - spec: rocm-device-libs@5.7.1%rocmcc@5.7.1
+      prefix: /opt/rocm-5.7.1
+    - spec: rocm-device-libs@6.1.2%rocmcc@6.1.2
+      prefix: /opt/rocm-6.1.2
+    - spec: rocm-device-libs@6.2.4%rocmcc@6.2.4
+      prefix: /opt/rocm-6.2.4
+    - spec: rocm-device-libs@6.3.0%rocmcc@6.3.0
+      prefix: /opt/rocm-6.3.0
+  rocprim:
+    version: [5.2.3, 5.3.0, 5.4.3, 5.5.1, 5.6.1, 5.7.1, 6.1.2, 6.2.4, 6.3.0]
+    buildable: false
+    externals:
+    - spec: rocprim@5.2.3%rocmcc@5.2.3
+      prefix: /opt/rocm-5.2.3
+    - spec: rocprim@5.3.0%rocmcc@5.3.0
+      prefix: /opt/rocm-5.3.0
+    - spec: rocprim@5.4.3%rocmcc@5.4.3
+      prefix: /opt/rocm-5.4.3
+    - spec: rocprim@5.5.1%rocmcc@5.5.1
+      prefix: /opt/rocm-5.5.1
+    - spec: rocprim@5.6.1%rocmcc@5.6.1
+      prefix: /opt/rocm-5.6.1
+    - spec: rocprim@5.7.1%rocmcc@5.7.1
+      prefix: /opt/rocm-5.7.1
+    - spec: rocprim@6.1.2%rocmcc@6.1.2
+      prefix: /opt/rocm-6.1.2
+    - spec: rocprim@6.2.4%rocmcc@6.2.4
+      prefix: /opt/rocm-6.2.4
+    - spec: rocprim@6.3.0%rocmcc@6.3.0
+      prefix: /opt/rocm-6.3.0
+  rocthrust:
+    version: [5.2.3, 5.3.0, 5.4.3, 5.5.1, 5.6.1, 5.7.1, 6.1.2, 6.2.4, 6.3.0]
+    buildable: false
+    externals:
+    - spec: rocthrust@5.2.3%rocmcc@5.2.3
+      prefix: /opt/rocm-5.2.3
+    - spec: rocthrust@5.3.0%rocmcc@5.3.0
+      prefix: /opt/rocm-5.3.0
+    - spec: rocthrust@5.4.3%rocmcc@5.4.3
+      prefix: /opt/rocm-5.4.3
+    - spec: rocthrust@5.5.1%rocmcc@5.5.1
+      prefix: /opt/rocm-5.5.1
+    - spec: rocthrust@5.6.1%rocmcc@5.6.1
+      prefix: /opt/rocm-5.6.1
+    - spec: rocthrust@5.7.1%rocmcc@5.7.1
+      prefix: /opt/rocm-5.7.1
+    - spec: rocthrust@6.1.2%rocmcc@6.1.2
+      prefix: /opt/rocm-6.1.2
+    - spec: rocthrust@6.2.4%rocmcc@6.2.4
+      prefix: /opt/rocm-6.2.4
+    - spec: rocthrust@6.3.0%rocmcc@6.3.0
+      prefix: /opt/rocm-6.3.0
+  rocsparse:
+    version: [5.2.3, 5.3.0, 5.4.3, 5.5.1, 5.6.1, 5.7.1, 6.1.2, 6.2.4, 6.3.0]
+    buildable: false
+    externals:
+    - spec: rocsparse@5.2.3%rocmcc@5.2.3
+      prefix: /opt/rocm-5.2.3
+    - spec: rocsparse@5.3.0%rocmcc@5.3.0
+      prefix: /opt/rocm-5.3.0
+    - spec: rocsparse@5.4.3%rocmcc@5.4.3
+      prefix: /opt/rocm-5.4.3
+    - spec: rocsparse@5.5.1%rocmcc@5.5.1
+      prefix: /opt/rocm-5.5.1
+    - spec: rocsparse@5.6.1%rocmcc@5.6.1
+      prefix: /opt/rocm-5.6.1
+    - spec: rocsparse@5.7.1%rocmcc@5.7.1
+      prefix: /opt/rocm-5.7.1
+    - spec: rocsparse@6.1.2%rocmcc@6.1.2
+      prefix: /opt/rocm-6.1.2
+    - spec: rocsparse@6.2.4%rocmcc@6.2.4
+      prefix: /opt/rocm-6.2.4
+    - spec: rocsparse@6.3.0%rocmcc@6.3.0
+      prefix: /opt/rocm-6.3.0
+  rocrand:
+    version: [5.2.3, 5.3.0, 5.4.3, 5.5.1, 5.6.1, 5.7.1, 6.1.2, 6.2.4, 6.3.0]
+    buildable: false
+    externals:
+    - spec: rocrand@5.2.3%rocmcc@5.2.3
+      prefix: /opt/rocm-5.2.3
+    - spec: rocrand@5.3.0%rocmcc@5.3.0
+      prefix: /opt/rocm-5.3.0
+    - spec: rocrand@5.4.3%rocmcc@5.4.3
+      prefix: /opt/rocm-5.4.3
+    - spec: rocrand@5.5.1%rocmcc@5.5.1
+      prefix: /opt/rocm-5.5.1
+    - spec: rocrand@5.6.1%rocmcc@5.6.1
+      prefix: /opt/rocm-5.6.1
+    - spec: rocrand@5.7.1%rocmcc@5.7.1
+      prefix: /opt/rocm-5.7.1
+    - spec: rocrand@6.1.2%rocmcc@6.1.2
+      prefix: /opt/rocm-6.1.2
+    - spec: rocrand@6.2.4%rocmcc@6.2.4
+      prefix: /opt/rocm-6.2.4
+    - spec: rocrand@6.3.0%rocmcc@6.3.0
+      prefix: /opt/rocm-6.3.0
+  cray-mpich:
+    buildable: false
+    externals:
+    - spec: cray-mpich@8.1.28%cce@15.0.1
+      prefix: /usr/tce/packages/cray-mpich/cray-mpich-8.1.28-cce-15.0.1-magic
+    - spec: cray-mpich@8.1.28%cce@16.0.1
+      prefix: /usr/tce/packages/cray-mpich/cray-mpich-8.1.28-cce-16.0.1-magic
+    - spec: cray-mpich@8.1.31%cce@17.0.1
+      prefix: /usr/tce/packages/cray-mpich/cray-mpich-8.1.31-cce-17.0.1-magic
+    - spec: cray-mpich@8.1.31%cce@18.0.1
+      prefix: /usr/tce/packages/cray-mpich/cray-mpich-8.1.31-cce-18.0.1-magic
+    - spec: cray-mpich@8.1.31%gcc@12.1.1
+      prefix: /usr/tce/packages/cray-mpich/cray-mpich-8.1.31-gcc-12.1.1-magic
+    - spec: cray-mpich@8.1.28%rocmcc@5.5.1
+      prefix: /usr/tce/packages/cray-mpich/cray-mpich-8.1.28-rocmcc-5.5.1-magic
+    - spec: cray-mpich@8.1.28%rocmcc@5.6.1
+      prefix: /usr/tce/packages/cray-mpich/cray-mpich-8.1.28-rocmcc-5.6.1-magic
+    - spec: cray-mpich@8.1.28%rocmcc@5.7.1
+      prefix: /usr/tce/packages/cray-mpich/cray-mpich-8.1.28-rocmcc-5.7.1-magic
+    - spec: cray-mpich@8.1.31%rocmcc@6.1.2
+      prefix: /usr/tce/packages/cray-mpich/cray-mpich-8.1.31-rocmcc-6.1.2-magic
+    - spec: cray-mpich@8.1.31%rocmcc@6.2.4
+      prefix: /usr/tce/packages/cray-mpich/cray-mpich-8.1.31-rocmcc-6.2.4-magic
+    - spec: cray-mpich@8.1.31%rocmcc@6.3.0
+      prefix: /usr/tce/packages/cray-mpich/cray-mpich-8.1.31-rocmcc-6.3.0-magic
+
+
+  # blas is a bit more complicated because its a virtual package so fake it with
+  # the following per spack docs
+  netlib-lapack:
+    buildable: false
+    externals:
+    - spec: netlib-lapack@3.8.0
+      prefix: /usr
+
+  # System level packages to not build
+  autoconf:
+    buildable: false
+    externals:
+    - spec: autoconf@2.69
+      prefix: /usr
+  automake:
+    buildable: false
+    externals:
+    - spec: automake@1.16.1
+      prefix: /usr
+  binutils:
+    buildable: false
+    externals:
+    - spec: binutils@2.40
+      prefix: /usr
+  bzip2:
+    buildable: false
+    externals:
+    - spec: bzip2@1.0.6
+      prefix: /usr
+  curl:
+    buildable: false
+    externals:
+    - spec: curl@7.61.1
+      prefix: /usr
+  diffutils:
+    buildable: false
+    externals:
+    - spec: diffutils@3.6
+      prefix: /usr
+  elfutils:
+    buildable: false
+    externals:
+    - spec: elfutils@0.190
+      prefix: /usr
+  findutils:
+    buildable: false
+    externals:
+    - spec: findutils@4.6.0
+      prefix: /usr
+  gettext:
+    buildable: false
+    externals:
+    - spec: gettext@0.19.8.1
+      prefix: /usr
+  ghostscript:
+    buildable: false
+    externals:
+    - spec: ghostscript@9.27
+      prefix: /usr
+  gmake:
+    buildable: false
+    externals:
+    - spec: gmake@4.2.1
+      prefix: /usr
+  groff:
+    buildable: false
+    externals:
+    - spec: groff@1.22.3
+      prefix: /usr
+  graphviz:
+    buildable: false
+    externals:
+    - spec: graphviz@2.40.1
+      prefix: /usr
+  libepoxy:
+    buildable: false
+    externals:
+    - spec: libepoxy@1.5.2
+      prefix: /usr
+  libtool:
+    buildable: false
+    externals:
+    - spec: libtool@2.4.6
+      prefix: /usr
+  libunwind:
+    buildable: false
+    externals:
+    - spec: libunwind@8.0.1
+      prefix: /usr
+  libx11:
+    buildable: false
+    externals:
+    - spec: libx11@1.20.4
+      prefix: /usr
+  lua:
+    buildable: false
+    externals:
+    - spec: lua@5.3.4
+      prefix: /usr
+  m4:
+    buildable: false
+    externals:
+    - spec: m4@1.4.18
+      prefix: /usr
+  papi:
+    buildable: false
+    version: [7.1.0.2]
+    externals:
+    - spec: papi@7.1.0.2
+      prefix: /opt/cray/pe/papi/7.1.0.2
+  perl:
+    buildable: false
+    externals:
+    - spec: perl@5.26.3
+      prefix: /usr
+  pkg-config:
+    buildable: false
+    externals:
+    - spec: pkg-config@1.4.2
+      prefix: /usr
+  python:
+    buildable: false
+    version: [3.10.8]
+    externals:
+    - spec: python@3.10.8
+      prefix: /usr/tce/packages/python/python-3.10.8
+  readline:
+    buildable: false
+    externals:
+    - spec: readline@7.0
+      prefix: /usr
+  tar:
+    buildable: false
+    externals:
+    - spec: tar@1.30
+      prefix: /usr
+  unzip:
+    buildable: false
+    externals:
+    - spec: unzip@6.0
+      prefix: /usr
+  zlib:
+    buildable: false
+    externals:
+    - spec: zlib@1.2.11
+      prefix: /usr
+
+  # External dependencies for SCR
+  libyogrt:
+    externals:
+    - spec: libyogrt@1.24 scheduler=flux
+      prefix: /usr
+    - spec: libyogrt@1.24 scheduler=slurm
+      prefix: /usr
+  pdsh:
+    buildable: false
+    externals:
+    - spec: pdsh@2.35
+      prefix: /usr
diff --git a/spack-environments/radiuss/toss_4_x86_64_ib/packages.yaml b/spack-environments/radiuss/toss_4_x86_64_ib/packages.yaml
deleted file mode 100644
index bd0c963..0000000
--- a/spack-environments/radiuss/toss_4_x86_64_ib/packages.yaml
+++ /dev/null
@@ -1,94 +0,0 @@
-packages::
-  all:
-    # This defaults us to machine specific flags of ivybridge which allows
-    # us to run on broadwell as well
-    target: [ivybridge]
-    compiler: [gcc, intel, pgi, clang, oneapi]
-    providers:
-      mpi: [mvapich2]
-  cmake:
-    version: [3.23.1, 3.22.4, 3.21.1, 3.19.2, 3.14.5]
-    buildable: false
-    externals:
-    - spec: cmake@3.14.5
-      prefix: /usr/tce/packages/cmake/cmake-3.14.5
-    - spec: cmake@3.19.2
-      prefix: /usr/tce/packages/cmake/cmake-3.19.2
-    - spec: cmake@3.21.1
-      prefix: /usr/tce/packages/cmake/cmake-3.21.1
-    - spec: cmake@3.22.4
-      prefix: /usr/tce/packages/cmake/cmake-3.22.4
-    - spec: cmake@3.23.1
-      prefix: /usr/tce/packages/cmake/cmake-3.23.1
-  cuda:
-    version: [10.1.168]
-    buildable: false
-    externals:
-    - spec: cuda@10.1.168
-      prefix: /usr/tce/packages/cuda/cuda-10.1.168
-  mvapich2:
-    buildable: false
-    externals:
-    - spec: mvapich2@2.3.7%intel@=19.1.2 ~cuda~debug~regcache~wrapperrpath ch3_rank_bits=32
-        file_systems=lustre,nfs,ufs process_managers=slurm
-      prefix: /usr/tce/packages/mvapich2/mvapich2-2.3.7-intel-classic-19.1.2
-    - spec: mvapich2@2.3.7%intel@=19.1.2.gcc.10.3.1 ~cuda~debug~regcache~wrapperrpath ch3_rank_bits=32
-        file_systems=lustre,nfs,ufs process_managers=slurm
-      prefix: /usr/tce/packages/mvapich2/mvapich2-2.3.7-intel-classic-19.1.2
-    - spec: mvapich2@2.3.7%intel@=2021.6.0 ~cuda~debug~regcache~wrapperrpath ch3_rank_bits=32
-        file_systems=lustre,nfs,ufs process_managers=slurm
-      prefix: /usr/tce/packages/mvapich2/mvapich2-2.3.7-intel-classic-2021.6.0
-    - spec: mvapich2@2.3.7%intel@=2021.6.0.gcc.10.3.1 ~cuda~debug~regcache~wrapperrpath ch3_rank_bits=32
-        file_systems=lustre,nfs,ufs process_managers=slurm
-      prefix: /usr/tce/packages/mvapich2/mvapich2-2.3.7-intel-classic-2021.6.0
-    - spec: mvapich2@2.3.7%intel@=2022.1.0 ~cuda~debug~regcache~wrapperrpath ch3_rank_bits=32
-        file_systems=lustre,nfs,ufs process_managers=slurm
-      prefix: /usr/tce/packages/mvapich2/mvapich2-2.3.7-intel-2022.1.0
-    - spec: mvapich2@2.3.7%intel@=2022.1.0.gcc.10.3.1 ~cuda~debug~regcache~wrapperrpath ch3_rank_bits=32
-        file_systems=lustre,nfs,ufs process_managers=slurm
-      prefix: /usr/tce/packages/mvapich2/mvapich2-2.3.7-intel-2022.1.0
-    - spec: mvapich2@2.3.7%intel@=2023.2.1 ~cuda~debug~regcache~wrapperrpath ch3_rank_bits=32
-        file_systems=lustre,nfs,ufs process_managers=slurm
-      prefix: /usr/tce/packages/mvapich2/mvapich2-2.3.7-intel-2023.2.1
-    - spec: mvapich2@2.3.7%intel@=2023.2.1.gcc.10.3.1 ~cuda~debug~regcache~wrapperrpath ch3_rank_bits=32
-        file_systems=lustre,nfs,ufs process_managers=slurm
-      prefix: /usr/tce/packages/mvapich2/mvapich2-2.3.7-intel-2023.2.1
-    - spec: mvapich2@2.3.7%clang@=14.0.6 ~cuda~debug~regcache~wrapperrpath ch3_rank_bits=32
-        file_systems=lustre,nfs,ufs process_managers=slurm
-      prefix: /usr/tce/packages/mvapich2/mvapich2-2.3.7-clang-14.0.6
-    - spec: mvapich2@2.3.7%clang@=14.0.6.gcc.10.3.1 ~cuda~debug~regcache~wrapperrpath ch3_rank_bits=32
-        file_systems=lustre,nfs,ufs process_managers=slurm
-      prefix: /usr/tce/packages/mvapich2/mvapich2-2.3.7-clang-14.0.6
-    - spec: mvapich2@2.3.7%gcc@=10.3.1 ~cuda~debug~regcache~wrapperrpath ch3_rank_bits=32
-        file_systems=lustre,nfs,ufs process_managers=slurm
-      prefix: /usr/tce/packages/mvapich2/mvapich2-2.3.7-gcc-10.3.1
-    - spec: mvapich2@2.3.7%gcc@=11.2.1 ~cuda~debug~regcache~wrapperrpath ch3_rank_bits=32
-        file_systems=lustre,nfs,ufs process_managers=slurm
-      prefix: /usr/tce/packages/mvapich2/mvapich2-2.3.7-gcc-11.2.1
-    - spec: mvapich2@2.3.7%gcc@=12.1.1 ~cuda~debug~regcache~wrapperrpath ch3_rank_bits=32
-        file_systems=lustre,nfs,ufs process_managers=slurm
-      prefix: /usr/tce/packages/mvapich2/mvapich2-2.3.7-gcc-12.1.1
-  python:
-    buildable: false
-    version: [3.10.8]
-    externals:
-    - spec: python@3.10.8
-      prefix: /usr/tce/packages/python/python-3.10.8
-  elfutils:
-    buildable: false
-    version: [0.187]
-    externals:
-    - spec: elfutils@0.187
-      prefix: /usr
-  libunwind:
-    buildable: false
-    version: [8.0.1]
-    externals:
-    - spec: libunwind@8.0.1
-      prefix: /usr
-  papi:
-    buildable: false
-    version: [6.0.0.1]
-    externals:
-    - spec: papi@6.0.0.1
-      prefix: /usr/tce/packages/papi/papi-6.0.0.1
diff --git a/spack-environments/raja-suite/spack.yaml b/spack-environments/raja-suite/spack.yaml
index 625f769..6371deb 100644
--- a/spack-environments/raja-suite/spack.yaml
+++ b/spack-environments/raja-suite/spack.yaml
@@ -6,7 +6,7 @@
 ##############################################################################
 
 spack:
-  include: [$SYS_TYPE]
+  include: [$LCSCHEDCLUSTER]
   concretization: separately
   view: false
   config:
@@ -21,10 +21,10 @@ spack:
   definitions:
   - compilers:
       - '%gcc@8.3.1'
-    when: env.get("SYS_TYPE", "") == "toss_3_x86_64_ib"
+    when: env.get("LCSCHEDCLUSTER", "") == "ruby"
   - compilers:
       - '%clang@10.0.1'
-    when: env.get("SYS_TYPE", "") == "blueos_3_ppc64le_ib_p9"
+    when: env.get("LCSCHEDCLUSTER", "") == "lassen"
   - projects:
     - chai@develop
     - chai@main
@@ -60,7 +60,7 @@ spack:
     - umpire@4.1.0
     - umpire@4.0.1
     - umpire@4.0.0
-    when: env.get("SYS_TYPE", "") == "toss_3_x86_64_ib"
+    when: env.get("LCSCHEDCLUSTER", "") == "ruby"
   - projects:
     - chai@develop+cuda
     - chai@main+cuda
@@ -82,7 +82,7 @@ spack:
     - umpire@2022.03.0+cuda
     - umpire@6.0.0+cuda
     - umpire@5.0.1+cuda
-    when: env.get("SYS_TYPE", "") == "blueos_3_ppc64le_ib_p9"
+    when: env.get("LCSCHEDCLUSTER", "") == "lassen"
   specs:
   - matrix:
     - [$projects]
@@ -94,9 +94,9 @@ spack:
       - match:
         - target=broadwell
         runner-attributes:
-          tags: [quartz, shell]
+          tags: [ruby, shell]
           script:
-          - . ${MY_SPACK_PATH}/share/spack/setup-env.sh
+          - . ${MY_SPACK_PARENT_DIR}/spack/share/spack/setup-env.sh
           - export SPACK_DISABLE_LOCAL_CONFIG=""
           - export SPACK_USER_CACHE_PATH="${MY_SPACK_USER_CACHE}"
           - cd ${SPACK_CONCRETE_ENV_DIR} && spack env activate --without-view .
@@ -108,7 +108,7 @@ spack:
         runner-attributes:
           tags: [lassen, shell]
           script:
-          - . ${MY_SPACK_PATH}/share/spack/setup-env.sh
+          - . ${MY_SPACK_PARENT_DIR}/spack/share/spack/setup-env.sh
           - export SPACK_DISABLE_LOCAL_CONFIG=""
           - export SPACK_USER_CACHE_PATH="${MY_SPACK_USER_CACHE}"
           - cd ${SPACK_CONCRETE_ENV_DIR} && spack env activate --without-view .
@@ -116,5 +116,5 @@ spack:
     service-job-attributes:
       tags: [quartz, shell]
       before_script:
-      - . ${MY_SPACK_PATH}/share/spack/setup-env.sh
+      - . ${MY_SPACK_PARENT_DIR}/spack/share/spack/setup-env.sh