diff --git a/static/jfmod.yml b/static/jfmod.yml
index 7b62f17..ce3d944 100644
--- a/static/jfmod.yml
+++ b/static/jfmod.yml
@@ -8,7 +8,11 @@ pipeline:
       - GRADLE_OPTS=-Dorg.gradle.daemon=false -Dorg.gradle.jvmargs=-Xmx2G
       - GRADLE_USER_HOME=${CI_WORKSPACE}/.gradle
     commands:
+      - if [ $CI_PIPELINE_EVENT = tag ] && [ $CI_COMMIT_BRANCH = $CI_REPO_DEFAULT_BRANCH ]; then
+      - gradle --build-cache deployRelease -Prelease -Pmaven="https://maven.frohnmeyer-wds.de/artifacts"
+      - else
       - gradle --build-cache deployDebug -Pmaven="https://maven.frohnmeyer-wds.de/artifacts"
+      - fi
       - mkdir artifacts
       - cp build/libs/* artifacts/
       - cp build/devlibs/*-dev.jar artifacts/
@@ -32,17 +36,4 @@ pipeline:
       source: artifacts/**/*
       target: /${CI_REPO}
     when:
-      - branch: master
-  deploy:
-    image: gradle:alpine
-    pull: true
-    environment:
-      - GRADLE_OPTS=-Dorg.gradle.daemon=false -Dorg.gradle.jvmargs=-Xmx2G
-      - GRADLE_USER_HOME=${CI_WORKSPACE}/.gradle
-    commands:
-      - gradle --build-cache deployRelease -Prelease -Pmaven="https://maven.frohnmeyer-wds.de/artifacts"
-      - TODO add release artifact
-    secrets: [ maven_token ]
-    when:
-      - event: tag
-        branch: master
+      - branch: ${CI_REPO_DEFAULT_BRANCH}