diff --git a/.github/workflows/build-trigger.yml b/.github/workflows/build-trigger.yml
deleted file mode 100644
index 47dddfc98..000000000
--- a/.github/workflows/build-trigger.yml
+++ /dev/null
@@ -1,13 +0,0 @@
-name: Build trigger
-
-on:
-  push:
-    branches:
-      - "main"
-  workflow_dispatch:
-
-jobs:
-  build:
-    uses: ./.github/workflows/build.yml
-    with:
-      make-prerelease: true
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 750dfdbe9..2bf5bb83c 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -1,6 +1,9 @@
 name: build
 
 on:
+  push:
+    branches:
+      - "main"
   workflow_dispatch:
     inputs:
       build-ref:
@@ -121,7 +124,7 @@ jobs:
 
       - name: Build prerelease
         run: make prerelease
-        if: ${{ github.event.inputs.make-prerelease == 'true' }}
+        if: ${{ github.event_name != 'workflow_dispatch' || github.event.inputs.make-prerelease == 'true' }}
 
       - name: Build
         env:
@@ -173,7 +176,7 @@ jobs:
 
       - name: Build prerelease
         run: make prerelease
-        if: ${{ github.event.inputs.make-prerelease == 'true' }}
+        if: ${{ github.event_name != 'workflow_dispatch' || github.event.inputs.make-prerelease == 'true' }}
 
       - name: Install Linux build utilties
         run: |
@@ -283,7 +286,7 @@ jobs:
 
       - name: Build prerelease
         run: make prerelease
-        if: ${{ github.event.inputs.make-prerelease == 'true' }}
+        if: ${{ github.event_name != 'workflow_dispatch' || github.event.inputs.make-prerelease == 'true' }}
 
       - name: Build
         env:
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index b65bb5b1f..91e8d18d8 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -115,8 +115,6 @@ jobs:
           fi
           echo "::set-output name=build-ref::$(git rev-parse HEAD)"
 
-      - run: sleep 120
-
       - name: Invoke build workflow
         uses: benc-uk/workflow-dispatch@v1.1
         with: