diff --git a/.github/workflows/schedule-4.x.yml b/.github/workflows/ci-4.x.yml
similarity index 98%
rename from .github/workflows/schedule-4.x.yml
rename to .github/workflows/ci-4.x.yml
index 73dbff5aa..2a079cb6f 100644
--- a/.github/workflows/schedule-4.x.yml
+++ b/.github/workflows/ci-4.x.yml
@@ -1,4 +1,4 @@
-name: vertx-sql-client nightly (4.x)
+name: vertx-sql-client (4.x)
 on:
   schedule:
     - cron: '0 4 * * *'
diff --git a/.github/workflows/ci-5.x-stable.yml b/.github/workflows/ci-5.x-stable.yml
new file mode 100644
index 000000000..4fc9e7f25
--- /dev/null
+++ b/.github/workflows/ci-5.x-stable.yml
@@ -0,0 +1,16 @@
+name: vertx-sql-client (5.x-stable)
+on:
+  push:
+    branches:
+      - '5.[0-9]+'
+  pull_request:
+    branches:
+      - '5.[0-9]+'
+  schedule:
+    - cron: '0 6 * * *'
+jobs:
+  CI-CD:
+    uses: ./.github/workflows/ci-matrix-5.x.yml
+    secrets: inherit
+    with:
+      branch: ${{ github.event_name == 'schedule' && vars.VERTX_5_STABLE_BRANCH || github.event.pull_request.head.sha || github.ref_name }}
diff --git a/.github/workflows/ci-5.x.yml b/.github/workflows/ci-5.x.yml
index fdf920808..3cecb6fe8 100644
--- a/.github/workflows/ci-5.x.yml
+++ b/.github/workflows/ci-5.x.yml
@@ -3,11 +3,11 @@ on:
   push:
     branches:
       - master
-      - '5.[0-9]+'
   pull_request:
     branches:
       - master
-      - '5.[0-9]+'
+  schedule:
+    - cron: '0 5 * * *'
 jobs:
   CI-CD:
     uses: ./.github/workflows/ci-matrix-5.x.yml
diff --git a/.github/workflows/schedule-5.x-stable.yml b/.github/workflows/schedule-5.x-stable.yml
deleted file mode 100644
index fb9a7e980..000000000
--- a/.github/workflows/schedule-5.x-stable.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-name: vertx-sql-client nightly (5.x-stable)
-on:
-  schedule:
-    - cron: '0 6 * * *'
-jobs:
-  CI-CD:
-    uses: ./.github/workflows/ci-matrix-5.x.yml
-    secrets: inherit
-    with:
-      branch: ${{ github.event_name == 'schedule' && vars.VERTX_5_STABLE_BRANCH || github.ref_name }}
diff --git a/.github/workflows/schedule-5.x.yml b/.github/workflows/schedule-5.x.yml
deleted file mode 100644
index 785177017..000000000
--- a/.github/workflows/schedule-5.x.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-name: vertx-sql-client nightly (5.x)
-on:
-  schedule:
-    - cron: '0 5 * * *'
-jobs:
-  CI-CD:
-    uses: ./.github/workflows/ci-matrix-5.x.yml
-    secrets: inherit
-    with:
-      branch: ${{ github.ref_name }}