diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml
index 2c83e23d..1f5411d5 100644
--- a/.github/workflows/cd.yml
+++ b/.github/workflows/cd.yml
@@ -1,11 +1,8 @@
 name: 🚀 CD
 
 on:
-  workflow_run:
-    workflows: ["🧪 CI"]
+  push:
     branches: [master]
-    types:
-      - completed
 
 permissions:
   contents: write # Needed for creating commits and tags
@@ -15,7 +12,7 @@ jobs:
   release:
     name: 🚀 Release
     runs-on: ubuntu-latest
-    if: ${{ github.event.workflow_run.conclusion == 'success' && !contains(github.event.workflow_run.head_commit.message, 'chore(release):') }}
+    if: ${{ !contains(github.event.head_commit.message, 'chore(release):') }}
     steps:
       - name: 📥 Checkout
         uses: actions/checkout@v4
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index f1f9a9f7..de97a34a 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -4,7 +4,7 @@ on:
   pull_request:
     branches: [master, dev]
   push:
-    branches: [master, dev]
+    branches: [dev]
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}-${{ github.event.number }}
@@ -40,7 +40,11 @@ jobs:
 
       - name: 🔍 Run oxlint on affected projects
         run: |
-          BASE=$(git merge-base HEAD origin/dev)
+          if [[ "${{ github.event_name }}" == "pull_request" ]]; then
+            BASE="origin/${{ github.base_ref }}"
+          else
+            BASE="HEAD~1"
+          fi
           pnpm nx affected --target=lint --base=$BASE --head=HEAD --parallel=3
 
       - name: 🎨 Check code formatting with dprint
@@ -72,7 +76,11 @@ jobs:
 
       - name: 🔍 Type check affected projects
         run: |
-          BASE=$(git merge-base HEAD origin/dev)
+          if [[ "${{ github.event_name }}" == "pull_request" ]]; then
+            BASE="origin/${{ github.base_ref }}"
+          else
+            BASE="HEAD~1"
+          fi
           pnpm nx affected --target=typecheck --base=$BASE --head=HEAD --parallel=3 --verbose
 
   # Build affected projects