diff --git a/.github/workflows/test_eessi.yml b/.github/workflows/test_eessi.yml
index 2fc071da8b..9d31f2aa90 100644
--- a/.github/workflows/test_eessi.yml
+++ b/.github/workflows/test_eessi.yml
@@ -23,6 +23,7 @@ jobs:
         - eessi-2023.06-eb-4.7.2-2021b.yml
         - eessi-2023.06-eb-4.7.2-2022a.yml
         - eessi-2023.06-eb-4.7.2-2022b.yml
+        - eessi-2023.06-eb-4.7.2-system.yml
     steps:
         - name: Check out software-layer repository
           uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8 # v3.1.0
diff --git a/EESSI-pilot-install-software.sh b/EESSI-pilot-install-software.sh
index 4f473eb82f..c6c51e7abc 100755
--- a/EESSI-pilot-install-software.sh
+++ b/EESSI-pilot-install-software.sh
@@ -186,8 +186,11 @@ else
     echo_green ">> MODULEPATH set up: ${MODULEPATH}"
 fi
 
-# use 'git diff' to determine which easystack files were changed
-for easystack_file in $(git diff --name-only | grep '^eessi.*yml$'); do
+# assume there's only one diff file that corresponds to the PR patch file
+pr_diff=$(ls [0-9]*.diff | head -1)
+
+# use PR patch file to determine in which easystack files stuff was added
+for easystack_file in $(cat ${pr_diff} | grep '^+++' | cut -f2 -d' ' | sed 's@^[a-z]/@@g' | grep '^eessi.*yml$'); do
 
     echo -e "Processing easystack file ${easystack_file}...\n\n"
 
diff --git a/eessi-2023.06-eb-4.7.2-system.yml b/eessi-2023.06-eb-4.7.2-system.yml
new file mode 100644
index 0000000000..a5f84c7cd5
--- /dev/null
+++ b/eessi-2023.06-eb-4.7.2-system.yml
@@ -0,0 +1,4 @@
+easyconfigs:
+  - EasyBuild-4.8.0.eb:
+      options:
+        from-pr: 18282