diff --git a/.woodpecker/.gradle.yml b/.woodpecker/.gradle.yml
index 86212ee..58219f5 100644
--- a/.woodpecker/.gradle.yml
+++ b/.woodpecker/.gradle.yml
@@ -2,9 +2,11 @@ pipeline:
   maven:
     image: gradle:alpine
     pull: true
+    environment:
+      - GRADLE_OPTS=-Dorg.gradle.daemon=false -Dorg.gradle.jvmargs=-Xmx2G
+      - GRADLE_USER_HOME=${CI_WORKSPACE}/.gradle
     commands:
-      - export GRADLE_USER_HOME=`pwd`/.gradle
-      - gradle publish -Pmaven="https://git.frohnmeyer-wds.de/api/packages/Johannes/maven"
+      - gradle publish -Pmaven="${GITEA_API}/packages/${CI_REPO_OWNER}/maven"
     secrets: [ maven_token ]
     when:
-      - branch: master
\ No newline at end of file
+      - branch: master
diff --git a/convention/src/main/kotlin/jf.maven-publish.gradle.kts b/convention/src/main/kotlin/jf.maven-publish.gradle.kts
index 13d05d8..1c85ff7 100644
--- a/convention/src/main/kotlin/jf.maven-publish.gradle.kts
+++ b/convention/src/main/kotlin/jf.maven-publish.gradle.kts
@@ -12,8 +12,8 @@ publishing {
                 name = "dynamic"
 
                 credentials(HttpHeaderCredentials::class) {
-                    name = "Job-Token"
-                    value = System.getenv()["CI_JOB_TOKEN"]
+                    name = "Authorization"
+                    value = System.getenv()["MAVEN_TOKEN"]
                 }
                 authentication {
                     create<HttpHeaderAuthentication>("header")
diff --git a/static/docs.yml b/static/docs.yml
index 7836dbb..b6ec883 100644
--- a/static/docs.yml
+++ b/static/docs.yml
@@ -1,11 +1,23 @@
-pages:
-  image: archlinux:latest
-  stage: deploy
-  script:
-    - pacman -Sy mdbook --noconfirm
-    - mdbook build
-  artifacts:
-    paths:
-      - public
-  only:
-    - master
+pipeline:
+  build:
+    image: archlinux:latest
+    commands:
+      - pacman -Sy mdbook --noconfirm
+      - mdbook build
+    when:
+      - branch: master
+  publish:
+    image: woodpeckerci/plugin-s3
+    settings:
+      bucket: pages
+      region: nebula
+      path_style: true
+      endpoint: https://s3.frohnmeyer-wds.de
+      access_key: pages
+      secret_key:
+        from_secret: pages_secret
+      source: public/**/*
+      target: /${CI_REPO}
+      strip_prefix: public/
+    when:
+      - branch: master
diff --git a/static/jfmod.yml b/static/jfmod.yml
index b3e35a8..4513d9f 100644
--- a/static/jfmod.yml
+++ b/static/jfmod.yml
@@ -1,35 +1,46 @@
-image: gradle:alpine
-
-variables:
-  GRADLE_OPTS: "-Dorg.gradle.daemon=false -Dorg.gradle.jvmargs=-Xmx2G"
-
-before_script:
-  - export GRADLE_USER_HOME=`pwd`/.gradle
-
-stages:
-  - build
-  - test
-  - deploy
-
-build_test:
-  stage: build
-  script:
-    - gradle --build-cache deployDebug -Pmaven="$CI_API_V4_URL/projects/$CI_PROJECT_ID/packages/maven"
-    - cp build/libs/* ./
-    - cp build/devlibs/*-dev.jar ./
-    - rm -f *-maven.jar *-sources.jar *-testmod.jar *-config-inject.jar
-    - mv *-dev.jar dev.zip
-    - mv *.jar latest.jar
-    - mv dev.zip latest-dev.jar
+pipeline:
+  build_test:
+    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 deployDebug -Pmaven="${GITEA_API}/packages/${CI_REPO_OWNER}/maven"
+      - mkdir artifacts
+      - cp build/libs/* artifacts/
+      - cp build/devlibs/*-dev.jar artifacts/
+      - pushd artifacts
+      - rm -f *-maven.jar *-sources.jar *-testmod.jar *-config-inject.jar
+      - mv *-dev.jar dev.zip
+      - mv *.jar latest.jar
+      - mv dev.zip latest-dev.jar
+      - popd
+    secrets: [ maven_token ]
   artifacts:
-    paths:
-      - build/libs
-      - latest.jar
-      - latest-dev.jar
-
-deploy:
-  rules:
-    - if: $CI_COMMIT_TAG && '$CI_MERGE_REQUEST_SOURCE_BRANCH_NAME =~ /^master/'
-  stage: deploy
-  script:
-    - gradle --build-cache deployRelease -Prelease -Pmaven="$CI_API_V4_URL/projects/$CI_PROJECT_ID/packages/maven"
+    image: woodpeckerci/plugin-s3
+    settings:
+      bucket: pages
+      region: nebula
+      path_style: true
+      endpoint: https://s3.frohnmeyer-wds.de
+      access_key: pages
+      secret_key:
+        from_secret: pages_secret
+      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="${GITEA_API}/packages/${CI_REPO_OWNER}/maven"
+      - TODO add release artifact
+    secrets: [ maven_token ]
+    when:
+      - event: tag
+        branch: master