diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index e271e9c08882ba362123cc873bcb6d3643aa01df..433f0bdb3c65f2da486c356e606ca3b3a5d7c9ee 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -18,5 +18,17 @@ include:
       file: /ci/build/dist.yml
     - project: "AlekSIS/official/AlekSIS"
       file: /ci/docker/dist.yml
-    - project: "AlekSIS/official/AlekSIS"
-      file: /ci/publish/pypi.yml
+
+deploy_gitlab:
+  interruptible: true
+  stage: publish
+  script:
+    - if [ x$CI_COMMIT_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 ;
+      else
+       poetry version $(poetry version | cut -d" " -f2)+$(date --date=${CI_COMMIT_TIMESTAMP} +%Y%m%d%H%M%S).${CI_COMMIT_SHORT_SHA} ;
+      fi
+    - poetry publish -r gitlab