diff --git a/.gitea/workflows/deploy-prod.yml b/.gitea/workflows/deploy-prod.yml
index 5cc5c40d..39c2b933 100644
--- a/.gitea/workflows/deploy-prod.yml
+++ b/.gitea/workflows/deploy-prod.yml
@@ -2,7 +2,7 @@ name: Deploy to Production
 
 on:
   workflow_run:
-    workflows: ["Prepare Release", "Validators (Pushes and Pull Requests)"]
+    workflows: ["Prepare Release"]
     types: [completed]
   workflow_dispatch:
     inputs:
diff --git a/.gitea/workflows/prepare-release.yml b/.gitea/workflows/prepare-release.yml
index 05fc98a1..6b9a99d0 100644
--- a/.gitea/workflows/prepare-release.yml
+++ b/.gitea/workflows/prepare-release.yml
@@ -1,8 +1,9 @@
 name: Prepare Release
 
 on:
-  push:
-    branches: [main]
+  workflow_run:
+    workflows: ["Validators (Pushes and Pull Requests)"]
+    types: [completed]
   workflow_dispatch:
     inputs:
       version:
@@ -16,6 +17,7 @@ env:
 jobs:
   build-and-release:
     name: Build & Create Release
+    if: ${{ github.event_name == 'workflow_dispatch' || github.event.workflow_run.conclusion == 'success' }}
     runs-on: ubuntu-latest
     timeout-minutes: 30
     outputs: