diff --git a/.github/workflows/ant-release.yml b/.github/workflows/ant-release.yml
deleted file mode 100644
index aecaf28..0000000
--- a/.github/workflows/ant-release.yml
+++ /dev/null
@@ -1,18 +0,0 @@
-name: Release
-
-on:
-  release:
-    types: [created]
-
-jobs:
-  call-workflow:
-    uses: JOSM/JOSMPluginAction/.github/workflows/ant.yml@v1
-    with:
-      josm-revision: "r18723"
-      update-pluginssource: true
-      plugin-jar-name: 'openqa'
-    secrets:
-      trac-username: ${{ secrets.TRAC_USERNAME }}
-      trac-password: ${{ secrets.TRAC_PASSWORD }}
-
-
diff --git a/.github/workflows/ant.yml b/.github/workflows/ant.yml
index 0afb1e2..49edc55 100644
--- a/.github/workflows/ant.yml
+++ b/.github/workflows/ant.yml
@@ -10,8 +10,6 @@ on:
     branches:
       - master
       - $default-branch
-  schedule:
-  - cron: "46 19 * * 1"
   workflow_dispatch:
 
 jobs:
@@ -19,7 +17,12 @@ jobs:
     strategy:
       matrix:
         josm-revision: ["", "r18723"]
-    uses: JOSM/JOSMPluginAction/.github/workflows/ant.yml@v1
+    uses: JOSM/JOSMPluginAction/.github/workflows/ant.yml@v2
     with:
       josm-revision: ${{ matrix.josm-revision }}
       plugin-jar-name: 'openqa'
+      perform-revision-tagging: ${{ github.repository == 'JOSM/OpenQA' && github.ref_type == 'branch' && github.ref_name == 'master' && github.event_name != 'schedule' && github.event_name != 'pull_request' && matrix.josm-revision == 'r18724' }}
+    secrets: inherit
+    permissions:
+      contents: write
+      deployments: write
diff --git a/.github/workflows/reports.yaml b/.github/workflows/reports.yaml
index e96588c..43794f4 100644
--- a/.github/workflows/reports.yaml
+++ b/.github/workflows/reports.yaml
@@ -10,4 +10,4 @@ permissions:
 
 jobs:
   call-workflow:
-    uses: JOSM/JOSMPluginAction/.github/workflows/reports.yaml@v1
+    uses: JOSM/JOSMPluginAction/.github/workflows/reports.yaml@v2