diff --git a/.idea/checkstyle-idea.xml b/.idea/checkstyle-idea.xml
index f3f09df3c8238..cf7807506e368 100644
--- a/.idea/checkstyle-idea.xml
+++ b/.idea/checkstyle-idea.xml
@@ -4,7 +4,7 @@
     <option name="configuration">
       <map>
         <entry key="active-configuration" value="PROJECT_RELATIVE:$PROJECT_DIR$/checkstyle_ide.xml:Elasticsearch" />
-        <entry key="checkstyle-version" value="9.2" />
+        <entry key="checkstyle-version" value="9.2.1" />
         <entry key="copy-libs" value="false" />
         <entry key="location-0" value="BUNDLED:(bundled):Sun Checks" />
         <entry key="location-1" value="BUNDLED:(bundled):Google Checks" />
diff --git a/build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/InternalTestClustersPlugin.java b/build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/InternalTestClustersPlugin.java
index 1d0eff0b3aa70..cc8348d424e58 100644
--- a/build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/InternalTestClustersPlugin.java
+++ b/build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/InternalTestClustersPlugin.java
@@ -8,6 +8,7 @@
 
 package org.elasticsearch.gradle.internal;
 
+import org.elasticsearch.gradle.VersionProperties;
 import org.elasticsearch.gradle.internal.info.BuildParams;
 import org.elasticsearch.gradle.testclusters.TestClustersPlugin;
 import org.gradle.api.Plugin;
@@ -31,6 +32,10 @@ public void apply(Project project) {
         project.getRootProject().getPluginManager().apply(InternalReaperPlugin.class);
         TestClustersPlugin testClustersPlugin = project.getPlugins().apply(TestClustersPlugin.class);
         testClustersPlugin.setRuntimeJava(providerFactory.provider(() -> BuildParams.getRuntimeJavaHome()));
+        testClustersPlugin.setIsReleasedVersion(
+            version -> (version.equals(VersionProperties.getElasticsearchVersion()) && BuildParams.isSnapshotBuild() == false)
+                || BuildParams.getBwcVersions().unreleasedInfo(version) == null
+        );
     }
 
 }
diff --git a/build-tools/src/main/java/org/elasticsearch/gradle/Version.java b/build-tools/src/main/java/org/elasticsearch/gradle/Version.java
index dfa8be295a8f7..9367b38548b6c 100644
--- a/build-tools/src/main/java/org/elasticsearch/gradle/Version.java
+++ b/build-tools/src/main/java/org/elasticsearch/gradle/Version.java
@@ -7,6 +7,7 @@
  */
 package org.elasticsearch.gradle;
 
+import java.io.Serializable;
 import java.util.Objects;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
@@ -14,7 +15,7 @@
 /**
  * Encapsulates comparison and printing logic for an x.y.z version.
  */
