diff --git a/github-workflows/setup-variables.sh b/github-workflows/setup-variables.sh
index d194bc4..c3bfd40 100644
--- a/github-workflows/setup-variables.sh
+++ b/github-workflows/setup-variables.sh
@@ -11,8 +11,8 @@ else
 	export PCRE="r"
 fi
 
-export GH_CPU_ARCH=$(echo $GH_MATRIX_ARCH | sed -$PCRE 's/^(linux\/|windows\/|macos\/|)(386|amd64|arm64|ppc64le|arm)(\/(v6|v7))?$/\2\4/g')
-export GH_OS_NAME=$(echo $GH_MATRIX_ARCH | sed -$PCRE 's/^((linux)\/|(windows)\/|(macos)\/|)(386|amd64|arm64|ppc64le|arm)(\/(v6|v7))?$/\2\3\4/g')
+export GH_CPU_ARCH=$(echo $GH_MATRIX_ARCH | sed -$PCRE 's/^(linux\/|windows\/|macos\/)?(386|amd64|arm64|ppc64le|arm)(\/(v6|v7))?$/\2\4/g')
+export GH_OS_NAME=$(echo $GH_MATRIX_ARCH | sed -$PCRE 's/^((linux)\/|(windows)\/|(macos)\/)?(386|amd64|arm64|ppc64le|arm)(\/(v6|v7))?$/\2\3\4/g')
 
 if [[ -z "GH_OS_NAME" ]]; then
 	export GH_OS_NAME=$(echo $GH_MATRIX_OS | sed -$PCRE 's/^([^-]+)/\1/g')