diff --git a/.gitlab/CI/release.yml b/.gitlab/CI/release.yml
index 3de8a59b94..cab452157a 100644
--- a/.gitlab/CI/release.yml
+++ b/.gitlab/CI/release.yml
@@ -18,3 +18,18 @@
     - if: $CI_PIPELINE_SOURCE == "schedule" && ( $CI_COMMIT_REF_NAME =~ /^master$/ || $CI_COMMIT_TAG =~ /^v[0-9]+\.[0-9]+\.[0-9]+/ || $CI_COMMIT_REF_NAME =~ /^r[0-9]+\.[0-9]+/ )
       when: always
     - when: never
+
+tag-release:
+  stage: tag
+  tags:
+    - veloren-docker
+#  rules:
+#    - if: $CI_PIPELINE_SOURCE == "schedule" && ( $CI_COMMIT_REF_NAME =~ /^master$/ || $CI_COMMIT_TAG =~ /^v[0-9]+\.[0-9]+\.[0-9]+/ || $CI_COMMIT_REF_NAME =~ /^r[0-9]+\.[0-9]+/ )
+#      when: always
+#    - when: never
+  script:
+    - git config --global user.email "gitlab@veloren.net"
+    - git config --global user.name "Veloren Admin"
+    - git remote add api-origin https://oauth2:${TAGTOKEN}@gitlab.com/veloren/veloren.git
+    - git tag -f airshipper
+    - git push api-origin --tags -f