diff --git a/.github/workflows/dunedaq-develop-cpp-ci.yml b/.github/workflows/dunedaq-develop-cpp-ci.yml
index a444fac..e46d6dd 100644
--- a/.github/workflows/dunedaq-develop-cpp-ci.yml
+++ b/.github/workflows/dunedaq-develop-cpp-ci.yml
@@ -14,6 +14,7 @@ on:
 env:
   CALLER_BRANCH: ${{ github.head_ref || github.ref_name }}
   TARGET_BRANCH: ${{ github.base_ref || github.ref_name }}
+  REPO: ${{ github.event.repository.name }}
 
 jobs:
   Should_run:
@@ -122,8 +123,6 @@ jobs:
       run: |
           BRANCH="$CALLER_BRANCH"
 
-          export REPO=$(echo '${{ github.repository }}' | awk -F '/' '{print $2}')
-
           cat << EOF > build_and_lint_package.sh
           #!/bin/bash
 
@@ -239,8 +238,8 @@ jobs:
         }
 
         diff_file_name=linting_diff.txt
-        pr_linting_results_file=$(find pull_request_linting/ -name "*_linting.log" | tail -n 1)
-        nightly_linting_results_file=$(find nightly_linting/ -name "*_linting.log" | tail -n 1)
+        pr_linting_results_file=$(find pull_request_linting/ -name "${REPO}_linting.log" | tail -n 1)
+        nightly_linting_results_file=$(find nightly_linting/ -name "${REPO}_linting.log" | tail -n 1)
 
         [[ -f "$pr_linting_results_file" ]] || echo "ERROR: No PR results file; exit 1"
         [[ -f "$nightly_linting_results_file" ]] || echo "ERROR: No nightly results file; exit 2"