diff --git a/Jenkinsfile b/Jenkinsfile
index da11262957ee..6d4e7213e938 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -7,6 +7,8 @@ pipeline {
     skipDefaultCheckout()
     durabilityHint('PERFORMANCE_OPTIMIZED')
     buildDiscarder logRotator( numToKeepStr: '60' )
+    disableRestartFromStage()
+    disableConcurrentBuilds(abortPrevious: true)
   }
   stages {
     stage("Parallel Stage") {
diff --git a/tests/test-distribution/src/test/java/org/eclipse/jetty/tests/distribution/session/InfinispanSessionDistributionTests.java b/tests/test-distribution/src/test/java/org/eclipse/jetty/tests/distribution/session/InfinispanSessionDistributionTests.java
index 2a03a4088518..2fdd659617c9 100644
--- a/tests/test-distribution/src/test/java/org/eclipse/jetty/tests/distribution/session/InfinispanSessionDistributionTests.java
+++ b/tests/test-distribution/src/test/java/org/eclipse/jetty/tests/distribution/session/InfinispanSessionDistributionTests.java
@@ -57,7 +57,7 @@ public class InfinispanSessionDistributionTests extends AbstractSessionDistribut
     @Override
     public void startExternalSessionStorage() throws Exception
     {
-        String infinispanVersion = System.getProperty("infinispan.docker.image.version", "11.0.9.Final");
+        String infinispanVersion = System.getProperty("infinispan.docker.image.version", "15.2.1.Final");
         infinispan =
                 new GenericContainer(System.getProperty("infinispan.docker.image.name", "infinispan/server") +
                         ":" + infinispanVersion)
@@ -69,8 +69,8 @@ public void startExternalSessionStorage() throws Exception
                         .waitingFor(new LogMessageWaitStrategy()
                                 .withRegEx(".*Infinispan Server.*started in.*\\s"))
                         .withExposedPorts(4712, 4713, 8088, 8089, 8443, 9990, 9993, 11211, 11222, 11223, 11224)
-                        .withLogConsumer(new Slf4jLogConsumer(INFINISPAN_LOG))
-                        .withClasspathResourceMapping("/config.yaml", "/user-config/config.yaml", BindMode.READ_ONLY);
+                        .withEnv("JAVA_OPTIONS", "-Xms64m -Xmx256m -Djgroups.dns.query=infinispan-dns-ping.myproject.svc.cluster.local")
+                        .withLogConsumer(new Slf4jLogConsumer(INFINISPAN_LOG));
         infinispan.start();
         host = infinispan.getContainerIpAddress();
         port = infinispan.getMappedPort(11222);