diff --git a/Jenkinsfile b/Jenkinsfile
index d97e6c625cd..88cacf755bc 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -157,13 +157,13 @@ stage('Configure') {
 					// and it's useful to test that.
 					new JdkBuildEnvironment(version: '20', testCompilerTool: 'OpenJDK 20 Latest',
 							testLauncherArgs: '--enable-preview',
-							condition: TestCondition.AFTER_MERGE),
+							condition: TestCondition.ON_DEMAND),
 					new JdkBuildEnvironment(version: '21', testCompilerTool: 'OpenJDK 21 Latest',
 							testLauncherArgs: '--enable-preview',
 							condition: TestCondition.AFTER_MERGE),
 					new JdkBuildEnvironment(version: '22', testCompilerTool: 'OpenJDK 22 Latest',
 							testLauncherArgs: '--enable-preview',
-							condition: TestCondition.AFTER_MERGE)
+							condition: TestCondition.ON_DEMAND)
 					// IMPORTANT: Make sure to update the documentation for any newly supported Java versions
 					//            See java-version.main.compatible.expected.text in POMs.
 			],
@@ -319,7 +319,9 @@ stage('Configure') {
 			pipelineTriggers(
 					// HSEARCH-3417: do not add snapshotDependencies() here, this was known to cause problems.
 					[
-							issueCommentTrigger('.*test this please.*')
+							issueCommentTrigger('.*test this please.*'),
+							// Run every week Sunday @ 2 AM
+							cron('0 2 * * 0')
 					]
 							+ helper.generateUpstreamTriggers()
 			),
diff --git a/ci/dependency-update/Jenkinsfile b/ci/dependency-update/Jenkinsfile
index 70acba5f8b9..fd5856bf922 100644
--- a/ci/dependency-update/Jenkinsfile
+++ b/ci/dependency-update/Jenkinsfile
@@ -87,10 +87,6 @@ String qualify(String radical) {
 
 pipeline {
 	agent none
-	triggers {
-		// Run at least once per week, in case of snapshot updates.
-		cron '@weekly'
-	}
 	parameters {
 		// choice parameter doesn't have a default, but the first value should be treated as a default, if it wasn't specified manually.
 		// Make sure tp update axis and settings() when adding new choice parameter.