diff --git a/.github/build-ci/manifests/gcc.spack.yaml.j2 b/.github/build-ci/manifests/gcc.spack.yaml.j2
index b6c51d1..5d40e1d 100644
--- a/.github/build-ci/manifests/gcc.spack.yaml.j2
+++ b/.github/build-ci/manifests/gcc.spack.yaml.j2
@@ -1,10 +1,19 @@
 spack:
   specs:
-  - access-test-component @git.{{ ref }}
+  - access-test-component@git.{{ ref }} %{{ gcc_compiler }} target={{ target }}
   packages:
+    c:
+      require:
+      - '{{ gcc_compiler }}'
+    cxx:
+      require:
+      - '{{ gcc_compiler }}'
+    fortran:
+      require:
+      - '{{ gcc_compiler }}'
     all:
       require:
-      - '%{{ gcc_compiler }} target={{ target}}'
+      - 'target={{ target }}'
   concretizer:
     unify: false
   view: false
diff --git a/.github/build-ci/manifests/intel.spack.yaml.j2 b/.github/build-ci/manifests/intel.spack.yaml.j2
index 041805c..d974647 100644
--- a/.github/build-ci/manifests/intel.spack.yaml.j2
+++ b/.github/build-ci/manifests/intel.spack.yaml.j2
@@ -1,10 +1,19 @@
 spack:
   specs:
-  - access-test-component @git.{{ ref }}
+  - access-test-component@git.{{ ref }} %intel-oneapi-compilers@2025.2.0 target={{ target }}
   packages:
+    c:
+      require:
+      - 'intel-oneapi-compilers@2025.2.0'
+    cxx:
+      require:
+      - 'intel-oneapi-compilers@2025.2.0'
+    fortran:
+      require:
+      - 'intel-oneapi-compilers@2025.2.0'
     all:
       require:
-      - '%{{ intel_compiler }} target={{ target }}'
+      - 'target={{ target }}'
   concretizer:
     unify: false
   view: false
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index bbcab0c..f2f262d 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -29,11 +29,10 @@ jobs:
       max-parallel: 5
       matrix:
         file: ${{ fromJson(needs.pre-ci.outputs.matrix) }}
-    uses: access-nri/build-ci/.github/workflows/ci.yml@v2
+    # Testing on github-hosted as the image is not yet updated on self-hosted runners
+    uses: access-nri/build-ci/.github/workflows/ci.yml@spack-config-81-git-based-spack-packages-repo_TEST
     with:
       spack-manifest-path: ${{ matrix.file }}
       allow-ssh-into-spack-install: false  # If true, PR author must ssh into instance to complete job
       spack-manifest-data-path: .github/build-ci/data/standard.json
-      # spack-packages-ref: main
-      # spack-config-ref: main
-      # spack-ref: releases/v0.22
+      container-image-version: :rocky-v1.1-2025.12.000-test