diff --git a/.github/workflows/spack_build.yml b/.github/workflows/spack_build.yml
index 6844cbec..5948c08a 100644
--- a/.github/workflows/spack_build.yml
+++ b/.github/workflows/spack_build.yml
@@ -1,4 +1,3 @@
-# https://spack.readthedocs.io/en/latest/binary_caches.html#spack-build-cache-for-github-actions
 name: Spack Builds (Ubuntu x86_64 Buildcache)
 
 on: [pull_request]
@@ -193,6 +192,22 @@ jobs:
           ctest -VV
 
       - name: Push binaries to buildcache
-        run: |
-          spack -e . buildcache push --force --base-image ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ env.BASE_VERSION }} --unsigned --update-index local-buildcache
         if: ${{ !cancelled() }}
+        env:
+          # What Spack’s example expects
+          GITHUB_USER: ${{ env.USERNAME }}          # e.g. hiop-bot
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # packages: write perms
+        run: |
+          # Ensure the mirror uses these env var names for auth (idempotent)
+          spack -e . mirror set \
+            --oci-username-variable GITHUB_USER \
+            --oci-password-variable GITHUB_TOKEN \
+            local-buildcache
+
+          # Push (NO username/password flags here!)
+          spack -e . buildcache push \
+            --force \
+            --base-image ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ env.BASE_VERSION }} \
+            --unsigned \
+            --update-index \
+            local-buildcache
diff --git a/.gitlab/llnl-ci.yml b/.gitlab/llnl-ci.yml
index f66729ee..3f4dd41c 100644
--- a/.gitlab/llnl-ci.yml
+++ b/.gitlab/llnl-ci.yml
@@ -27,14 +27,6 @@ default:
     CUSTOM_CI_BUILDS_DIR: "/usr/workspace/hiop/gitlab_ci/dane/${CI_PIPELINE_ID}"
     MY_CLUSTER: dane
 
-.lassen: 
-  tags:
-    - shell
-    - lassen
-  variables:
-    CUSTOM_CI_BUILDS_DIR: "/usr/workspace/hiop/gitlab_ci/lassen/${CI_PIPELINE_ID}"
-    MY_CLUSTER: lassen
-
 .llnl_script_config:
   stage: config 
   script:
@@ -177,27 +169,3 @@ clean_on_dane:
     - .dane
     - .llnl_script_clean
   needs: ['test_on_dane_hiopbbpy', 'test_on_dane']
-
-# For LLNL/lassen CI
-config_on_lassen:
-  extends:
-    - .lassen
-    - .llnl_script_config
-
-build_on_lassen:
-  extends:
-    - .lassen
-    - .llnl_script_build
-  needs: ['config_on_lassen']
-
-test_on_lassen:
-  extends:
-    - .lassen
-    - .llnl_jsrun_script_test
-  needs: ['build_on_lassen']
-
-clean_on_lassen:
-  extends:
-    - .lassen
-    - .llnl_script_clean
-  needs: ['test_on_lassen']
\ No newline at end of file
diff --git a/CMakeLists.txt b/CMakeLists.txt
index a74376a1..baf24c31 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -6,7 +6,6 @@ if(NOT DEFINED CMAKE_CXX_STANDARD)
   set(CMAKE_CXX_STANDARD 17)
 endif()
 
-
 set(CMAKE_POSITION_INDEPENDENT_CODE ON)
 set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
 set(CMAKE_CUDA_SEPARABLE_COMPILATION ON)
@@ -38,6 +37,7 @@ option(HIOP_USE_AXOM "Build with AXOM to use Sidre for scalable checkpointing" O
 option(HIOP_DEEPCHECKS "Extra checks and asserts in the code with a high penalty on performance" OFF)
 option(HIOP_WITH_KRON_REDUCTION "Build Kron Reduction code (requires UMFPACK)" OFF)
 option(HIOP_DEVELOPER_MODE "Build with extended warnings and options" OFF)
+
 #with testing drivers capable of 'selfchecking' (-selfcheck)
 option(HIOP_WITH_MAKETEST "Enable 'make test'" ON)
 option(HIOP_BUILD_SHARED "Build shared library" OFF)