-public final class Version implements Comparable<Version> {
+public final class Version implements Comparable<Version>, Serializable {
     private final int major;
     private final int minor;
     private final int revision;
diff --git a/build-tools/src/main/java/org/elasticsearch/gradle/testclusters/ElasticsearchCluster.java b/build-tools/src/main/java/org/elasticsearch/gradle/testclusters/ElasticsearchCluster.java
index 2f172d017d3bc..159282d900959 100644
--- a/build-tools/src/main/java/org/elasticsearch/gradle/testclusters/ElasticsearchCluster.java
+++ b/build-tools/src/main/java/org/elasticsearch/gradle/testclusters/ElasticsearchCluster.java
@@ -10,6 +10,7 @@
 import org.elasticsearch.gradle.FileSupplier;
 import org.elasticsearch.gradle.PropertyNormalization;
 import org.elasticsearch.gradle.ReaperService;
+import org.elasticsearch.gradle.Version;
 import org.gradle.api.Named;
 import org.gradle.api.NamedDomainObjectContainer;
 import org.gradle.api.Project;
@@ -61,6 +62,7 @@ public class ElasticsearchCluster implements TestClusterConfiguration, Named {
     private final ArchiveOperations archiveOperations;
     private final ExecOperations execOperations;
     private final Provider<File> runtimeJava;
+    private final Function<Version, Boolean> isReleasedVersion;
     private int nodeIndex = 0;
 
     public ElasticsearchCluster(
@@ -73,7 +75,8 @@ public ElasticsearchCluster(
         ExecOperations execOperations,
         FileOperations fileOperations,
         File workingDirBase,
-        Provider<File> runtimeJava
+        Provider<File> runtimeJava,
+        Function<Version, Boolean> isReleasedVersion
     ) {
         this.path = path;
         this.clusterName = clusterName;
@@ -85,6 +88,7 @@ public ElasticsearchCluster(
         this.fileOperations = fileOperations;
         this.workingDirBase = workingDirBase;
         this.runtimeJava = runtimeJava;
+        this.isReleasedVersion = isReleasedVersion;
         this.nodes = project.container(ElasticsearchNode.class);
         this.nodes.add(
             new ElasticsearchNode(
@@ -98,7 +102,8 @@ public ElasticsearchCluster(
                 execOperations,
                 fileOperations,
                 workingDirBase,
-                runtimeJava
+                runtimeJava,
+                isReleasedVersion
             )
         );
 
@@ -131,7 +136,8 @@ public void setNumberOfNodes(int numberOfNodes) {
                     execOperations,
                     fileOperations,
                     workingDirBase,
-                    runtimeJava
+                    runtimeJava,
+                    isReleasedVersion
                 )
             );
         }
@@ -422,6 +428,16 @@ public void rolesFile(File rolesYml) {
         nodes.all(node -> node.rolesFile(rolesYml));
     }
 
+    @Override
+    public void requiresFeature(String feature, Version from) {
+        nodes.all(node -> node.requiresFeature(feature, from));
+    }
+
+    @Override
+    public void requiresFeature(String feature, Version from, Version until) {
+        nodes.all(node -> node.requiresFeature(feature, from, until));
+    }
+
     private void writeUnicastHostsFiles() {
         String unicastUris = nodes.stream().flatMap(node -> node.getAllTransportPortURI().stream()).collect(Collectors.joining("\n"));
         nodes.forEach(node -> {
diff --git a/build-tools/src/main/java/org/elasticsearch/gradle/testclusters/ElasticsearchNode.java b/build-tools/src/main/java/org/elasticsearch/gradle/testclusters/ElasticsearchNode.java
index 9704fce7b929d..3ef499d4ef814 100644
--- a/build-tools/src/main/java/org/elasticsearch/gradle/testclusters/ElasticsearchNode.java
+++ b/build-tools/src/main/java/org/elasticsearch/gradle/testclusters/ElasticsearchNode.java
@@ -148,6 +148,7 @@ public class ElasticsearchNode implements TestClusterConfiguration {
     private final LazyPropertyList<FileCollection> extraJarConfigurations = new LazyPropertyList<>("Extra jar files", this);
     private final List<Map<String, String>> credentials = new ArrayList<>();
     private final List<File> roleFiles = new ArrayList<>();
+    private final List<FeatureFlag> featureFlags = new ArrayList<>();
     final LinkedHashMap<String, String> defaultConfig = new LinkedHashMap<>();
 
     private final Path confPathRepo;
@@ -159,6 +160,7 @@ public class ElasticsearchNode implements TestClusterConfiguration {
     private final Path esStdinFile;
     private final Path tmpDir;
     private final Provider<File> runtimeJava;
+    private final Function<Version, Boolean> isReleasedVersion;
 
     private int currentDistro = 0;
     private TestDistribution testDistribution;
@@ -185,7 +187,8 @@ public class ElasticsearchNode implements TestClusterConfiguration {
         ExecOperations execOperations,
         FileOperations fileOperations,
         File workingDirBase,
-        Provider<File> runtimeJava
+        Provider<File> runtimeJava,
+        Function<Version, Boolean> isReleasedVersion
     ) {
         this.clusterName = clusterName;
         this.path = path;
@@ -197,6 +200,7 @@ public class ElasticsearchNode implements TestClusterConfiguration {
         this.execOperations = execOperations;
         this.fileOperations = fileOperations;
         this.runtimeJava = runtimeJava;
+        this.isReleasedVersion = isReleasedVersion;
         workingDir = workingDirBase.toPath().resolve(safeName(name)).toAbsolutePath();
         confPathRepo = workingDir.resolve("repo");
         configFile = workingDir.resolve("config/elasticsearch.yml");
@@ -773,6 +777,16 @@ public void rolesFile(File rolesYml) {
         roleFiles.add(rolesYml);
     }
 
+    @Override
+    public void requiresFeature(String feature, Version from) {
+        featureFlags.add(new FeatureFlag(feature, from, null));
+    }
+
+    @Override
+    public void requiresFeature(String feature, Version from, Version until) {
+        featureFlags.add(new FeatureFlag(feature, from, until));
+    }
+
     private void runElasticsearchBinScriptWithInput(String input, String tool, CharSequence... args) {
         if (Files.exists(getDistroDir().resolve("bin").resolve(tool)) == false
             && Files.exists(getDistroDir().resolve("bin").resolve(tool + ".bat")) == false) {
@@ -820,19 +834,30 @@ private Map<String, String> getESEnvironment() {
         defaultEnv.put("ES_PATH_CONF", configFile.getParent().toString());
         String systemPropertiesString = "";
         if (systemProperties.isEmpty() == false) {
-            systemPropertiesString = " "
-                + systemProperties.entrySet()
-                    .stream()
-                    .map(entry -> "-D" + entry.getKey() + "=" + entry.getValue())
-                    // ES_PATH_CONF is also set as an environment variable and for a reference to ${ES_PATH_CONF}
-                    // to work ES_JAVA_OPTS, we need to make sure that ES_PATH_CONF before ES_JAVA_OPTS. Instead,
-                    // we replace the reference with the actual value in other environment variables
-                    .map(p -> p.replace("${ES_PATH_CONF}", configFile.getParent().toString()))
-                    .collect(Collectors.joining(" "));
+            systemPropertiesString = " " + systemProperties.entrySet().stream().peek(entry -> {
+                if (entry.getKey().contains("feature_flag")) {
+                    throw new TestClustersException("Invalid system property `" + entry.getKey() + "`. Use `requiresFeature` instead.");
+                }
+            })
+                .map(entry -> "-D" + entry.getKey() + "=" + entry.getValue())
+                // ES_PATH_CONF is also set as an environment variable and for a reference to ${ES_PATH_CONF}
+                // to work ES_JAVA_OPTS, we need to make sure that ES_PATH_CONF before ES_JAVA_OPTS. Instead,
+                // we replace the reference with the actual value in other environment variables
+                .map(p -> p.replace("${ES_PATH_CONF}", configFile.getParent().toString()))
+                .collect(Collectors.joining(" "));
         }
         if (systemProperties.containsKey("io.netty.leakDetection.level") == false) {
             systemPropertiesString = systemPropertiesString + " -Dio.netty.leakDetection.level=paranoid";
         }
+
+        String featureFlagsString = "";
+        if (featureFlags.isEmpty() == false && isReleasedVersion.apply(getVersion())) {
+            featureFlagsString = featureFlags.stream()
+                .filter(f -> getVersion().onOrAfter(f.getFrom()) && (f.getUntil() == null || getVersion().before(f.getUntil())))
+                .map(f -> "-D" + f.getFeature() + "=true")
+                .collect(Collectors.joining(" "));
+        }
+
         String jvmArgsString = "";
         if (jvmArgs.isEmpty() == false) {
             jvmArgsString = " " + jvmArgs.stream().peek(argument -> {
@@ -846,8 +871,19 @@ private Map<String, String> getESEnvironment() {
         String heapSize = System.getProperty("tests.heap.size", "512m");
         defaultEnv.put(
             "ES_JAVA_OPTS",
-            "-Xms" + heapSize + " -Xmx" + heapSize + " -ea -esa " + systemPropertiesString + " " + jvmArgsString + " " +
-            // Support passing in additional JVM arguments
+            "-Xms"
+                + heapSize
+                + " -Xmx"
+                + heapSize
+                + " -ea -esa "
+                + systemPropertiesString
+                + " "
+                + featureFlagsString
+                + " "
+                + jvmArgsString
+                + " "
+                +
+                // Support passing in additional JVM arguments
                 System.getProperty("tests.jvm.argline", "")
         );
         defaultEnv.put("ES_TMPDIR", tmpDir.toString());
@@ -1466,6 +1502,11 @@ public List<?> getExtraConfigFiles() {
         return extraConfigFiles.getNormalizedCollection();
     }
 
+    @Nested
+    public List<FeatureFlag> getFeatureFlags() {
+        return featureFlags;
+    }
+
     @Override
     @Internal
     public boolean isProcessAlive() {
@@ -1599,6 +1640,34 @@ public CharSequence[] getArgs() {
         }
     }
 
+    private static class FeatureFlag {
+        private final String feature;
+        private final Version from;
+        private final Version until;
+
+        public FeatureFlag(String feature, Version from, Version until) {
+            this.feature = feature;
+            this.from = from;
+            this.until = until;
+        }
+
+        @Input
+        public String getFeature() {
+            return feature;
+        }
+
+        @Input
+        public Version getFrom() {
+            return from;
+        }
+
+        @Input
+        @Optional
+        public Version getUntil() {
+            return until;
+        }
+    }
+
     private static class LinkCreationException extends UncheckedIOException {
         LinkCreationException(String message, IOException cause) {
             super(message, cause);
diff --git a/build-tools/src/main/java/org/elasticsearch/gradle/testclusters/TestClusterConfiguration.java b/build-tools/src/main/java/org/elasticsearch/gradle/testclusters/TestClusterConfiguration.java
index 1d4a377cb302d..126890629e60b 100644
--- a/build-tools/src/main/java/org/elasticsearch/gradle/testclusters/TestClusterConfiguration.java
+++ b/build-tools/src/main/java/org/elasticsearch/gradle/testclusters/TestClusterConfiguration.java
@@ -9,6 +9,7 @@
 
 import org.elasticsearch.gradle.FileSupplier;
 import org.elasticsearch.gradle.PropertyNormalization;
+import org.elasticsearch.gradle.Version;
 import org.gradle.api.file.FileCollection;
 import org.gradle.api.file.RegularFile;
 import org.gradle.api.logging.Logging;
@@ -97,6 +98,10 @@ public interface TestClusterConfiguration {
 
     void rolesFile(File rolesYml);
 
+    void requiresFeature(String feature, Version from);
+
+    void requiresFeature(String feature, Version from, Version until);
+
     String getHttpSocketURI();
 
     String getTransportPortURI();
diff --git a/build-tools/src/main/java/org/elasticsearch/gradle/testclusters/TestClustersPlugin.java b/build-tools/src/main/java/org/elasticsearch/gradle/testclusters/TestClustersPlugin.java
index a46453efbc942..2253498b47f72 100644
--- a/build-tools/src/main/java/org/elasticsearch/gradle/testclusters/TestClustersPlugin.java
+++ b/build-tools/src/main/java/org/elasticsearch/gradle/testclusters/TestClustersPlugin.java
@@ -10,6 +10,7 @@
 import org.elasticsearch.gradle.DistributionDownloadPlugin;
 import org.elasticsearch.gradle.ReaperPlugin;
 import org.elasticsearch.gradle.ReaperService;
+import org.elasticsearch.gradle.Version;
 import org.elasticsearch.gradle.util.GradleUtils;
 import org.gradle.api.NamedDomainObjectContainer;
 import org.gradle.api.Plugin;
@@ -30,6 +31,7 @@
 import org.gradle.process.ExecOperations;
 
 import java.io.File;
+import java.util.function.Function;
 
 import javax.inject.Inject;
 
@@ -45,6 +47,7 @@ public class TestClustersPlugin implements Plugin<Project> {
     private static final Logger logger = Logging.getLogger(TestClustersPlugin.class);
     private final ProviderFactory providerFactory;
     private Provider<File> runtimeJavaProvider;
+    private Function<Version, Boolean> isReleasedVersion = v -> true;
 
     @Inject
     protected FileSystemOperations getFileSystemOperations() {
@@ -75,6 +78,10 @@ public void setRuntimeJava(Provider<File> runtimeJava) {
         this.runtimeJavaProvider = runtimeJava;
     }
 
+    public void setIsReleasedVersion(Function<Version, Boolean> isReleasedVersion) {
+        this.isReleasedVersion = isReleasedVersion;
+    }
+
     @Override
     public void apply(Project project) {
         project.getPlugins().apply(DistributionDownloadPlugin.class);
@@ -124,7 +131,8 @@ private NamedDomainObjectContainer<ElasticsearchCluster> createTestClustersConta
                 getExecOperations(),
                 getFileOperations(),
                 new File(project.getBuildDir(), "testclusters"),
-                runtimeJavaProvider
+                runtimeJavaProvider,
+                isReleasedVersion
             );
         });
         project.getExtensions().add(EXTENSION_NAME, container);
diff --git a/client/rest-high-level/src/test/java/org/elasticsearch/client/ilm/LifecyclePolicyTests.java b/client/rest-high-level/src/test/java/org/elasticsearch/client/ilm/LifecyclePolicyTests.java
index f70346490991b..5d1aaa4caddda 100644
--- a/client/rest-high-level/src/test/java/org/elasticsearch/client/ilm/LifecyclePolicyTests.java
+++ b/client/rest-high-level/src/test/java/org/elasticsearch/client/ilm/LifecyclePolicyTests.java
@@ -14,6 +14,7 @@
 import org.elasticsearch.xcontent.NamedXContentRegistry;
 import org.elasticsearch.xcontent.ParseField;
 import org.elasticsearch.xcontent.XContentParser;
+import org.elasticsearch.xpack.core.ilm.RollupILMAction;
 import org.elasticsearch.xpack.core.ilm.TimeseriesLifecycleType;
 
 import java.util.ArrayList;
@@ -115,7 +116,7 @@ public void testValidatePhases() {
 
     public void testValidateHotPhase() {
         LifecycleAction invalidAction = null;
-        Map<String, LifecycleAction> actions = randomSubsetOf(VALID_HOT_ACTIONS).stream()
+        Map<String, LifecycleAction> actions = randomSubsetOf(getValidActionsForPhase("hot")).stream()
             .map(this::getTestAction)
             .collect(Collectors.toMap(LifecycleAction::getName, Function.identity()));
         if (randomBoolean()) {
@@ -138,7 +139,7 @@ public void testValidateHotPhase() {
 
     public void testValidateWarmPhase() {
         LifecycleAction invalidAction = null;
-        Map<String, LifecycleAction> actions = randomSubsetOf(VALID_WARM_ACTIONS).stream()
+        Map<String, LifecycleAction> actions = randomSubsetOf(getValidActionsForPhase("warm")).stream()
             .map(this::getTestAction)
             .collect(Collectors.toMap(LifecycleAction::getName, Function.identity()));
         if (randomBoolean()) {
@@ -157,7 +158,7 @@ public void testValidateWarmPhase() {
 
     public void testValidateColdPhase() {
         LifecycleAction invalidAction = null;
-        Map<String, LifecycleAction> actions = randomSubsetOf(VALID_COLD_ACTIONS).stream()
+        Map<String, LifecycleAction> actions = randomSubsetOf(getValidActionsForPhase("cold")).stream()
             .map(this::getTestAction)
             .collect(Collectors.toMap(LifecycleAction::getName, Function.identity()));
         if (randomBoolean()) {
@@ -195,7 +196,7 @@ public void testValidateFrozenPhase() {
 
     public void testValidateDeletePhase() {
         LifecycleAction invalidAction = null;
-        Map<String, LifecycleAction> actions = VALID_DELETE_ACTIONS.stream()
+        Map<String, LifecycleAction> actions = getValidActionsForPhase("delete").stream()
             .map(this::getTestAction)
             .collect(Collectors.toMap(LifecycleAction::getName, Function.identity()));
         if (randomBoolean()) {
@@ -225,15 +226,6 @@ public void testValidateEmptyDeletePhase() {
     public static LifecyclePolicy createRandomPolicy(String lifecycleName) {
         List<String> phaseNames = Arrays.asList("hot", "warm", "cold", "delete");
         Map<String, Phase> phases = new HashMap<>(phaseNames.size());
-        Function<String, Set<String>> validActions = (phase) -> {
-            return switch (phase) {
-                case "hot" -> VALID_HOT_ACTIONS;
-                case "warm" -> VALID_WARM_ACTIONS;
-                case "cold" -> VALID_COLD_ACTIONS;
-                case "delete" -> VALID_DELETE_ACTIONS;
-                default -> throw new IllegalArgumentException("invalid phase [" + phase + "]");
-            };
-        };
         Function<String, Boolean> allowEmptyActions = (phase) -> {
             return switch (phase) {
                 case "hot", "warm", "cold" -> true;
@@ -268,9 +260,9 @@ public static LifecyclePolicy createRandomPolicy(String lifecycleName) {
             Map<String, LifecycleAction> actions = new HashMap<>();
             List<String> actionNames;
             if (allowEmptyActions.apply(phase)) {
-                actionNames = randomSubsetOf(validActions.apply(phase));
+                actionNames = randomSubsetOf(getValidActionsForPhase(phase));
             } else {
-                actionNames = randomSubsetOf(randomIntBetween(1, validActions.apply(phase).size()), validActions.apply(phase));
+                actionNames = randomSubsetOf(randomIntBetween(1, getValidActionsForPhase(phase).size()), getValidActionsForPhase(phase));
             }
             if ("hot".equals(phase)) {
                 actions.put(
@@ -294,6 +286,18 @@ public static LifecyclePolicy createRandomPolicy(String lifecycleName) {
         return new LifecyclePolicy(lifecycleName, phases);
     }
 
+    private static Set<String> getValidActionsForPhase(String phase) {
+        Set<String> actions = switch (phase) {
+            case "hot" -> VALID_HOT_ACTIONS;
+            case "warm" -> VALID_WARM_ACTIONS;
+            case "cold" -> VALID_COLD_ACTIONS;
+            case "delete" -> VALID_DELETE_ACTIONS;
+            default -> throw new IllegalArgumentException("invalid phase [" + phase + "]");
+        };
+        // No test coverage exists here
+        return actions.stream().filter(a -> a.equals(RollupILMAction.NAME) == false).collect(Collectors.toSet());
+    }
+
     private LifecycleAction getTestAction(String actionName) {
         return switch (actionName) {
             case AllocateAction.NAME -> AllocateActionTests.randomInstance();
diff --git a/qa/full-cluster-restart/build.gradle b/qa/full-cluster-restart/build.gradle
index 8bb13c95a8641..a3af45b43363e 100644
--- a/qa/full-cluster-restart/build.gradle
+++ b/qa/full-cluster-restart/build.gradle
@@ -7,6 +7,7 @@
  */
 
 
+import org.elasticsearch.gradle.Version
 import org.elasticsearch.gradle.internal.info.BuildParams
 import org.elasticsearch.gradle.testclusters.StandaloneRestIntegTestTask
 
@@ -28,9 +29,7 @@ BuildParams.bwcVersions.withIndexCompatible { bwcVersion, baseName ->
       setting 'indices.memory.shard_inactive_time', '60m'
       setting 'path.repo', "${buildDir}/cluster/shared/repo/${baseName}"
       setting 'xpack.security.enabled', 'false'
-      if (BuildParams.isSnapshotBuild() == false) {
-        systemProperty 'es.index_mode_feature_flag_registered', 'true'
-      }
+      requiresFeature 'es.index_mode_feature_flag_registered', Version.fromString("8.0.0")
   }
 
   tasks.register("${baseName}#oldClusterTest", StandaloneRestIntegTestTask) {
diff --git a/qa/mixed-cluster/build.gradle b/qa/mixed-cluster/build.gradle
index 7f9d1e57adeb7..85880b388251e 100644
--- a/qa/mixed-cluster/build.gradle
+++ b/qa/mixed-cluster/build.gradle
@@ -6,6 +6,8 @@
  * Side Public License, v 1.
  */
 
+
+import org.elasticsearch.gradle.Version
 import org.elasticsearch.gradle.VersionProperties
 import org.elasticsearch.gradle.internal.info.BuildParams
 import org.elasticsearch.gradle.testclusters.StandaloneRestIntegTestTask
@@ -31,6 +33,7 @@ BuildParams.bwcVersions.withWireCompatible { bwcVersion, baseName ->
       numberOfNodes = 4
       setting 'path.repo', "${buildDir}/cluster/shared/repo/${baseName}"
       setting 'xpack.security.enabled', 'false'
+      requiresFeature 'es.index_mode_feature_flag_registered', Version.fromString("8.0.0")
     }
 
     tasks.register("${baseName}#mixedClusterTest", StandaloneRestIntegTestTask) {
@@ -41,16 +44,10 @@ BuildParams.bwcVersions.withWireCompatible { bwcVersion, baseName ->
         // Getting the endpoints causes a wait for the cluster
         println "Test cluster endpoints are: ${-> baseCluster.get().allHttpSocketURI.join(",")}"
         println "Upgrading one node to create a mixed cluster"
-        if (BuildParams.isSnapshotBuild() == false) {
-          baseCluster.get().nodes."${baseName}-0".systemProperty 'es.index_mode_feature_flag_registered', 'true'
-        }
         baseCluster.get().nextNodeToNextVersion()
         // Getting the endpoints causes a wait for the cluster
         println "Upgrade complete, endpoints are: ${-> baseCluster.get().allHttpSocketURI.join(",")}"
         println "Upgrading another node to create a mixed cluster"
-        if (BuildParams.isSnapshotBuild() == false) {
-          baseCluster.get().nodes."${baseName}-1".systemProperty 'es.index_mode_feature_flag_registered', 'true'
-        }
         baseCluster.get().nextNodeToNextVersion()
         nonInputProperties.systemProperty('tests.rest.cluster', baseCluster.map(c -> c.allHttpSocketURI.join(",")))
         nonInputProperties.systemProperty('tests.clustername', baseName)
diff --git a/qa/multi-cluster-search/build.gradle b/qa/multi-cluster-search/build.gradle
index 818cd917c594a..3f9ba25394649 100644
--- a/qa/multi-cluster-search/build.gradle
+++ b/qa/multi-cluster-search/build.gradle
@@ -6,6 +6,8 @@
  * Side Public License, v 1.
  */
 
+
+import org.elasticsearch.gradle.Version
 import org.elasticsearch.gradle.internal.info.BuildParams
 import org.elasticsearch.gradle.internal.test.RestIntegTestTask
 
@@ -26,9 +28,7 @@ tasks.register('remote-cluster', RestIntegTestTask) {
 }
 
 testClusters.configureEach {
-  if (BuildParams.isSnapshotBuild() == false) {
-    systemProperty 'es.index_mode_feature_flag_registered', 'true'
-  }
+  requiresFeature 'es.index_mode_feature_flag_registered', Version.fromString("8.0.0")
 }
 
 testClusters.matching{ it.name == 'remote-cluster' }.configureEach {
diff --git a/qa/rolling-upgrade/build.gradle b/qa/rolling-upgrade/build.gradle
index e20682eca5d48..f1e71b439fdd6 100644
--- a/qa/rolling-upgrade/build.gradle
+++ b/qa/rolling-upgrade/build.gradle
@@ -6,6 +6,8 @@
  * Side Public License, v 1.
  */
 
+
+import org.elasticsearch.gradle.Version
 import org.elasticsearch.gradle.internal.info.BuildParams
 import org.elasticsearch.gradle.testclusters.StandaloneRestIntegTestTask
 
@@ -36,6 +38,7 @@ BuildParams.bwcVersions.withWireCompatible { bwcVersion, baseName ->
     setting 'repositories.url.allowed_urls', 'http://snapshot.test*'
     setting 'path.repo', "${buildDir}/cluster/shared/repo/${baseName}"
     setting 'xpack.security.enabled', 'false'
+    requiresFeature 'es.index_mode_feature_flag_registered', Version.fromString("8.0.0")
   }
 
   String oldVersion = bwcVersion.toString()
@@ -95,9 +98,3 @@ BuildParams.bwcVersions.withWireCompatible { bwcVersion, baseName ->
     dependsOn tasks.named("${baseName}#upgradedClusterTest")
   }
 }
-
-testClusters.configureEach {
-  if (BuildParams.isSnapshotBuild() == false) {
-    systemProperty 'es.index_mode_feature_flag_registered', 'true'
-  }
-}
diff --git a/qa/smoke-test-multinode/build.gradle b/qa/smoke-test-multinode/build.gradle
index 197d7c1bb31b4..344eab777f6bb 100644
--- a/qa/smoke-test-multinode/build.gradle
+++ b/qa/smoke-test-multinode/build.gradle
@@ -6,6 +6,8 @@
  * Side Public License, v 1.
  */
 
+
+import org.elasticsearch.gradle.Version
 import org.elasticsearch.gradle.internal.info.BuildParams
 
 apply plugin: 'elasticsearch.internal-testclusters'
@@ -27,9 +29,7 @@ testClusters.matching { it.name == "integTest" }.configureEach {
 
 testClusters.configureEach {
   setting 'xpack.security.enabled', 'false'
-  if (BuildParams.isSnapshotBuild() == false) {
-    systemProperty 'es.index_mode_feature_flag_registered', 'true'
-  }
+  requiresFeature 'es.index_mode_feature_flag_registered', Version.fromString("8.0.0")
 }
 
 tasks.named("integTest").configure {
diff --git a/rest-api-spec/build.gradle b/rest-api-spec/build.gradle
index 0f26777f04ec7..f437b05990e3b 100644
--- a/rest-api-spec/build.gradle
+++ b/rest-api-spec/build.gradle
@@ -1,3 +1,4 @@
+import org.elasticsearch.gradle.Version
 import org.elasticsearch.gradle.internal.info.BuildParams
 
 apply plugin: 'elasticsearch.build'
@@ -35,9 +36,7 @@ artifacts {
 
 testClusters.configureEach {
   module ':modules:mapper-extras'
-  if (BuildParams.isSnapshotBuild() == false) {
-    systemProperty 'es.index_mode_feature_flag_registered', 'true'
-  }
+  requiresFeature 'es.index_mode_feature_flag_registered', Version.fromString("8.0.0")
 }
 
 tasks.named("test").configure { enabled = false }
diff --git a/server/src/main/java/org/elasticsearch/rollup/RollupV2.java b/server/src/main/java/org/elasticsearch/rollup/RollupV2.java
index 9c9566452c116..65775dcc58e0a 100644
--- a/server/src/main/java/org/elasticsearch/rollup/RollupV2.java
+++ b/server/src/main/java/org/elasticsearch/rollup/RollupV2.java
@@ -8,8 +8,11 @@
 
 package org.elasticsearch.rollup;
 
+import org.elasticsearch.Build;
+
 public class RollupV2 {
-    public static final boolean ROLLUP_V2_FEATURE_FLAG_ENABLED = "true".equals(System.getProperty("es.rollup_v2_feature_flag_enabled"));
+    public static final boolean ROLLUP_V2_FEATURE_FLAG_ENABLED = Build.CURRENT.isSnapshot()
+        || "true".equals(System.getProperty("es.rollup_v2_feature_flag_enabled"));
 
     public static boolean isEnabled() {
         return ROLLUP_V2_FEATURE_FLAG_ENABLED;
diff --git a/x-pack/plugin/build.gradle b/x-pack/plugin/build.gradle
index a488ec468a344..337f480047270 100644
--- a/x-pack/plugin/build.gradle
+++ b/x-pack/plugin/build.gradle
@@ -1,3 +1,4 @@
+import org.elasticsearch.gradle.Version
 import org.elasticsearch.gradle.internal.info.BuildParams
 import org.elasticsearch.gradle.util.GradleUtils
 import org.elasticsearch.gradle.internal.test.RestIntegTestTask
@@ -113,6 +114,7 @@ tasks.named("yamlRestTestV7CompatTransform").configure{ task ->
   task.skipTest("indices.freeze/20_stats/Translog stats on frozen indices", "#70192 -- the freeze index API is removed from 8.0")
   task.skipTest("indices.freeze/10_basic/Basic", "#70192 -- the freeze index API is removed from 8.0")
   task.skipTest("indices.freeze/10_basic/Test index options", "#70192 -- the freeze index API is removed from 8.0")
+  task.skipTest("service_accounts/10_basic/Test get service accounts", "new service accounts are added")
 
   task.replaceValueInMatch("_type", "_doc")
   task.addAllowedWarningRegex("\\[types removal\\].*")
@@ -150,9 +152,7 @@ testClusters.configureEach {
   extraConfigFile nodeCert.name, nodeCert
   extraConfigFile serviceTokens.name, serviceTokens
 
-  if (BuildParams.isSnapshotBuild() == false) {
-    systemProperty 'es.index_mode_feature_flag_registered', 'true'
-  }
+  requiresFeature 'es.index_mode_feature_flag_registered', Version.fromString("8.0.0")
 }
 
 tasks.register('enforceApiSpecsConvention').configure {
diff --git a/x-pack/plugin/ccr/qa/multi-cluster/build.gradle b/x-pack/plugin/ccr/qa/multi-cluster/build.gradle
index bc0e0d80edc7e..31cdf04f6dc94 100644
--- a/x-pack/plugin/ccr/qa/multi-cluster/build.gradle
+++ b/x-pack/plugin/ccr/qa/multi-cluster/build.gradle
@@ -1,3 +1,4 @@
+import org.elasticsearch.gradle.Version
 import org.elasticsearch.gradle.internal.info.BuildParams
 import org.elasticsearch.gradle.internal.test.RestIntegTestTask
 
@@ -66,9 +67,7 @@ testClusters.matching {it.name == "follow-cluster" }.configureEach {
 
 
 testClusters.configureEach {
-  if (BuildParams.isSnapshotBuild() == false) {
-    systemProperty 'es.index_mode_feature_flag_registered', 'true'
-  }
+  requiresFeature 'es.index_mode_feature_flag_registered', Version.fromString("8.0.0")
 }
 
 tasks.named("check").configure { dependsOn "follow-cluster" }
diff --git a/x-pack/plugin/data-streams/qa/rest/build.gradle b/x-pack/plugin/data-streams/qa/rest/build.gradle
index 80e3647638994..e3b215b2b9f65 100644
--- a/x-pack/plugin/data-streams/qa/rest/build.gradle
+++ b/x-pack/plugin/data-streams/qa/rest/build.gradle
@@ -1,3 +1,4 @@
+import org.elasticsearch.gradle.Version
 import org.elasticsearch.gradle.internal.info.BuildParams
 
 apply plugin: 'elasticsearch.internal-java-rest-test'
@@ -21,9 +22,7 @@ testClusters.configureEach {
   // disable ILM history, since it disturbs tests using _all
   setting 'indices.lifecycle.history_index_enabled', 'false'
   setting 'xpack.security.enabled', 'false'
-  if (BuildParams.isSnapshotBuild() == false) {
-    systemProperty 'es.index_mode_feature_flag_registered', 'true'
-  }
+  requiresFeature 'es.index_mode_feature_flag_registered', Version.fromString("8.0.0")
 }
 if (BuildParams.inFipsJvm){
   // These fail in CI but only when run as part of checkPart2 and not individually.
diff --git a/x-pack/plugin/ilm/build.gradle b/x-pack/plugin/ilm/build.gradle
index b880850657924..61e95d5621715 100644
--- a/x-pack/plugin/ilm/build.gradle
+++ b/x-pack/plugin/ilm/build.gradle
@@ -1,3 +1,5 @@
+import org.elasticsearch.gradle.internal.info.BuildParams
+
 apply plugin: 'elasticsearch.internal-es-plugin'
 apply plugin: 'elasticsearch.internal-cluster-test'
 
@@ -20,5 +22,7 @@ dependencies {
 addQaCheckDependencies()
 
 tasks.named("test").configure {
-  systemProperty 'es.rollup_v2_feature_flag_enabled', 'true'
+  if (BuildParams.isSnapshotBuild() == false) {
+    systemProperty 'es.rollup_v2_feature_flag_enabled', 'true'
+  }
 }
diff --git a/x-pack/plugin/ilm/qa/multi-node/build.gradle b/x-pack/plugin/ilm/qa/multi-node/build.gradle
index cf314f88f5841..887ca9c21fc2d 100644
--- a/x-pack/plugin/ilm/qa/multi-node/build.gradle
+++ b/x-pack/plugin/ilm/qa/multi-node/build.gradle
@@ -1,3 +1,4 @@
+import org.elasticsearch.gradle.Version
 import org.elasticsearch.gradle.util.GradleUtils
 import org.elasticsearch.gradle.internal.info.BuildParams
 
@@ -13,7 +14,9 @@ File repoDir = file("$buildDir/testclusters/repo")
 tasks.named("javaRestTest").configure {
   /* To support taking index snapshots, we have to set path.repo setting */
   systemProperty 'tests.path.repo', repoDir
-  systemProperty 'es.rollup_v2_feature_flag_enabled', 'true'
+  if (BuildParams.isSnapshotBuild() == false) {
+    systemProperty 'es.rollup_v2_feature_flag_enabled', 'true'
+  }
 }
 
 testClusters.configureEach {
@@ -37,7 +40,7 @@ testClusters.configureEach {
    * cached time. So the policy's action date is always after the snapshot's start.
    */
   setting 'thread_pool.estimated_time_interval', '0'
-  systemProperty 'es.rollup_v2_feature_flag_enabled', 'true'
+  requiresFeature 'es.rollup_v2_feature_flag_enabled', Version.fromString("8.0.0")
 }
 
 if (BuildParams.inFipsJvm){
diff --git a/x-pack/plugin/rollup/build.gradle b/x-pack/plugin/rollup/build.gradle
index f825239e4c6e8..7b23effbbad2c 100644
--- a/x-pack/plugin/rollup/build.gradle
+++ b/x-pack/plugin/rollup/build.gradle
@@ -22,5 +22,7 @@ dependencies {
 addQaCheckDependencies()
 
 tasks.named("test").configure {
-  systemProperty 'es.rollup_v2_feature_flag_enabled', 'true'
+  if (BuildParams.isSnapshotBuild() == false) {
+    systemProperty 'es.rollup_v2_feature_flag_enabled', 'true'
+  }
 }
diff --git a/x-pack/plugin/rollup/qa/rest/build.gradle b/x-pack/plugin/rollup/qa/rest/build.gradle
index 4d5c23feb9d20..90fee3972dd4d 100644
--- a/x-pack/plugin/rollup/qa/rest/build.gradle
+++ b/x-pack/plugin/rollup/qa/rest/build.gradle
@@ -4,6 +4,8 @@
  * 2.0; you may not use this file except in compliance with the Elastic License
  * 2.0.
  */
+
+import org.elasticsearch.gradle.Version
 import org.elasticsearch.gradle.internal.info.BuildParams
 
 apply plugin: 'elasticsearch.internal-yaml-rest-test'
@@ -22,8 +24,8 @@ restResources {
 testClusters.configureEach {
   testDistribution = 'DEFAULT'
   setting 'xpack.license.self_generated.type', 'basic'
-  systemProperty 'es.rollup_v2_feature_flag_enabled', 'true'
   setting 'xpack.security.enabled', 'false'
+  requiresFeature 'es.rollup_v2_feature_flag_enabled', Version.fromString("8.0.0")
 }
 
 if (BuildParams.inFipsJvm){
diff --git a/x-pack/plugin/security/qa/operator-privileges-tests/build.gradle b/x-pack/plugin/security/qa/operator-privileges-tests/build.gradle
index f023e2ca21943..72045b6898bbe 100644
--- a/x-pack/plugin/security/qa/operator-privileges-tests/build.gradle
+++ b/x-pack/plugin/security/qa/operator-privileges-tests/build.gradle
@@ -1,3 +1,5 @@
+import org.elasticsearch.gradle.Version
+
 apply plugin: 'elasticsearch.internal-es-plugin'
 apply plugin: 'elasticsearch.internal-java-rest-test'
 
@@ -36,8 +38,8 @@ testClusters.configureEach {
   setting 'xpack.security.operator_privileges.enabled', "true"
   setting 'path.repo', repoDir.absolutePath
 
+  requiresFeature 'es.rollup_v2_feature_flag_enabled', Version.fromString("8.0.0")
+
   user username: "test_admin", password: 'x-pack-test-password', role: "superuser"
   user username: "test_operator", password: 'x-pack-test-password', role: "limited_operator"
-
-  systemProperty 'es.rollup_v2_feature_flag_enabled', 'true'
 }
diff --git a/x-pack/plugin/shutdown/qa/full-cluster-restart/build.gradle b/x-pack/plugin/shutdown/qa/full-cluster-restart/build.gradle
index 4191290d79e6d..41bacea0d08cb 100644
--- a/x-pack/plugin/shutdown/qa/full-cluster-restart/build.gradle
+++ b/x-pack/plugin/shutdown/qa/full-cluster-restart/build.gradle
@@ -1,3 +1,4 @@
+import org.elasticsearch.gradle.Version
 import org.elasticsearch.gradle.internal.info.BuildParams
 import org.elasticsearch.gradle.testclusters.StandaloneRestIntegTestTask
 
@@ -60,9 +61,8 @@ BuildParams.bwcVersions.withIndexCompatible { bwcVersion, baseName ->
         keystore 'xpack.security.transport.ssl.secure_key_passphrase', 'testnode'
 
         setting 'xpack.security.authc.api_key.enabled', 'true'
-        if (BuildParams.isSnapshotBuild() == false && bwcVersion.toString() == project.version) {
-            systemProperty 'es.index_mode_feature_flag_registered', 'true'
-        }
+
+        requiresFeature 'es.index_mode_feature_flag_registered', Version.fromString("8.0.0")
     }
 
     tasks.register("${baseName}#oldClusterTest", StandaloneRestIntegTestTask) {
@@ -80,9 +80,6 @@ BuildParams.bwcVersions.withIndexCompatible { bwcVersion, baseName ->
         useCluster baseCluster
         dependsOn "${baseName}#oldClusterTest"
         doFirst {
-            if (BuildParams.isSnapshotBuild() == false) {
-                systemProperty 'es.index_mode_feature_flag_registered', 'true'
-            }
             baseCluster.get().goToNextVersion()
             if (bwcVersion.before(BuildParams.bwcVersions.minimumWireCompatibleVersion)) {
                 // When doing a full cluster restart of older versions we actually have to upgrade twice. First to 7.last, then to the current version.
diff --git a/x-pack/qa/core-rest-tests-with-security/build.gradle b/x-pack/qa/core-rest-tests-with-security/build.gradle
index e8fdffe47c01f..9adc47962b38c 100644
--- a/x-pack/qa/core-rest-tests-with-security/build.gradle
+++ b/x-pack/qa/core-rest-tests-with-security/build.gradle
@@ -1,3 +1,4 @@
+import org.elasticsearch.gradle.Version
 import org.elasticsearch.gradle.internal.info.BuildParams
 
 apply plugin: 'elasticsearch.internal-testclusters'
@@ -31,7 +32,5 @@ testClusters.matching { it.name == "integTest" }.configureEach {
   setting 'xpack.license.self_generated.type', 'trial'
   setting 'indices.lifecycle.history_index_enabled', 'false'
   setting 'xpack.security.autoconfiguration.enabled', 'false'
-  if (BuildParams.isSnapshotBuild() == false) {
-    systemProperty 'es.index_mode_feature_flag_registered', 'true'
-  }
+  requiresFeature 'es.index_mode_feature_flag_registered', Version.fromString("8.0.0")
 }
diff --git a/x-pack/qa/full-cluster-restart/build.gradle b/x-pack/qa/full-cluster-restart/build.gradle
index e720091c26c2f..2b3d52b28fd25 100644
--- a/x-pack/qa/full-cluster-restart/build.gradle
+++ b/x-pack/qa/full-cluster-restart/build.gradle
@@ -1,3 +1,4 @@
+import org.elasticsearch.gradle.Version
 import org.elasticsearch.gradle.internal.info.BuildParams
 import org.elasticsearch.gradle.testclusters.StandaloneRestIntegTestTask
 
@@ -60,9 +61,8 @@ BuildParams.bwcVersions.withIndexCompatible { bwcVersion, baseName ->
         keystore 'xpack.security.transport.ssl.secure_key_passphrase', 'testnode'
 
         setting 'xpack.security.authc.api_key.enabled', 'true'
-        if (BuildParams.isSnapshotBuild() == false) {
-            systemProperty 'es.index_mode_feature_flag_registered', 'true'
-        }
+
+        requiresFeature 'es.index_mode_feature_flag_registered', Version.fromString("8.0.0")
     }
 
     tasks.register("${baseName}#oldClusterTest", StandaloneRestIntegTestTask) {
diff --git a/x-pack/qa/runtime-fields/build.gradle b/x-pack/qa/runtime-fields/build.gradle
index c8dc8a378dda2..efb7b299113a1 100644
--- a/x-pack/qa/runtime-fields/build.gradle
+++ b/x-pack/qa/runtime-fields/build.gradle
@@ -6,6 +6,8 @@
  * Side Public License, v 1.
  */
 
+
+import org.elasticsearch.gradle.Version
 import org.elasticsearch.gradle.internal.info.BuildParams
 
 apply plugin: 'elasticsearch.build'
@@ -40,9 +42,8 @@ subprojects {
       testDistribution = 'DEFAULT'
       setting 'xpack.license.self_generated.type', 'trial'
       setting 'xpack.security.enabled', 'false'
-      if (BuildParams.isSnapshotBuild() == false) {
-        systemProperty 'es.index_mode_feature_flag_registered', 'true'
-      }
+
+      requiresFeature 'es.index_mode_feature_flag_registered', Version.fromString("8.0.0")
     }
 
     tasks.named("yamlRestTest").configure {
diff --git a/x-pack/qa/xpack-prefix-rest-compat/build.gradle b/x-pack/qa/xpack-prefix-rest-compat/build.gradle
index 59c00e4c9c671..375dae98366c7 100644
--- a/x-pack/qa/xpack-prefix-rest-compat/build.gradle
+++ b/x-pack/qa/xpack-prefix-rest-compat/build.gradle
@@ -6,6 +6,8 @@
  * Side Public License, v 1.
  */
 
+
+import org.elasticsearch.gradle.Version
 import org.elasticsearch.gradle.VersionProperties
 import org.elasticsearch.gradle.internal.info.BuildParams
 import org.elasticsearch.gradle.internal.test.rest.CopyRestTestsTask
@@ -94,9 +96,7 @@ testClusters.configureEach {
   extraConfigFile nodeCert.name, nodeCert
   extraConfigFile serviceTokens.name, serviceTokens
 
-  if (BuildParams.isSnapshotBuild() == false) {
-    systemProperty 'es.index_mode_feature_flag_registered', 'true'
-  }
+  requiresFeature 'es.index_mode_feature_flag_registered', Version.fromString("8.0.0")
 }
 
 // transform (again) the (already) transformed x-pack compatibility tests to test the xpack prefixes