diff --git a/.github/nightly_matrix.php b/.github/nightly_matrix.php
index 0fd712f29db6e..acb27a5cfc1bf 100644
--- a/.github/nightly_matrix.php
+++ b/.github/nightly_matrix.php
@@ -46,11 +46,12 @@ function get_current_version(): array {
     return [$major, $minor];
 }
 
-function select_jobs($trigger, $labels, $php_version, $ref, $all_variations) {
+function select_jobs($nightly, $labels, $php_version, $ref, $all_variations) {
     $no_jobs = in_array('CI: No jobs', $labels, true);
-    $all_jobs = in_array('CI: All jobs', $labels, true);
+    $all_jobs = in_array('CI: All jobs', $labels, true) || $nightly;
     $test_alpine = in_array('CI: Alpine', $labels, true);
     $test_community = in_array('CI: Community', $labels, true);
+    $test_coverage = in_array('CI: COVERAGE', $labels, true);
     $test_freebsd = in_array('CI: FreeBSD', $labels, true);
     $test_libmysqlclient = in_array('CI: libmysqlclient', $labels, true);
     $test_linux_ppc64 = in_array('CI: Linux PPC64', $labels, true);
@@ -59,6 +60,7 @@ function select_jobs($trigger, $labels, $php_version, $ref, $all_variations) {
     $test_macos = in_array('CI: macOS', $labels, true);
     $test_msan = in_array('CI: MSAN', $labels, true);
     $test_opcache_variation = in_array('CI: Opcache Variation', $labels, true);
+    $test_pecl = in_array('CI: PECL', $labels, true);
     $test_windows = in_array('CI: Windows', $labels, true);
 
     $jobs = [];
@@ -71,7 +73,7 @@ function select_jobs($trigger, $labels, $php_version, $ref, $all_variations) {
             : ['type' => ['asan']];
         $jobs['COMMUNITY']['config']['symfony_version'] = version_compare($php_version, '8.4', '>=') ? '8.1' : '7.4';
     }
-    if ($trigger === 'schedule' && $ref === 'master') {
+    if (($all_jobs && $ref === 'master') || $test_coverage) {
         $jobs['COVERAGE'] = true;
     }
     if ($all_jobs || $test_libmysqlclient) {
@@ -119,7 +121,7 @@ function select_jobs($trigger, $labels, $php_version, $ref, $all_variations) {
     if ($all_jobs || $test_opcache_variation) {
         $jobs['OPCACHE_VARIATION'] = true;
     }
-    if ($trigger === 'schedule' && $ref === 'master') {
+    if (($all_jobs && $ref === 'master') || $test_pecl) {
         $jobs['PECL'] = true;
     }
     if ($all_jobs || !$no_jobs || $test_windows) {
@@ -157,11 +159,12 @@ function select_jobs($trigger, $labels, $php_version, $ref, $all_variations) {
 
 $labels = json_decode($argv[4] ?? '[]', true) ?? [];
 $labels = array_column($labels, 'name');
-$all_variations = $trigger === 'schedule' || $trigger === 'workflow_dispatch' || in_array('CI: All variations', $labels, true);
+$nightly = $trigger === 'schedule' || $trigger === 'workflow_dispatch';
+$all_variations = $nightly || in_array('CI: All variations', $labels, true);
 
 foreach ($branches as &$branch) {
     $php_version = $branch['version'][0] . '.' . $branch['version'][1];
-    $branch['jobs'] = select_jobs($trigger, $labels, $php_version, $branch['ref'], $all_variations);
+    $branch['jobs'] = select_jobs($nightly, $labels, $php_version, $branch['ref'], $all_variations);
     $branch['config']['ubuntu_version'] = version_compare($php_version, '8.5', '>=') ? '24.04' : '22.04';
 }
 
diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
index 1d066ec7f9a01..4fffc701f9260 100644
--- a/.github/workflows/nightly.yml
+++ b/.github/workflows/nightly.yml
@@ -310,6 +310,7 @@ jobs:
         with:
           ref: ${{ fromJson(inputs.branch).ref }}
       - name: Update clang
+        timeout-minutes: 10
         uses: ./.github/actions/macos-update-clang
       - name: brew
         timeout-minutes: 10
@@ -814,6 +815,9 @@ jobs:
         with:
           path: php
           ref: ${{ fromJson(inputs.branch).ref }}
+      # Used for ccache action
+      - name: Move .github
+        run: mv php/.github .
       - name: git checkout apcu
         uses: actions/checkout@v6
         with:
@@ -830,12 +834,12 @@ jobs:
           repository: php-memcached-dev/php-memcached
           path: memcached
       - name: git checkout redis
+        if: ${{ false }}
         uses: actions/checkout@v6
         with:
           repository: phpredis/phpredis
           path: redis
       - name: git checkout xdebug
-        if: false
         uses: actions/checkout@v6
         with:
           repository: xdebug/xdebug
@@ -891,13 +895,13 @@ jobs:
           ./configure --prefix=/opt/php --with-php-config=/opt/php/bin/php-config
           make -j$(/usr/bin/nproc)
       - name: build redis
+        if: ${{ false }}
         run: |
           cd redis
           /opt/php/bin/phpize
           ./configure --prefix=/opt/php --with-php-config=/opt/php/bin/php-config
           make -j$(/usr/bin/nproc)
       - name: build xdebug
-        if: false
         run: |
           cd xdebug
           /opt/php/bin/phpize
diff --git a/ext/curl/tests/curl_persistent_share_002.phpt b/ext/curl/tests/curl_persistent_share_002.phpt
index fbd6631b9ba13..0220adeb6a6f1 100644
--- a/ext/curl/tests/curl_persistent_share_002.phpt
+++ b/ext/curl/tests/curl_persistent_share_002.phpt
@@ -4,6 +4,7 @@ Curl persistent share handle test with different options
 curl
 --SKIPIF--
 <?php
+if (getenv('SKIP_REPEAT')) die("skip Not repeatable");
 include 'skipif-nocaddy.inc';
 ?>
 --FILE--