diff --git a/ci/deploy_pypi.yml b/ci/deploy_pypi.yml
index 6b235ad05fe3eb2d70f706a93fedd91219cd6605..c5c4b0d85237dc8e534923c05c8ee9d5454dc8e6 100644
--- a/ci/deploy_pypi.yml
+++ b/ci/deploy_pypi.yml
@@ -1,6 +1,14 @@
 deploy_pypi:
   stage: deploy
   script:
+    - if [ $CI_COMMIT_REF_NAME = master ]; then
+       poetry version $(poetry version | cut -d" " -f2)+$(date +%s).${CI_COMMIT_SHORT_SHA} ;
+      elif [ x$CI_OMMIT_REF_NAME = x$CI_COMMIT_TAG ]; then
+       if ! [ "$(poetry version | cut -d" " -f2)" = $CI_COMMIT_REF_NAME ]; then
+        echo "Package version does not match tag. Aborting build of tag!" >/dev/fd/2 ;
+        exit 1 ;
+       fi ;
+      fi
     - if [ $CI_COMMIT_REF_NAME = master ]; then
        poetry publish -r gitlab ;
       elif [ x$CI_OMMIT_REF_NAME = x$CI_COMMIT_TAG ]; then