diff --git a/.github/workflows/build-and-publish.yaml b/.github/workflows/build-and-publish.yaml
index d0cb941..cb4bd63 100644
--- a/.github/workflows/build-and-publish.yaml
+++ b/.github/workflows/build-and-publish.yaml
@@ -1,10 +1,9 @@
 name: Build and Publish
 
 on:
-  pull_request:
   push:
-    tags: ['**']
-    branches: ['**']
+    tags: ["**"]
+    branches: ["**"]
 
 jobs:
   call-workflow-passing-data:
diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
index 874e3f8..29d3e1a 100644
--- a/.github/workflows/release.yaml
+++ b/.github/workflows/release.yaml
@@ -5,15 +5,20 @@ on:
     inputs:
       release-type:
         description: "The scope of the release (major, minor or patch)."
-        default: "patch"
-        required: false
+        type: choice
+        required: true
+        default: patch
+        options:
+          - patch
+          - minor
+          - major
 
 jobs:
   call-workflow-passing-data:
     name: Java Gradle
-    uses: bakdata/ci-templates/.github/workflows/java-gradle-release.yaml@v1.4.0
+    uses: bakdata/ci-templates/.github/workflows/java-gradle-release.yaml@1.33.0
     with:
-      release-type: "${{ github.event.inputs.release-type }}"
+      release-type: "${{ inputs.release-type }}"
     secrets:
       github-email: "${{ secrets.GH_EMAIL }}"
       github-username: "${{ secrets.GH_USERNAME }}"