diff --git a/.github/workflows/_push_swagger.yml b/.github/workflows/_push_swagger.yml
index 2d560cf05..0f1ad4459 100644
--- a/.github/workflows/_push_swagger.yml
+++ b/.github/workflows/_push_swagger.yml
@@ -66,7 +66,7 @@ jobs:
           if [ "${{ github.event_name }}" = "workflow_dispatch" ] && [ ! -z "${{ inputs.version }}" ]; then
             echo "version=${{ inputs.version }}" >> $GITHUB_ENV
           else
-            if [[ "${GITHUB_REF}" =~ refs/tags/${{ inputs.service_name }}/v(0|[1-9][0-9]*)\.(0|[1-9][0-9]*)\.(0|[1-9][0-9]*)(-((0|[1-9][0-9]*|[0-9]*[a-zA-Z-][0-9a-zA-Z-]*)(\.(0|[1-9][0-9]*|[0-9]*[a-zA-Z-][0-9a-zA-Z-]*))*))?(\+([0-9a-zA-Z-]+(\.[0-9a-zA-Z-]+)*))?$ ]]; then
+            if [[ "${GITHUB_REF}" =~ refs/tags(/?${{ inputs.service_name }})?/v(0|[1-9][0-9]*)\.(0|[1-9][0-9]*)\.(0|[1-9][0-9]*)(-((0|[1-9][0-9]*|[0-9]*[a-zA-Z-][0-9a-zA-Z-]*)(\.(0|[1-9][0-9]*|[0-9]*[a-zA-Z-][0-9a-zA-Z-]*))*))?(\+([0-9a-zA-Z-]+(\.[0-9a-zA-Z-]+)*))?$ ]]; then
               version=$(echo "${GITHUB_REF}" | sed -E 's|.*/v||')
               echo "version=${version}" >> $GITHUB_ENV