diff --git a/scripts/build/ci/cirrus-ci_dispatcher.sh b/scripts/build/ci/cirrus-ci_dispatcher.sh
index 7d86a8e8f..817d2b1e8 100755
--- a/scripts/build/ci/cirrus-ci_dispatcher.sh
+++ b/scripts/build/ci/cirrus-ci_dispatcher.sh
@@ -77,13 +77,13 @@ PACKAGE_NAMES=$(git diff-tree --no-commit-id --name-only -r "$GIT_CHANGES" packa
 ## Filter deleted packages.
 for pkg in $PACKAGE_NAMES; do
 	if [ ! -d "${REPO_DIR}/packages/${pkg}" ]; then
-		PACKAGE_NAMES=$(sed "s/\<${pkg}\>//g" <<< "$PACKAGE_NAMES")
+		PACKAGE_NAMES=$(sed -E "s/(^|\s\s*)${pkg}(\$|\s\s*)/ /g" <<< "$PACKAGE_NAMES")
 	fi
 done
 
 ## Filter excluded packages.
 for pkg in $EXCLUDED_PACKAGES; do
-	PACKAGE_NAMES=$(sed "s/\<${pkg}\>//g" <<< "$PACKAGE_NAMES")
+	PACKAGE_NAMES=$(sed -E "s/(^|\s\s*)${pkg}(\$|\s\s*)/ /g" <<< "$PACKAGE_NAMES")
 done
 unset pkg