diff --git a/Jenkinsfile b/Jenkinsfile
index f68a7b1bb1950b10d660c9f7fa6fa07c80164164..72bf19a39b908cbac91397d1687431e5d58521d0 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -47,6 +47,13 @@ node { step([$class: 'GitHubCommitStatusSetter']) }
 if (currentBuild.result == "SUCCESS" || currentBuild.result == "UNSTABLE") {
     if (helper.isOriginMaster(this)) {
         build job: 'OGS-6/clang-sanitizer', wait: false
-        build job: 'OGS-6/Deploy', wait: false
+        node('master') {
+            checkout scm
+            def tag = helper.getTag()
+            if (tag != "") {
+                keepBuild()
+                currentBuild.displayName = tag
+            }
+        }
     }
 }
diff --git a/scripts/jenkins/deploy.groovy b/scripts/jenkins/deploy.groovy
index 3084b4ed067826a0d6a1a3012e1c7426bdf1181b..2577ee39f040592b97e5a5ecb54a3553a13f06b5 100644
--- a/scripts/jenkins/deploy.groovy
+++ b/scripts/jenkins/deploy.groovy
@@ -6,16 +6,25 @@ node {
             fingerprintArtifacts: true, flatten: true,
             projectName: 'OGS-6/ufz/master',
             selector: [$class: 'LastCompletedBuildSelector']])
-            s3upload('*')
+            if (gitTag == "")
+                s3upload('*')
+            else
+                s3upload('*', "opengeosys/ogs6-releases/${gitTag}")
         build job: 'OGS-6/Deploy-Post', wait: false
     }
 }
 
-def s3upload(files) {
+def s3upload(files, bucket = null) {
+    def managed = false
+    if (bucket == null) {
+        managed = true
+        bucket = 'opengeosys'
+    }
+
     step([$class: 'S3BucketPublisher',
         dontWaitForConcurrentBuildCompletion: true, entries:
-        [[bucket: 'opengeosys', excludedFile: '', flatten: true, gzipFiles: false,
-            managedArtifacts: true, noUploadOnFailure: true, selectedRegion: 'eu-central-1',
+        [[bucket: "${bucket}", excludedFile: '', flatten: true, gzipFiles: false,
+            managedArtifacts: managed, noUploadOnFailure: true, selectedRegion: 'eu-central-1',
             sourceFile: "${files}", storageClass: 'STANDARD', uploadFromSlave: true,
             useServerSideEncryption: false]], profileName: 'S3 UFZ', userMetadata: []])
 }