diff --git a/.github/workflows/test-software.eessi.io.yml b/.github/workflows/test-software.eessi.io.yml
index e3d76351ea..ca3792f6ef 100644
--- a/.github/workflows/test-software.eessi.io.yml
+++ b/.github/workflows/test-software.eessi.io.yml
@@ -60,12 +60,18 @@ jobs:
               echo "just run check_missing_installations.sh (should use easystacks/software.eessi.io/${{matrix.EESSI_VERSION}}/eessi-${{matrix.EESSI_VERSION}}-*.yml with latest EasyBuild release)"
               for easystack_file in $(EESSI_VERSION=${{matrix.EESSI_VERSION}} .github/workflows/scripts/only_latest_easystacks.sh); do
                   if [ ${{matrix.EESSI_SOFTWARE_SUBDIR_OVERRIDE}} = "x86_64/amd/zen4" ]; then
-                      # Make a temporary EasyStack file where we clean out all 2022b stuff and use that
-                      new_easystack=$(mktemp pruned_easystackXXX --suffix=.yml)
-                      # first clean out the options then clean out the .eb name
-                      sed '/2022b\|12\.2\.0/,/\.eb/{/\.eb/!d}' "${easystack_file}" | sed '/2022b\|12\.2\.0/d' > $new_easystack
-                      diff --unified=0 "$easystack_file" "$new_easystack" || :
-                      easystack_file="$new_easystack"
+                      if grep -q 2022b <<<"${easystack_file}"; then
+                        # skip the check of installed software on zen4 for foss/2022b builds
+                        continue
+                      fi
+                      if [[ $easystack_file == *"rebuilds"* ]]; then
+                        # Also handle rebuilds, make a temporary EasyStack file where we clean out all 2022b stuff and use that
+                        new_easystack=$(mktemp pruned_easystackXXX --suffix=.yml)
+                        # first clean out the options then clean out the .eb name
+                        sed '/2022b\|12\.2\.0/,/\.eb/{/\.eb/!d}' "${easystack_file}" | sed '/2022b\|12\.2\.0/d' > $new_easystack
+                        diff --unified=0 "$easystack_file" "$new_easystack" || :
+                        easystack_file="$new_easystack"
+                      fi
                   fi
                   echo "check missing installations for ${easystack_file}..."
                   ./check_missing_installations.sh ${easystack_file}