diff --git a/templates/gitlab-ci-python.yml b/templates/gitlab-ci-python.yml
index da42979d3a3c1961d0d0b8cec20aea62ce5e07e9..8686b0c15a9abc40213977aab731f7882b183e8a 100644
--- a/templates/gitlab-ci-python.yml
+++ b/templates/gitlab-ci-python.yml
@@ -240,7 +240,7 @@ variables:
   # default integration ref name (pattern)
   INTEG_REF: '/^develop$/'
   # default release tag name (pattern)
-  RELEASE_REF: '/^v?[0-9]+\.[0-9]+\.[0-9]+$/'
+  RELEASE_REF: '/^v?[0-9]+\.[0-9]+\.[0-9]+(-[a-zA-Z0-9-\.]+)?(\+[a-zA-Z0-9-\.]+)?$/'
 
   # compileall
   PYTHON_COMPILE_ARGS: $[[ inputs.compile-args ]]
@@ -622,7 +622,7 @@ variables:
     elif [[ -f "Pipfile" ]]
     then
       log_info "--- Build system auto-detected: Pipenv"
-      export PYTHON_BUILD_SYSTEM="pipenv"
+      export "pipenv"
     else
       log_error "--- Build system auto-detect failed: please read template doc"
       exit 1