diff --git a/Jenkinsfile b/Jenkinsfile
index 56cbd5d951a..4e15d8d04c0 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -183,7 +183,7 @@ stage('Configure') {
 					// and it's useful to test that.
 					new JdkBuildEnvironment(version: '22', testCompilerTool: 'OpenJDK 22 Latest',
 							testLauncherArgs: '--enable-preview',
-							condition: TestCondition.AFTER_MERGE),
+							condition: TestCondition.ON_DEMAND),
 					// The following JDKs aren't supported by Hibernate ORM out-of-the box yet:
 					// they require the use of -Dnet.bytebuddy.experimental=true.
 					// Make sure to remove that argument as soon as possible
@@ -193,7 +193,7 @@ stage('Configure') {
 							condition: TestCondition.AFTER_MERGE),
 					new JdkBuildEnvironment(version: '24', testCompilerTool: 'OpenJDK 24 Latest',
 							testLauncherArgs: '--enable-preview -Dnet.bytebuddy.experimental=true',
-							condition: TestCondition.AFTER_MERGE),
+							condition: TestCondition.ON_DEMAND),
 					new JdkBuildEnvironment(version: '25', testCompilerTool: 'OpenJDK 25 Latest',
 							testLauncherArgs: '--enable-preview -Dnet.bytebuddy.experimental=true',
 							condition: TestCondition.AFTER_MERGE)
@@ -333,7 +333,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 a588f4a2818..fa90ff532a5 100644
--- a/ci/dependency-update/Jenkinsfile
+++ b/ci/dependency-update/Jenkinsfile
@@ -104,10 +104,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.