diff --git a/integration-tests/cucumber-tests-platform-common/src/test/java/org/opensmartgridplatform/cucumber/platform/common/AcceptanceTests.java b/integration-tests/cucumber-tests-platform-common/src/test/java/org/opensmartgridplatform/cucumber/platform/common/AcceptanceTests.java
index cd1123d2148..0b8d2d07bc8 100644
--- a/integration-tests/cucumber-tests-platform-common/src/test/java/org/opensmartgridplatform/cucumber/platform/common/AcceptanceTests.java
+++ b/integration-tests/cucumber-tests-platform-common/src/test/java/org/opensmartgridplatform/cucumber/platform/common/AcceptanceTests.java
@@ -12,7 +12,7 @@
 @RunWith(Cucumber.class)
 @CucumberOptions(
     features = {"classpath:features/common"},
-    tags = {"not @Skip or not @NightlyBuildOnly"},
+    tags = "not @Skip or not @NightlyBuildOnly",
     glue = {
       "classpath:org.opensmartgridplatform.cucumber.platform.glue",
       "classpath:org.opensmartgridplatform.cucumber.platform.common.glue"
@@ -21,9 +21,9 @@
       "pretty",
       "html:target/output/osgp-cucumber-tests-platform-common/Cucumber-report",
       "html:target/output/osgp-cucumber-tests-platform-common/Cucumber-html-report.html",
-      "json:target/output/osgp-cucumber-tests-platform-common/cucumber.json"
+      "json:target/output/osgp-cucumber-tests-platform-common/cucumber.json",
+      "fail-fast"
     },
     snippets = SnippetType.CAMELCASE,
-    strict = true,
     dryRun = false)
 public class AcceptanceTests {}
diff --git a/integration-tests/cucumber-tests-platform-publiclighting/src/test/java/org/opensmartgridplatform/cucumber/platform/publiclighting/AcceptanceTests.java b/integration-tests/cucumber-tests-platform-publiclighting/src/test/java/org/opensmartgridplatform/cucumber/platform/publiclighting/AcceptanceTests.java
index 80e378bc29d..a82ef8b79d2 100644
--- a/integration-tests/cucumber-tests-platform-publiclighting/src/test/java/org/opensmartgridplatform/cucumber/platform/publiclighting/AcceptanceTests.java
+++ b/integration-tests/cucumber-tests-platform-publiclighting/src/test/java/org/opensmartgridplatform/cucumber/platform/publiclighting/AcceptanceTests.java
@@ -12,7 +12,7 @@
 @RunWith(Cucumber.class)
 @CucumberOptions(
     features = {"classpath:features/publiclighting"},
-    tags = {"not @Skip or not @NightlyBuildOnly"},
+    tags = "not @Skip or not @NightlyBuildOnly",
     glue = {
       "classpath:org.opensmartgridplatform.cucumber.platform.glue",
       "classpath:org.opensmartgridplatform.cucumber.platform.common.glue",
@@ -23,9 +23,9 @@
       "pretty",
       "html:target/output/osgp-cucumber-tests-platform-publiclighting/Cucumber-report",
       "html:target/output/osgp-cucumber-tests-platform-publiclighting/Cucumber-html-report.html",
-      "json:target/output/osgp-cucumber-tests-platform-publiclighting/cucumber.json"
+      "json:target/output/osgp-cucumber-tests-platform-publiclighting/cucumber.json",
+      "fail-fast"
     },
     snippets = SnippetType.CAMELCASE,
-    strict = true,
     dryRun = false)
 public class AcceptanceTests {}
diff --git a/integration-tests/cucumber-tests-platform-smartmetering/src/test/java/org/opensmartgridplatform/cucumber/platform/smartmetering/AcceptanceTests.java b/integration-tests/cucumber-tests-platform-smartmetering/src/test/java/org/opensmartgridplatform/cucumber/platform/smartmetering/AcceptanceTests.java
index 7e7c621bd58..2b1e792e8d3 100644
--- a/integration-tests/cucumber-tests-platform-smartmetering/src/test/java/org/opensmartgridplatform/cucumber/platform/smartmetering/AcceptanceTests.java
+++ b/integration-tests/cucumber-tests-platform-smartmetering/src/test/java/org/opensmartgridplatform/cucumber/platform/smartmetering/AcceptanceTests.java
@@ -16,7 +16,7 @@
       "classpath:features/osgp-adapter-ws-core",
       "classpath:features/osgp-adapter-ws-smartmetering"
     },
-    tags = {"not @Skip or not @NightlyBuildOnly"},
+    tags = "not @Skip or not @NightlyBuildOnly",
     glue = {
       "classpath:org.opensmartgridplatform.cucumber.platform.glue",
       "classpath:org.opensmartgridplatform.cucumber.platform.common.glue",
@@ -26,9 +26,9 @@
       "pretty",
       "html:target/output/osgp-cucumber-tests-platform-smartmetering/Cucumber-report",
       "html:target/output/osgp-cucumber-tests-platform-smartmetering/Cucumber-html-report.html",
-      "json:target/output/osgp-cucumber-tests-platform-smartmetering/cucumber.json"
+      "json:target/output/osgp-cucumber-tests-platform-smartmetering/cucumber.json",
+      "fail-fast"
     },
     snippets = SnippetType.CAMELCASE,
-    strict = true,
     dryRun = false)
 public class AcceptanceTests {}
diff --git a/osgp/protocol-adapter-iec60870/osgp-protocol-adapter-iec60870/src/integration-test/java/org/opensmartgridplatform/adapter/protocol/iec60870/integrationtests/TestRunnerIT.java b/osgp/protocol-adapter-iec60870/osgp-protocol-adapter-iec60870/src/integration-test/java/org/opensmartgridplatform/adapter/protocol/iec60870/integrationtests/TestRunnerIT.java
index 819170f5058..8c5b07dbca2 100644
--- a/osgp/protocol-adapter-iec60870/osgp-protocol-adapter-iec60870/src/integration-test/java/org/opensmartgridplatform/adapter/protocol/iec60870/integrationtests/TestRunnerIT.java
+++ b/osgp/protocol-adapter-iec60870/osgp-protocol-adapter-iec60870/src/integration-test/java/org/opensmartgridplatform/adapter/protocol/iec60870/integrationtests/TestRunnerIT.java
@@ -11,9 +11,8 @@
 
 @RunWith(Cucumber.class)
 @CucumberOptions(
-    plugin = {"pretty"},
-    tags = {"not @Skip"},
-    strict = true,
+    plugin = {"pretty", "fail-fast"},
+    tags = "not @Skip",
     features = "src/integration-test/resources/features/",
     snippets = SnippetType.CAMELCASE)
 public class TestRunnerIT {}
diff --git a/super/pom.xml b/super/pom.xml
index 4c5ece386cf..2944b84bc87 100644
--- a/super/pom.xml
+++ b/super/pom.xml
@@ -131,7 +131,7 @@ SPDX-License-Identifier: Apache-2.0
     <SunriseSunsetCalculator.version>1.2</SunriseSunsetCalculator.version>
     <ant.junit.version>1.10.15</ant.junit.version>
     <args4j.version>2.37</args4j.version>
-    <cucumber.version>5.7.0</cucumber.version>
+    <cucumber.version>7.31.0</cucumber.version>
     <testcontainers.version>1.21.3</testcontainers.version>
     <sun.httpserver.version>20070405</sun.httpserver.version>
     <postgresql.version>42.7.8</postgresql.version>