diff --git a/.github/workflows/test-software.eessi.io.yml b/.github/workflows/test-software.eessi.io.yml
index 5cf6fa5a23..fc8ae7389e 100644
--- a/.github/workflows/test-software.eessi.io.yml
+++ b/.github/workflows/test-software.eessi.io.yml
@@ -45,6 +45,7 @@ env:
       - nvidia/cc70
       - nvidia/cc80
       - nvidia/cc90
+    x86_64/amd/zen5: [] # not available in 2023.06
     # Intel
     x86_64/intel/haswell:
       - nvidia/cc70
@@ -139,6 +140,9 @@ jobs:
           - runs_on: ubuntu-24.04
             EESSI_VERSION: 2025.06
             EESSI_SOFTWARE_SUBDIR_OVERRIDE: x86_64/amd/zen4
+          - runs_on: ubuntu-24.04
+            EESSI_VERSION: 2025.06
+            EESSI_SOFTWARE_SUBDIR_OVERRIDE: x86_64/amd/zen5
           - runs_on: ubuntu-24.04
             EESSI_VERSION: 2025.06
             EESSI_SOFTWARE_SUBDIR_OVERRIDE: x86_64/intel/haswell
diff --git a/.github/workflows/test_compare_stacks.yml b/.github/workflows/test_compare_stacks.yml
index eae456f3c7..b2b36543e0 100644
--- a/.github/workflows/test_compare_stacks.yml
+++ b/.github/workflows/test_compare_stacks.yml
@@ -27,21 +27,25 @@ jobs:
       fail-fast: false
       matrix:
         EESSI_VERSION:
-        - 2023.06
-        - 2025.06
+          - 2023.06
+          - 2025.06
         COMPARISON_ARCH:
-        - aarch64/a64fx
-        - aarch64/neoverse_n1
-        - aarch64/neoverse_v1
-        - aarch64/nvidia/grace
-        - x86_64/amd/zen2
-        - x86_64/amd/zen3
-        - x86_64/amd/zen4
-        - x86_64/intel/haswell
-        - x86_64/intel/skylake_avx512
-        - x86_64/intel/sapphirerapids
-        - x86_64/intel/icelake
-        - x86_64/intel/cascadelake
+          - aarch64/a64fx
+          - aarch64/neoverse_n1
+          - aarch64/neoverse_v1
+          - aarch64/nvidia/grace
+          - x86_64/amd/zen2
+          - x86_64/amd/zen3
+          - x86_64/amd/zen4
+          - x86_64/amd/zen5
+          - x86_64/intel/haswell
+          - x86_64/intel/skylake_avx512
+          - x86_64/intel/sapphirerapids
+          - x86_64/intel/icelake
+          - x86_64/intel/cascadelake
+        exclude:
+          - EESSI_VERSION: 2023.06
+            COMPARISON_ARCH: x86_64/amd/zen5
         # Example of how a specific target can be excluded:
         # exclude:
         # - EESSI_VERSION: 2023.06