diff --git a/buildsystem/spack/incline/env.sh b/buildsystem/spack/incline/env.sh
index 31d03fa4..7ce62342 100644
--- a/buildsystem/spack/incline/env.sh
+++ b/buildsystem/spack/incline/env.sh
@@ -7,14 +7,18 @@ module purge
 module load python/miniconda4.12
 source /share/apps/python/miniconda4.12/etc/profile.d/conda.sh
 
+export HTTPS_PROXY=http://proxy01.pnl.gov:3128
+export https_proxy=http://proxy01.pnl.gov:3128
+
 # Define environment variables for where spack stores key files
 # For now, SPACK_INSTALL is the path where everything spack related is installed
 # If you want to modify the module install path, edit the spack.yaml manually
 BASE=/qfs/projects/exasgd/resolve/spack-ci
 export SPACK_INSTALL=$BASE/install
+export SPACK_MIRROR=$BASE/../$(whoami)/spack-mirror
 export SPACK_CACHE=$BASE/../$(whoami)/spack-cache
 export SPACK_DISABLE_LOCAL_CONFIG=1
-export SPACK_PYTHON=$(which python)
+export SPACK_PYTHON=$(which python3)
 
 export tempdir=$SPACK_CACHE
 export TMP=$SPACK_CACHE
diff --git a/buildsystem/spack/incline/spack.yaml b/buildsystem/spack/incline/spack.yaml
index 36234ce0..86b4fad2 100644
--- a/buildsystem/spack/incline/spack.yaml
+++ b/buildsystem/spack/incline/spack.yaml
@@ -1,10 +1,11 @@
 spack:
   specs:
-    - resolve~cuda%gcc@8.4.0
+  - resolve~cuda+rocm%gcc@8.4.0 amdgpu_target=gfx908
+  - hsa-rocr-dev~image
   view: false
   concretizer:
+    reuse: false
     unify: when_possible
-    reuse: true
   config:
     concretizer: clingo
     install_tree:
@@ -12,7 +13,7 @@ spack:
     source_cache: $SPACK_CACHE/source
     misc_cache: $SPACK_CACHE/misc
     build_stage: $SPACK_CACHE/build
-    url_fetch_method: curl
+    url_fetch_method: urllib
   modules:
     default:
       roots:
@@ -23,6 +24,30 @@ spack:
         write: group
         read: world
         group: exasgd
+    curl:
+      externals:
+      - spec: curl@7.29.0
+        prefix: /usr/bin/curl
+      buildable: false
+    git:
+      externals:
+      - spec: git@2.42.0
+        prefix: /share/apps/git/2.42.0
+        modules:
+        - git/2.42.0
+      buildable: false
+    lua:
+      externals:
+      - spec: lua@5.4.2
+        modules:
+        - lua/5.4.2
+      buildable: false
+    python:
+      externals:
+      - spec: python@3.9.12
+        modules:
+        - python/miniconda4.12 
+      buildable: false
     perl:
       externals:
       - spec: perl@5.26.0
diff --git a/buildsystem/spack/spack b/buildsystem/spack/spack
index 7e466f7d..69c60177 160000
--- a/buildsystem/spack/spack
+++ b/buildsystem/spack/spack
@@ -1 +1 @@
-Subproject commit 7e466f7d22839f034b1e542daf5d2b6ef8c568c4
+Subproject commit 69c60177a3b22a4e1f8b0e6feaee7bb96ab25413