diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml
index 08032f7..0bcd326 100644
--- a/.github/workflows/cd.yml
+++ b/.github/workflows/cd.yml
@@ -15,4 +15,5 @@ jobs:
       model: ${{ vars.NAME }}
     permissions:
       contents: write
+      pull-requests: write
     secrets: inherit
diff --git a/spack.yaml b/spack.yaml
index c52c5f6..32fa287 100644
--- a/spack.yaml
+++ b/spack.yaml
@@ -2,9 +2,28 @@
 #
 # It describes a set of packages to be installed, along with
 # configuration settings.
+# This is testing of the dev-121-multi-target-workflows branch!!!
 spack:
+  definitions:
+    - ROOT_PACKAGE:
+        - access-test@git.2025.01.0
+
+    # Specific case for Gadi - should be run
+    - when: env['DEPLOYMENT_TARGET'] == 'gadi'
+      compiler_targets:
+        - intel@2021.10.0 target=x86_64
+
+    # Default case, shouldn't be used
+    - when: '"DEPLOYMENT_TARGET" not in env'
+      compiler_targets:
+        - gcc@11.2.0 target=x86_64
+
+    - ROOT_SPEC:
+      - matrix:
+          - [$ROOT_PACKAGE]
+          - [$%compiler_targets]
   specs:
-    - access-test@git.2024.11.15
+    - $ROOT_SPEC
   packages:
     oasis3-mct:
       require:
@@ -19,11 +38,11 @@ spack:
       require:
         - '@4.1.5'
         - 'cppflags="-diag-disable=10441"'
-    # Specifications that apply to all packages
-    all:
-      require:
-        - '%intel@2021.10.0'
-        - 'target=x86_64'
+    # Specifications that apply to all packages - not relevant with multi-target builds
+    # all:
+    #   require:
+    #     - '%intel@2021.10.0'
+    #     - 'target=x86_64'
   view: true
   concretizer:
     unify: true
@@ -34,5 +53,5 @@ spack:
           - access-test
           - oasis3-mct
         projections:
-          access-test: '{name}/2024.11.15'
+          access-test: '{name}/2025.01.0'
           oasis3-mct: '{name}/2023.11.09-{hash:7}'