diff --git a/.github/workflows/build-package.yaml b/.github/workflows/build-package.yaml
index 0bed29a6..2ecc4461 100644
--- a/.github/workflows/build-package.yaml
+++ b/.github/workflows/build-package.yaml
@@ -53,8 +53,8 @@ jobs:
                       --exit-code -a --no-prefix -- $FILE | egrep "^\+")
 
             PACKAGE=$(echo $DIFF | cut -d'"' -f2)
-            PACKPATH=$(echo $DIFF | egrep -o "package-system/[^ ]*")
-            DOCKER=$(test -e $PACKPATH/Dockerfile* && echo 1 || echo 0) # Assume the build scripts will use the Dockerfile if found in the package path
+            PACKPATH=$(echo $DIFF | egrep -o "package-system/[^/ ]+(?=/| )" | head -n 1)
+            DOCKER=$(test -e ${PACKPATH%% }/Dockerfile* && echo 1 || echo 0) # Assume the build scripts will use the Dockerfile if found in the package path
             JSONline="{\"package\": \"$PACKAGE\", \"os\": \"$OS_RUNNER\", \"dockerfile\": \"$DOCKER\"},"
             if [[ "$JSON" != *"$JSONline"* ]]; then
               JSON="$JSON$JSONline"