diff --git a/.github/workflows/check_licenses.yml b/.github/workflows/check_licenses.yml
index e68a95aead..68cec2e96e 100644
--- a/.github/workflows/check_licenses.yml
+++ b/.github/workflows/check_licenses.yml
@@ -24,6 +24,14 @@ jobs:
            EESSI_VERSION: 2023.06
            EESSI_SOFTWARE_SUBDIR_OVERRIDE: x86_64/generic
            NO_SLASH_NAME: x86_64-generic
+         - runs_on: ubuntu-24.04-arm
+           EESSI_VERSION: 2025.06
+           EESSI_SOFTWARE_SUBDIR_OVERRIDE: aarch64/generic
+           NO_SLASH_NAME: aarch64-generic
+         - runs_on: ubuntu-24.04
+           EESSI_VERSION: 2025.06
+           EESSI_SOFTWARE_SUBDIR_OVERRIDE: x86_64/generic
+           NO_SLASH_NAME: x86_64-generic
 
     runs-on: ${{ matrix.runs_on }}
 
@@ -61,9 +69,8 @@ jobs:
           echo "Temporary directory created: ${eb_missing_out}"
           file_list=$(curl -sS \
                         -H "Accept: application/vnd.github+json" \
-                        "https://api.github.com/repos/${GITHUB_REPOSITORY}/pulls/${PR_NUMBER}/files?per_page=100" |
-                        jq -r '.[].filename | select(test("easystack"))')
-          
+                        "https://api.github.com/repos/${GITHUB_REPOSITORY}/pulls/${PR_NUMBER}/files?per_page=100" | 
+                        jq -r --arg ver "$EESSI_VERSION" '.[].filename | select(contains("easystack") and contains($ver))')
           if [ -z "$file_list" ]; then
              echo "No easystack files found. Skipping license check."
              exit 0 
@@ -141,7 +148,7 @@ jobs:
 
                   echo "Searching sources for missing modules..."
                   # Generates a "modules_results.json" file 
-                  module load Python-bundle-PyPI/2023.06-GCCcore-12.3.0
+                  module load Python-bundle-PyPI
                   python licenses/parsing_easyconfigs.py missing_modules.txt
                   cat modules_results.json
                 fi
@@ -154,7 +161,7 @@ jobs:
                 source /cvmfs/software.eessi.io/versions/${{matrix.EESSI_VERSION}}/init/bash
 
                 echo "modules_results.json file exists, trying to fetch the license..."
-                ml Python-bundle-PyPI/2023.06-GCCcore-12.3.0 BeautifulSoup/4.12.2-GCCcore-12.3.0 PyYAML/6.0-GCCcore-12.3.0
+                ml Python-bundle-PyPI BeautifulSoup PyYAML
                 python licenses/parse_licenses.py modules_results.json licenses/licenses.yml
                 cat temporal_print.yaml
               else
@@ -186,7 +193,7 @@ jobs:
         if: env.PROCESS_LICENSES == 'true'
         uses: actions/upload-artifact@v4
         with:
-          name: license-results-${{ matrix.NO_SLASH_NAME }}
+          name: license-results-${{ matrix.EESSI_VERSION }}-${{ matrix.NO_SLASH_NAME }}
           path: |
             missing_report.yaml
             patch.txt