diff --git a/.github/workflows/run.yml b/.github/workflows/run.yml
index 2d11a4a4a..109578b9b 100644
--- a/.github/workflows/run.yml
+++ b/.github/workflows/run.yml
@@ -15,21 +15,21 @@ jobs:
 
       - name: Build Saxpy Workspace
         run: |
-          ./bin/benchpark setup saxpy/openmp x86_64 workspace/
+          ./bin/benchpark setup saxpy/openmp generic-x86_64 workspace/
 
       - name: Setup Ramble & Spack
         run: |
           . workspace/setup.sh
 
           spack mirror add ci-buildcache oci://ghcr.io/llnl/benchpark-binary-cache
-          spack config add "packages:all:target:[x86_64_v3]"
+          spack config add "packages:all:target:[generic-x86_64_v3]"
 
           env | grep SPACK >> "$GITHUB_ENV"
           env | grep RAMBLE >> "$GITHUB_ENV"
           echo "PATH=$PATH" >> "$GITHUB_ENV"
 
       - name: Setup Saxpy Workspace
-        working-directory: ./workspace/saxpy/openmp/x86_64/workspace/
+        working-directory: ./workspace/saxpy/openmp/generic-x86_64/workspace/
         run: |
           ramble \
             --workspace-dir . \
@@ -39,7 +39,7 @@ jobs:
             workspace setup
 
       - name: Run Saxpy Experiments
-        working-directory: ./workspace/saxpy/openmp/x86_64/workspace/
+        working-directory: ./workspace/saxpy/openmp/generic-x86_64/workspace/
         run: |
           ramble \
             -c variables:n_nodes:1 \
@@ -50,7 +50,7 @@ jobs:
             on
 
       - name: Analyze Saxpy Results
-        working-directory: ./workspace/saxpy/openmp/x86_64/workspace/
+        working-directory: ./workspace/saxpy/openmp/generic-x86_64/workspace/
         run: |
           ramble \
             --workspace-dir . \
@@ -59,7 +59,7 @@ jobs:
             workspace analyze
 
       - name: Archive Experiment Workspace
-        working-directory: ./workspace/saxpy/openmp/x86_64/workspace/
+        working-directory: ./workspace/saxpy/openmp/generic-x86_64/workspace/
         if: always()
         run: |
           ramble \
@@ -73,7 +73,7 @@ jobs:
         uses: actions/upload-artifact@1eb3cb2b3e0f29609092a73eb033bb759a334595
         with:
           name: workspace-archive
-          path: './workspace/saxpy/openmp/x86_64/workspace/archive/**'
+          path: './workspace/saxpy/openmp/generic-x86_64/workspace/archive/**'
 
       - name: Upload Binaries to CI Cache
         if: github.ref == 'refs/heads/develop'