diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 13e1b55..c5d9008 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -1,13 +1,13 @@
-name: Release Upload
+name: Release
+
 on:
-  release:
-    types: [ "published" ]
+  push:
+    tags: 'rpki-ta-0-*'
 
 jobs:
-  publish:
+  build:
+    if: github.repository == 'RIPE-NCC/rpki-ta-0'
     runs-on: ubuntu-latest
-    name: Upload artefact to the latest release
-    
     steps:
       - uses: actions/checkout@v3
 
@@ -19,18 +19,18 @@ jobs:
 
       - name: Setup Gradle
         uses: gradle/gradle-build-action@v2.12.0
-
+  
       - name: Execute Gradle build
         run: ./gradlew build
-
+  
       - name: Rename the package
-        run: mv $(find build/distributions -name rpki-ta-0\*.tgz) rpki-ta-0-java-11.tgz
-
-      - name: Upload binaries to release
-        uses: svenstaro/upload-release-action@v2
+        run: mv $(find build/distributions -name rpki-ta-0\*.tgz) rpki-ta-0-${{github.ref_name}}-java-11.tgz
+  
+      - name: Release
+        uses: softprops/action-gh-release@v2
+        if: startsWith(github.ref, 'refs/tags/')
         with:
-          repo_token: ${{ secrets.GITHUB_TOKEN }}
-          file: rpki-ta-0-java-11.tgz
-          asset_name: rpki-ta-0-java-11.tgz
-          tag: ${{ github.ref }}
-
+          files: rpki-ta-0-java-11.tgz
+          draft: true
+          body: It needs to be filled in manually
+