diff --git a/.github/workflows/build-engines-apple-intel.yml b/.github/workflows/build-engines-apple-intel.yml
deleted file mode 100644
index 05ebb4f97b33..000000000000
--- a/.github/workflows/build-engines-apple-intel.yml
+++ /dev/null
@@ -1,50 +0,0 @@
-name: Build Engines for Apple Intel
-on:
-  workflow_dispatch:
-    inputs:
-      commit:
-        description: "Commit on the given branch to build"
-        required: false
-
-jobs:
-  build:
-    # Do not change `name`, prisma-engines Buildkite build job depends on this name ending with the commit
-    name: "MacOS Intel engines build on branch ${{ github.event.ref }} for commit ${{ github.event.inputs.commit }}"
-    env:
-      SQLITE_MAX_VARIABLE_NUMBER: 250000
-      SQLITE_MAX_EXPR_DEPTH: 10000
-
-      # minimum supported version of macOS
-      MACOSX_DEPLOYMENT_TARGET: 10.15
-    runs-on: macos-13
-
-    steps:
-      - name: Output link to real commit
-        run: echo ${{ github.repository }}/commit/${{ github.event.inputs.commit }}
-
-      - name: Checkout ${{ github.event.inputs.commit }}
-        uses: actions/checkout@v4
-        with:
-          ref: ${{ github.event.inputs.commit }}
-
-      - uses: actions-rust-lang/setup-rust-toolchain@v1
-
-      - uses: actions/cache@v4
-        with:
-          path: |
-            ~/.cargo/registry
-            ~/.cargo/git
-            target
-          key: ${{ runner.os }}-intel-cargo-${{ hashFiles('**/Cargo.lock') }}
-
-      - run: |
-          cargo build --release -p query-engine -p query-engine-node-api -p schema-engine-cli -p prisma-fmt
-
-      - uses: actions/upload-artifact@v4
-        with:
-          name: binaries
-          path: |
-            ${{ github.workspace }}/target/release/schema-engine
-            ${{ github.workspace }}/target/release/prisma-fmt
-            ${{ github.workspace }}/target/release/query-engine
-            ${{ github.workspace }}/target/release/libquery_engine.dylib
diff --git a/.github/workflows/build-engines-apple-silicon.yml b/.github/workflows/build-engines-apple-silicon.yml
deleted file mode 100644
index 959c0e935653..000000000000
--- a/.github/workflows/build-engines-apple-silicon.yml
+++ /dev/null
@@ -1,52 +0,0 @@
-name: Build Engines for Apple Silicon
-on:
-  workflow_dispatch:
-    inputs:
-      commit:
-        description: "Commit on the given branch to build"
-        required: false
-
-jobs:
-  build:
-    # Do not change `name`, prisma-engines Buildkite build job depends on this name ending with the commit
-    name: "MacOS ARM64 (Apple Silicon) engines build on branch ${{ github.event.ref }} for commit ${{ github.event.inputs.commit }}"
-    env:
-      SQLITE_MAX_VARIABLE_NUMBER: 250000
-      SQLITE_MAX_EXPR_DEPTH: 10000
-    runs-on: macos-13
-
-    steps:
-      - name: Output link to real commit
-        run: echo ${{ github.repository }}/commit/${{ github.event.inputs.commit }}
-
-      - name: Checkout ${{ github.event.inputs.commit }}
-        uses: actions/checkout@v4
-        with:
-          ref: ${{ github.event.inputs.commit }}
-
-      - uses: actions-rust-lang/setup-rust-toolchain@v1
-
-      - name: Install aarch64 toolchain
-        run: rustup target add aarch64-apple-darwin
-
-      - uses: actions/cache@v4
-        with:
-          path: |
-            ~/.cargo/registry
-            ~/.cargo/git
-            target
-          key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }}
-
-      - run: xcodebuild -showsdks
-
-      - run: |
-          cargo build --target=aarch64-apple-darwin --release -p query-engine -p query-engine-node-api -p schema-engine-cli -p prisma-fmt
-
-      - uses: actions/upload-artifact@v4
-        with:
-          name: binaries
-          path: |
-            ${{ github.workspace }}/target/aarch64-apple-darwin/release/schema-engine
-            ${{ github.workspace }}/target/aarch64-apple-darwin/release/prisma-fmt
-            ${{ github.workspace }}/target/aarch64-apple-darwin/release/query-engine
-            ${{ github.workspace }}/target/aarch64-apple-darwin/release/libquery_engine.dylib
diff --git a/.github/workflows/build-engines-react-native.yml b/.github/workflows/build-engines-react-native.yml
deleted file mode 100644
index 235fc633fd3c..000000000000
--- a/.github/workflows/build-engines-react-native.yml
+++ /dev/null
@@ -1,101 +0,0 @@
-name: Build Engines for React native
-on:
-  workflow_dispatch:
-    inputs:
-      commit:
-        description: "Commit on the given branch to build"
-        required: false
-
-jobs:
-  build-ios:
-    # Do not change `name`, prisma-engines Buildkite build job depends on this name ending with the commit
-    name: "iOS build on branch ${{ github.event.ref }} for commit ${{ github.event.inputs.commit }}"
-    runs-on: macos-14
-
-    steps:
-      - name: Output link to real commit
-        run: echo ${{ github.repository }}/commit/${{ github.event.inputs.commit }}
-
-      - name: Checkout
-        uses: actions/checkout@v4
-        with:
-          ref: ${{ github.event.inputs.commit }}
-
-      - uses: actions-rust-lang/setup-rust-toolchain@v1
-        with:
-          targets: x86_64-apple-ios,aarch64-apple-ios,aarch64-apple-ios-sim
-
-      - uses: actions/cache@v4
-        with:
-          path: |
-            ~/.cargo/registry
-            ~/.cargo/git
-            target
-          key: ${{ runner.os }}-ios-cargo-${{ hashFiles('**/Cargo.lock') }}
-
-      - run: |
-          cd query-engine/query-engine-c-abi
-          make ios
-      - uses: actions/upload-artifact@v4
-        with:
-          name: ios
-          path: |
-            ${{ github.workspace }}/query-engine/query-engine-c-abi/ios/*
-
-  build-android:
-    # Do not change `name`, prisma-engines Buildkite build job depends on this name ending with the commit
-    name: "Android build on branch ${{ github.event.ref }} for commit ${{ github.event.inputs.commit }}"
-    runs-on: ubuntu-latest
-
-    steps:
-      - name: Output link to real commit
-        run: echo ${{ github.repository }}/commit/${{ github.event.inputs.commit }}
-
-      - name: Checkout
-        uses: actions/checkout@v4
-        with:
-          ref: ${{ github.event.inputs.commit }}
-      - uses: actions-rust-lang/setup-rust-toolchain@v1
-        with:
-          targets: aarch64-linux-android,armv7-linux-androideabi,x86_64-linux-android,i686-linux-android
-
-      - uses: nttld/setup-ndk@v1
-        with:
-          ndk-version: r26d
-
-      - uses: actions/cache@v4
-        with:
-          path: |
-            ~/.cargo/registry
-            ~/.cargo/git
-            target
-          key: ${{ runner.os }}-android-cargo-${{ hashFiles('**/Cargo.lock') }}
-
-      - run: |
-          cd query-engine/query-engine-c-abi
-          make android
-
-      - uses: actions/upload-artifact@v4
-        with:
-          name: android
-          path: |
-            ${{ github.workspace }}/query-engine/query-engine-c-abi/android/*
-  combine-artifacts:
-    # Do not change `name`, prisma-engines Buildkite build job depends on this name ending with the commit
-    name: "Combine iOS and Android artifacts on branch ${{ github.event.ref }} for commit ${{ github.event.inputs.commit }}"
-    runs-on: ubuntu-latest
-    needs:
-      - build-ios
-      - build-android
-    steps:
-      - name: Download artifacts
-        uses: actions/download-artifact@v4
-
-      - name: Upload combined artifact
-        uses: actions/upload-artifact@v4
-        with:
-          name: binaries
-          path: |
-            ${{ github.workspace }}/ios
-            ${{ github.workspace }}/android
-
diff --git a/.github/workflows/build-engines-windows.yml b/.github/workflows/build-engines-windows.yml
deleted file mode 100644
index 19425d5685d1..000000000000
--- a/.github/workflows/build-engines-windows.yml
+++ /dev/null
@@ -1,45 +0,0 @@
-name: Build Engines for Windows
-on:
-  workflow_dispatch:
-    inputs:
-      commit:
-        description: "Commit on the given branch to build"
-        required: true
-
-jobs:
-  build:
-    # Do not change `name`, prisma-engines Buildkite build job depends on this name ending with the commit
-    name: "Windows engines build on branch ${{ github.event.ref }} for commit ${{ github.event.inputs.commit }}"
-    env:
-      SQLITE_MAX_VARIABLE_NUMBER: 250000
-      SQLITE_MAX_EXPR_DEPTH: 10000
-      RUSTFLAGS: "-C target-feature=+crt-static"
-    runs-on: windows-latest
-
-    steps:
-      - name: Output link to real commit
-        run: echo ${{ github.repository }}/commit/${{ github.event.inputs.commit }}
-
-      - name: Checkout ${{ github.event.inputs.commit }}
-        uses: actions/checkout@v4
-        with:
-          ref: ${{ github.event.inputs.commit }}
-
-      - uses: actions-rust-lang/setup-rust-toolchain@v1
-
-      - uses: actions/cache@v4
-        with:
-          path: |
-            ~/.cargo/registry
-            ~/.cargo/git
-            target
-          key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }}
-
-      - run: cargo build --release
-
-      - uses: actions/upload-artifact@v4
-        with:
-          name: binaries
-          path: |
-            ${{ github.workspace }}/target/release/*.exe
-            ${{ github.workspace }}/target/release/*.dll
diff --git a/.github/workflows/build-engines.yml b/.github/workflows/build-engines.yml
index 3cc587c0daae..596b84375260 100644
--- a/.github/workflows/build-engines.yml
+++ b/.github/workflows/build-engines.yml
@@ -143,7 +143,7 @@ jobs:
     name: 'Release artifacts from branch ${{ github.event.ref }} for commit ${{ inputs.commit }}'
     runs-on: ubuntu-22.04
     concurrency:
-      group: ${{ inputs.commit }}
+      group: ${{ inputs.commit || github.sha }}
     needs:
       - is-release-necessary
       - build-linux
@@ -155,7 +155,7 @@ jobs:
 
     env:
       BUCKET_NAME: 'prisma-builds-github-actions'
-      PRISMA_ENGINES_COMMIT_SHA: ${{ inputs.commit }}
+      PRISMA_ENGINES_COMMIT_SHA: ${{ inputs.commit || github.sha }}
       DESTINATION_TARGET_PATH: 's3://prisma-builds-github-actions/all_commits/${{ inputs.commit }}'
 
     steps: