diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 967de3047..0078fcfb1 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -18,7 +18,7 @@ jobs:
     if: always()
     strategy:
       matrix:
-        java: [ '17', '20' ]
+        java: [ '17', '21' ]
     runs-on: ubuntu-latest
     steps:
       - name: Check out
@@ -82,7 +82,7 @@ jobs:
     if: always()
     strategy:
       matrix:
-        java: [ '17', '20' ]
+        java: [ '17', '21' ]
         db: [ 'h2', 'mariadb', 'postgresql', 'mysql', 'sqlserver', 'db2', 'oracle' ]
     runs-on: ubuntu-latest
     env:
@@ -102,7 +102,7 @@ jobs:
       - name: Build
         run: mvn -T1C --color=always -DskipTests -Dmaven.javadoc.skip=true -Dmaven.source.skip=true --am -pl nflow-tests install
       - name: Run the integration tests
-        run: mvn -T1C -Dsurefire.forkcount=2C --color=always -P ${{ matrix.db }} -rf :nflow-tests surefire:test
+        run: mvn -T1C -Dsurefire.forkcount=1 --color=always -rf :nflow-tests surefire:test
       - name: Publish JUnit test report
         uses: scacap/action-surefire-report@v1
         if: always()
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7a353d168..9101ba49c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,27 @@
 
 **Details**
 
+  - Dependency updates:
+    - Jetty 11.0.20
+    - Apache CFX 4.0.4
+    - Dropwizard metrics 4.2.19
+    - logback 1.5.3
+    - jackson 2.17.0
+    - h2 2.2.224
+    - protobuf 3.25.1
+    - db2 jcc 11.5.9.0
+    - mssql-jdbc 12.6.1
+    - mysql-connector 8.3.0
+    - ojdbc11 23.3.0.23.09
+    - postgresql 42.7.3
+    - mariadb-java-client 3.3.3
+    - HikariCP 5.1.0
+    - netty 4.1.107
+    - joda-time 2.12.5
+    - commons-lang3 3.14.0
+    - slf4j 2.0.12
+
+
 ## 9.0.0 (2023-08-30)
 
 **Highlights**
diff --git a/findbugs-exclude.xml b/findbugs-exclude.xml
index 869481a54..ff7d70553 100644
--- a/findbugs-exclude.xml
+++ b/findbugs-exclude.xml
@@ -23,6 +23,9 @@
   <Match>
     <Bug pattern="THROWS_METHOD_THROWS_RUNTIMEEXCEPTION"/>
   </Match>
+  <Match>
+    <Bug pattern="CT_CONSTRUCTOR_THROW"/>
+  </Match>
   <Match>
     <!--
     https://github.com/spotbugs/spotbugs/issues/2040 - the new detector has too much false positives,
diff --git a/maven-version-rules.xml b/maven-version-rules.xml
index 3e730f798..42cad8cfe 100644
--- a/maven-version-rules.xml
+++ b/maven-version-rules.xml
@@ -23,11 +23,31 @@
                 <ignoreVersion type="regex">.*-b[0-9]+.*</ignoreVersion>
             </ignoreVersions>
         </rule>
+        <rule groupId="jakarta.annotation">
+            <ignoreVersions>
+                <ignoreVersion type="regex">.*M[0-9].*</ignoreVersion>
+            </ignoreVersions>
+        </rule>
         <rule groupId="jakarta.inject" artifactId="jakarta.inject-api">
             <ignoreVersions>
                 <ignoreVersion type="regex">.*\.(MR|RC[0-9]+).*</ignoreVersion>
             </ignoreVersions>
         </rule>
+        <rule groupId="jakarta.servlet">
+            <ignoreVersions>
+                <ignoreVersion type="regex">.*M[0-9].*</ignoreVersion>
+            </ignoreVersions>
+        </rule>
+        <rule groupId="jakarta.validation">
+            <ignoreVersions>
+                <ignoreVersion type="regex">.*M[0-9].*</ignoreVersion>
+            </ignoreVersions>
+        </rule>
+        <rule groupId="jakarta.ws.rs">
+            <ignoreVersions>
+                <ignoreVersion type="regex">.*M[0-9].*</ignoreVersion>
+            </ignoreVersions>
+        </rule>
         <rule groupId="org.glassfish" artifactId="jakarta.el">
             <ignoreVersions>
                 <ignoreVersion type="regex">.*-M[0-9]+.*</ignoreVersion>
diff --git a/nflow-engine/.settings/org.eclipse.jdt.core.prefs b/nflow-engine/.settings/org.eclipse.jdt.core.prefs
index b000abc4d..13033904e 100644
--- a/nflow-engine/.settings/org.eclipse.jdt.core.prefs
+++ b/nflow-engine/.settings/org.eclipse.jdt.core.prefs
@@ -1,3 +1,4 @@
+#Sun Apr 07 10:53:41 EEST 2024
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.annotation.inheritNullAnnotations=disabled
 org.eclipse.jdt.core.compiler.annotation.missingNonNullByDefaultAnnotation=ignore
@@ -10,9 +11,9 @@ org.eclipse.jdt.core.compiler.annotation.nullable.secondary=
 org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
 org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=17
 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=11
+org.eclipse.jdt.core.compiler.compliance=17
 org.eclipse.jdt.core.compiler.debug.lineNumber=generate
 org.eclipse.jdt.core.compiler.debug.localVariable=generate
 org.eclipse.jdt.core.compiler.debug.sourceFile=generate
@@ -106,7 +107,7 @@ org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=warning
 org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
 org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
 org.eclipse.jdt.core.compiler.release=disabled
-org.eclipse.jdt.core.compiler.source=11
+org.eclipse.jdt.core.compiler.source=17
 org.eclipse.jdt.core.formatter.align_assignment_statements_on_columns=false
 org.eclipse.jdt.core.formatter.align_fields_grouping_blank_lines=2147483647
 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
diff --git a/nflow-engine/src/main/java/io/nflow/engine/guice/EnvironmentModule.java b/nflow-engine/src/main/java/io/nflow/engine/guice/EnvironmentModule.java
index 3ba0f5b51..2efe40c29 100644
--- a/nflow-engine/src/main/java/io/nflow/engine/guice/EnvironmentModule.java
+++ b/nflow-engine/src/main/java/io/nflow/engine/guice/EnvironmentModule.java
@@ -4,6 +4,7 @@
 import java.io.InputStream;
 import java.util.Properties;
 
+import edu.umd.cs.findbugs.annotations.NonNull;
 import org.springframework.core.env.Environment;
 import org.springframework.core.env.MutablePropertySources;
 import org.springframework.core.env.PropertiesPropertySource;
@@ -52,7 +53,7 @@ protected Properties getClassPathConfigurationProperties() {
   protected void configure() {
     bind(Environment.class).toInstance(new StandardEnvironment() {
       @Override
-      protected void customizePropertySources(MutablePropertySources propertySources) {
+      protected void customizePropertySources(@NonNull MutablePropertySources propertySources) {
         customizeEnvironment(propertySources);
       }
     });
diff --git a/nflow-engine/src/main/java/io/nflow/engine/internal/dao/WorkflowInstanceDao.java b/nflow-engine/src/main/java/io/nflow/engine/internal/dao/WorkflowInstanceDao.java
index d15bb4b7d..afacf6a77 100644
--- a/nflow-engine/src/main/java/io/nflow/engine/internal/dao/WorkflowInstanceDao.java
+++ b/nflow-engine/src/main/java/io/nflow/engine/internal/dao/WorkflowInstanceDao.java
@@ -53,9 +53,6 @@
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.stream.Stream;
 
-import jakarta.inject.Inject;
-import jakarta.inject.Singleton;
-
 import org.joda.time.DateTime;
 import org.slf4j.Logger;
 import org.springframework.core.env.Environment;
@@ -90,6 +87,8 @@
 import io.nflow.engine.workflow.instance.WorkflowInstanceAction;
 import io.nflow.engine.workflow.instance.WorkflowInstanceAction.WorkflowActionType;
 import io.nflow.engine.workflow.instance.WorkflowInstanceFactory;
+import jakarta.inject.Inject;
+import jakarta.inject.Singleton;
 
 /**
  * Use setter injection because constructor injection may not work when nFlow is used in some legacy systems.
@@ -910,7 +909,7 @@ public WorkflowInstance.Builder mapRow(ResultSet rs, int rowNum) throws SQLExcep
           .setExternalId(rs.getString("external_id"))
           .setState(rs.getString("state"))
           .setStateText(rs.getString("state_text"))
-          .setActions(new ArrayList<WorkflowInstanceAction>())
+          .setActions(new ArrayList<>())
           .setNextActivation(sqlVariants.getDateTime(rs, "next_activation"))
           .setRetries(rs.getInt("retries"))
           .setCreated(sqlVariants.getDateTime(rs, "created"))
diff --git a/nflow-engine/src/main/java/io/nflow/engine/internal/executor/WorkflowDispatcher.java b/nflow-engine/src/main/java/io/nflow/engine/internal/executor/WorkflowDispatcher.java
index d130ff902..0fe65db46 100644
--- a/nflow-engine/src/main/java/io/nflow/engine/internal/executor/WorkflowDispatcher.java
+++ b/nflow-engine/src/main/java/io/nflow/engine/internal/executor/WorkflowDispatcher.java
@@ -129,7 +129,7 @@ public void run() {
       var graceful = shutdownPool();
       executorDao.markShutdown(graceful);
       running.set(false);
-      logger.info("Shutdown completed.");
+      logger.info("Shutdown completed (" + (graceful?"":"not ") +"graceful).");
       shutdownDone.countDown();
     }
   }
diff --git a/nflow-engine/src/main/java/io/nflow/engine/internal/storage/db/SQLVariants.java b/nflow-engine/src/main/java/io/nflow/engine/internal/storage/db/SQLVariants.java
index 93c2f67aa..93dc01a36 100644
--- a/nflow-engine/src/main/java/io/nflow/engine/internal/storage/db/SQLVariants.java
+++ b/nflow-engine/src/main/java/io/nflow/engine/internal/storage/db/SQLVariants.java
@@ -11,6 +11,9 @@
 
 import io.nflow.engine.workflow.instance.WorkflowInstance.WorkflowInstanceStatus;
 
+/**
+ * Abstracts the differences of different SQL backends.
+ */
 public interface SQLVariants {
   String currentTimePlusSeconds(int seconds);
 
diff --git a/nflow-engine/src/main/java/io/nflow/engine/internal/workflow/StoredWorkflowDefinition.java b/nflow-engine/src/main/java/io/nflow/engine/internal/workflow/StoredWorkflowDefinition.java
index 76c100fa0..975f8d925 100644
--- a/nflow-engine/src/main/java/io/nflow/engine/internal/workflow/StoredWorkflowDefinition.java
+++ b/nflow-engine/src/main/java/io/nflow/engine/internal/workflow/StoredWorkflowDefinition.java
@@ -6,12 +6,13 @@
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 import io.nflow.engine.model.ModelObject;
 
+@SuppressFBWarnings(value = {"URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD","UWF_FIELD_NOT_INITIALIZED_IN_CONSTRUCTOR"}, justification = "used by rest apis")
 public class StoredWorkflowDefinition extends ModelObject {
 
   public String type;
   public String description;
   public String onError;
-  public List<State> states;
+  public List<State> states = new ArrayList<>();
   public List<Signal> supportedSignals = new ArrayList<>();
 
   @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD", justification = "serialized to database with object mapper")
diff --git a/nflow-engine/src/main/java/io/nflow/engine/internal/workflow/StoredWorkflowDefinitionWrapper.java b/nflow-engine/src/main/java/io/nflow/engine/internal/workflow/StoredWorkflowDefinitionWrapper.java
index 2f42ac63d..7e8594338 100644
--- a/nflow-engine/src/main/java/io/nflow/engine/internal/workflow/StoredWorkflowDefinitionWrapper.java
+++ b/nflow-engine/src/main/java/io/nflow/engine/internal/workflow/StoredWorkflowDefinitionWrapper.java
@@ -13,6 +13,7 @@
 import io.nflow.engine.workflow.definition.WorkflowStateType;
 
 public class StoredWorkflowDefinitionWrapper extends WorkflowDefinition {
+    @SuppressWarnings("this-escape")
     public StoredWorkflowDefinitionWrapper(StoredWorkflowDefinition stored) {
         super(stored.type, getInitialState(stored), getErrorState(stored), new WorkflowSettings.Builder().build(), emptyMap(), allStates(stored), false);
         setDescription(stored.description);
diff --git a/nflow-engine/src/main/java/io/nflow/engine/workflow/curated/BulkWorkflow.java b/nflow-engine/src/main/java/io/nflow/engine/workflow/curated/BulkWorkflow.java
index 450e64035..d368a3dc3 100644
--- a/nflow-engine/src/main/java/io/nflow/engine/workflow/curated/BulkWorkflow.java
+++ b/nflow-engine/src/main/java/io/nflow/engine/workflow/curated/BulkWorkflow.java
@@ -78,6 +78,7 @@ public class BulkWorkflow extends WorkflowDefinition {
    * @param type
    *          The type of the workflow.
    */
+  @SuppressWarnings("this-escape")
   protected BulkWorkflow(String type) {
     super(type, SPLIT_WORK, ERROR, new Builder().setMaxRetries(Integer.MAX_VALUE).build());
     setDescription("Executes child workflows in bulk but gracefully without effecting non-bulk tasks.");
diff --git a/nflow-engine/src/main/java/io/nflow/engine/workflow/curated/CronWorkflow.java b/nflow-engine/src/main/java/io/nflow/engine/workflow/curated/CronWorkflow.java
index 7ea71965a..33ac038f9 100644
--- a/nflow-engine/src/main/java/io/nflow/engine/workflow/curated/CronWorkflow.java
+++ b/nflow-engine/src/main/java/io/nflow/engine/workflow/curated/CronWorkflow.java
@@ -63,6 +63,7 @@ public abstract class CronWorkflow extends WorkflowDefinition {
    * @param settings
    *          The workflow settings.
    */
+  @SuppressWarnings("this-escape")
   protected CronWorkflow(String type, WorkflowSettings settings) {
     super(type, SCHEDULE, HANDLE_FAILURE, settings);
     permit(SCHEDULE, DO_WORK);
diff --git a/nflow-engine/src/main/java/io/nflow/engine/workflow/curated/MaintenanceWorkflow.java b/nflow-engine/src/main/java/io/nflow/engine/workflow/curated/MaintenanceWorkflow.java
index a59bf931c..9226eada6 100644
--- a/nflow-engine/src/main/java/io/nflow/engine/workflow/curated/MaintenanceWorkflow.java
+++ b/nflow-engine/src/main/java/io/nflow/engine/workflow/curated/MaintenanceWorkflow.java
@@ -28,6 +28,7 @@ public class MaintenanceWorkflow extends CronWorkflow {
   /**
    * Create maintenance workflow definition.
    */
+  @SuppressWarnings("this-escape")
   public MaintenanceWorkflow() {
     super(MAINTENANCE_WORKFLOW_TYPE);
     setDescription("Clean up workflow instances periodically.");
@@ -41,6 +42,7 @@ public MaintenanceWorkflow() {
    * @param settings
    *          The workflow settings.
    */
+  @SuppressWarnings("this-escape")
   protected MaintenanceWorkflow(String type, WorkflowSettings settings) {
     super(type, settings);
     setDescription("Clean up workflow instances periodically.");
diff --git a/nflow-engine/src/main/java/io/nflow/engine/workflow/definition/Mutable.java b/nflow-engine/src/main/java/io/nflow/engine/workflow/definition/Mutable.java
index 20c90e036..8254af10b 100644
--- a/nflow-engine/src/main/java/io/nflow/engine/workflow/definition/Mutable.java
+++ b/nflow-engine/src/main/java/io/nflow/engine/workflow/definition/Mutable.java
@@ -1,5 +1,7 @@
 package io.nflow.engine.workflow.definition;
 
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
+
 import java.util.Objects;
 
 /**
@@ -12,6 +14,7 @@ public class Mutable<T> {
   /**
    * The wrapped value.
    */
+  @SuppressFBWarnings(value = "PA_PUBLIC_PRIMITIVE_ATTRIBUTE", justification = "this is just a wrapper class around the single field")
   public T val;
 
   /**
diff --git a/nflow-engine/src/main/resources/nflow-engine.properties b/nflow-engine/src/main/resources/nflow-engine.properties
index 6737ca4f2..0599223a7 100644
--- a/nflow-engine/src/main/resources/nflow-engine.properties
+++ b/nflow-engine/src/main/resources/nflow-engine.properties
@@ -57,7 +57,7 @@ nflow.db.db2.password=nflow
 nflow.db.db2.timezone=UTC
 
 nflow.db.oracle.driver=oracle.jdbc.OracleDriver
-nflow.db.oracle.url=jdbc:oracle:thin:@//localhost:1521/XEPDB1
+nflow.db.oracle.url=jdbc:oracle:thin:@//localhost:1521/nflow
 nflow.db.oracle.user=nflow
 nflow.db.oracle.password=nflow
 
diff --git a/nflow-engine/src/test/java/io/nflow/engine/internal/dao/WorkflowDefinitionDaoTest.java b/nflow-engine/src/test/java/io/nflow/engine/internal/dao/WorkflowDefinitionDaoTest.java
index afbbbde91..048cb25e1 100644
--- a/nflow-engine/src/test/java/io/nflow/engine/internal/dao/WorkflowDefinitionDaoTest.java
+++ b/nflow-engine/src/test/java/io/nflow/engine/internal/dao/WorkflowDefinitionDaoTest.java
@@ -10,13 +10,12 @@
 import java.util.List;
 import java.util.Map.Entry;
 
-import jakarta.inject.Inject;
-
 import org.junit.jupiter.api.Test;
 
 import io.nflow.engine.internal.workflow.StoredWorkflowDefinition;
 import io.nflow.engine.service.DummyTestWorkflow;
 import io.nflow.engine.workflow.definition.WorkflowState;
+import jakarta.inject.Inject;
 
 public class WorkflowDefinitionDaoTest extends BaseDaoTest {
 
@@ -32,7 +31,7 @@ public void storeAndLoadRequestedDefinitionFromDatabaseWorks() {
 
   @Test
   public void storeAndLoadAllDefinitionsFromDatabaseWorks() {
-    roundTrip(new ArrayList<String>());
+    roundTrip(new ArrayList<>());
   }
 
   @Test
diff --git a/nflow-engine/src/test/java/io/nflow/engine/internal/dao/WorkflowInstanceDaoTest.java b/nflow-engine/src/test/java/io/nflow/engine/internal/dao/WorkflowInstanceDaoTest.java
index c73ba5511..b326b8dd0 100644
--- a/nflow-engine/src/test/java/io/nflow/engine/internal/dao/WorkflowInstanceDaoTest.java
+++ b/nflow-engine/src/test/java/io/nflow/engine/internal/dao/WorkflowInstanceDaoTest.java
@@ -50,8 +50,6 @@
 import java.util.Optional;
 import java.util.concurrent.CountDownLatch;
 
-import jakarta.inject.Inject;
-
 import org.joda.time.DateTime;
 import org.junit.jupiter.api.Test;
 import org.mockito.ArgumentCaptor;
@@ -76,6 +74,7 @@
 import io.nflow.engine.workflow.instance.WorkflowInstanceAction;
 import io.nflow.engine.workflow.instance.WorkflowInstanceAction.WorkflowActionType;
 import io.nflow.engine.workflow.instance.WorkflowInstanceFactory;
+import jakarta.inject.Inject;
 
 public class WorkflowInstanceDaoTest extends BaseDaoTest {
 
@@ -796,7 +795,7 @@ public void wakesUpSleepingWorkflow() {
     WorkflowInstance i1 = constructWorkflowInstanceBuilder().setNextActivation(null).build();
     long id = dao.insertWorkflowInstance(i1);
     assertThat(dao.getWorkflowInstance(id, emptySet(), null, false).nextActivation, nullValue());
-    dao.wakeupWorkflowInstanceIfNotExecuting(id, new ArrayList<String>());
+    dao.wakeupWorkflowInstanceIfNotExecuting(id, new ArrayList<>());
     assertThat(dao.getWorkflowInstance(id, emptySet(), null, false).nextActivation, notNullValue());
   }
 
diff --git a/nflow-engine/src/test/java/io/nflow/engine/internal/executor/WorkflowStateProcessorTest.java b/nflow-engine/src/test/java/io/nflow/engine/internal/executor/WorkflowStateProcessorTest.java
index 4bdb98eab..2d37e6715 100644
--- a/nflow-engine/src/test/java/io/nflow/engine/internal/executor/WorkflowStateProcessorTest.java
+++ b/nflow-engine/src/test/java/io/nflow/engine/internal/executor/WorkflowStateProcessorTest.java
@@ -131,6 +131,7 @@
 import io.nflow.engine.workflow.instance.WorkflowInstanceAction;
 import io.nflow.engine.workflow.instance.WorkflowInstanceAction.WorkflowActionType;
 
+@SuppressWarnings("this-escape")
 public class WorkflowStateProcessorTest extends BaseNflowTest {
 
   @Mock
diff --git a/nflow-engine/src/test/java/io/nflow/engine/internal/workflow/StaticStateFieldsWorkflow.java b/nflow-engine/src/test/java/io/nflow/engine/internal/workflow/StaticStateFieldsWorkflow.java
index 41e9f2d1c..086d8a5a0 100644
--- a/nflow-engine/src/test/java/io/nflow/engine/internal/workflow/StaticStateFieldsWorkflow.java
+++ b/nflow-engine/src/test/java/io/nflow/engine/internal/workflow/StaticStateFieldsWorkflow.java
@@ -23,6 +23,7 @@ public class StaticStateFieldsWorkflow extends WorkflowDefinition {
   protected WorkflowState protectedState = new State("protected", WorkflowStateType.manual);
   public WorkflowState publicState = new State("public", WorkflowStateType.manual);
 
+  @SuppressWarnings("this-escape")
   public StaticStateFieldsWorkflow() {
     super("staticStateFields", BEGIN, ERROR);
     permit(new State("origin", WorkflowStateType.manual), new State("target", WorkflowStateType.manual),
diff --git a/nflow-engine/src/test/java/io/nflow/engine/service/DummyTestWorkflow.java b/nflow-engine/src/test/java/io/nflow/engine/service/DummyTestWorkflow.java
index 8a57bde43..9d66e8d87 100644
--- a/nflow-engine/src/test/java/io/nflow/engine/service/DummyTestWorkflow.java
+++ b/nflow-engine/src/test/java/io/nflow/engine/service/DummyTestWorkflow.java
@@ -12,6 +12,7 @@
 import io.nflow.engine.workflow.definition.WorkflowDefinition;
 import io.nflow.engine.workflow.definition.WorkflowSettings;
 
+@SuppressWarnings("this-escape")
 public class DummyTestWorkflow extends WorkflowDefinition {
 
   public static final String DUMMY_TYPE = "dummy";
diff --git a/nflow-engine/src/test/java/io/nflow/engine/service/SpringDummyTestWorkflow.java b/nflow-engine/src/test/java/io/nflow/engine/service/SpringDummyTestWorkflow.java
index 9226f9942..7f5bec3db 100644
--- a/nflow-engine/src/test/java/io/nflow/engine/service/SpringDummyTestWorkflow.java
+++ b/nflow-engine/src/test/java/io/nflow/engine/service/SpringDummyTestWorkflow.java
@@ -15,6 +15,7 @@
 @Profile("nflow-engine-test")
 public class SpringDummyTestWorkflow extends WorkflowDefinition {
 
+  @SuppressWarnings("this-escape")
   protected SpringDummyTestWorkflow() {
     super("springdummy", BEGIN, DONE);
     permit(BEGIN, DONE);
diff --git a/nflow-engine/src/test/java/io/nflow/engine/workflow/definition/TestDefinition.java b/nflow-engine/src/test/java/io/nflow/engine/workflow/definition/TestDefinition.java
index 99ec75b07..f893dcb4a 100644
--- a/nflow-engine/src/test/java/io/nflow/engine/workflow/definition/TestDefinition.java
+++ b/nflow-engine/src/test/java/io/nflow/engine/workflow/definition/TestDefinition.java
@@ -4,6 +4,7 @@
 
 import io.nflow.engine.workflow.curated.State;
 
+@SuppressWarnings("this-escape")
 public class TestDefinition extends WorkflowDefinition {
 
   public static final WorkflowState START_1 = new State("start1", WorkflowStateType.start);
diff --git a/nflow-engine/src/test/java/io/nflow/engine/workflow/definition/TestDefinitionWithStateTypes.java b/nflow-engine/src/test/java/io/nflow/engine/workflow/definition/TestDefinitionWithStateTypes.java
index 34ac6236b..8fa22c9bc 100644
--- a/nflow-engine/src/test/java/io/nflow/engine/workflow/definition/TestDefinitionWithStateTypes.java
+++ b/nflow-engine/src/test/java/io/nflow/engine/workflow/definition/TestDefinitionWithStateTypes.java
@@ -11,6 +11,7 @@ public class TestDefinitionWithStateTypes extends WorkflowDefinition {
   static final WorkflowState STATE_1 = new State("state1");
   static final WorkflowState STATE_2 = new State("state2");
 
+  @SuppressWarnings("this-escape")
   public TestDefinitionWithStateTypes(String type, WorkflowState initialState) {
     super(type, initialState, ERROR);
     permit(BEGIN, DONE, ERROR);
diff --git a/nflow-engine/src/test/java/io/nflow/engine/workflow/definition/TestWorkflow.java b/nflow-engine/src/test/java/io/nflow/engine/workflow/definition/TestWorkflow.java
index 545adb4dc..6feca91e4 100644
--- a/nflow-engine/src/test/java/io/nflow/engine/workflow/definition/TestWorkflow.java
+++ b/nflow-engine/src/test/java/io/nflow/engine/workflow/definition/TestWorkflow.java
@@ -12,6 +12,7 @@ public class TestWorkflow extends WorkflowDefinition {
   public static final WorkflowState START_WITHOUT_FAILURE = new State("startWithoutFailure", WorkflowStateType.start);
   public static final WorkflowState FAILED = new State("failed", WorkflowStateType.end);
 
+  @SuppressWarnings("this-escape")
   public TestWorkflow() {
     super("test", BEGIN, ERROR);
     permit(BEGIN, DONE, FAILED);
diff --git a/nflow-explorer/package-lock.json b/nflow-explorer/package-lock.json
index 936c60f7d..2c75e9da5 100644
--- a/nflow-explorer/package-lock.json
+++ b/nflow-explorer/package-lock.json
@@ -6639,9 +6639,9 @@
       }
     },
     "node_modules/caniuse-lite": {
-      "version": "1.0.30001442",
-      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001442.tgz",
-      "integrity": "sha512-239m03Pqy0hwxYPYR5JwOIxRJfLTWtle9FV8zosfV5pHg+/51uD4nxcUlM8+mWWGfwKtt8lJNHnD3cWw9VZ6ow==",
+      "version": "1.0.30001606",
+      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001606.tgz",
+      "integrity": "sha512-LPbwnW4vfpJId225pwjZJOgX1m9sGfbw/RKJvw/t0QhYOOaTXHvkjVGFGPpvwEzufrjvTlsULnVTxdy4/6cqkg==",
       "funding": [
         {
           "type": "opencollective",
@@ -6650,6 +6650,10 @@
         {
           "type": "tidelift",
           "url": "https://tidelift.com/funding/github/npm/caniuse-lite"
+        },
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/ai"
         }
       ]
     },
@@ -27350,9 +27354,9 @@
       }
     },
     "caniuse-lite": {
-      "version": "1.0.30001442",
-      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001442.tgz",
-      "integrity": "sha512-239m03Pqy0hwxYPYR5JwOIxRJfLTWtle9FV8zosfV5pHg+/51uD4nxcUlM8+mWWGfwKtt8lJNHnD3cWw9VZ6ow=="
+      "version": "1.0.30001606",
+      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001606.tgz",
+      "integrity": "sha512-LPbwnW4vfpJId225pwjZJOgX1m9sGfbw/RKJvw/t0QhYOOaTXHvkjVGFGPpvwEzufrjvTlsULnVTxdy4/6cqkg=="
     },
     "case-sensitive-paths-webpack-plugin": {
       "version": "2.4.0",
diff --git a/nflow-jetty/.settings/org.eclipse.jdt.core.prefs b/nflow-jetty/.settings/org.eclipse.jdt.core.prefs
index 547e5a46f..8a50b201d 100644
--- a/nflow-jetty/.settings/org.eclipse.jdt.core.prefs
+++ b/nflow-jetty/.settings/org.eclipse.jdt.core.prefs
@@ -1,4 +1,4 @@
-#Sat Jul 09 00:19:03 EEST 2022
+#Sun Apr 07 10:53:44 EEST 2024
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.annotation.inheritNullAnnotations=disabled
 org.eclipse.jdt.core.compiler.annotation.missingNonNullByDefaultAnnotation=ignore
@@ -11,9 +11,9 @@ org.eclipse.jdt.core.compiler.annotation.nullable.secondary=
 org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
 org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=17
 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=11
+org.eclipse.jdt.core.compiler.compliance=17
 org.eclipse.jdt.core.compiler.debug.lineNumber=generate
 org.eclipse.jdt.core.compiler.debug.localVariable=generate
 org.eclipse.jdt.core.compiler.debug.sourceFile=generate
@@ -107,7 +107,7 @@ org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=warning
 org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
 org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
 org.eclipse.jdt.core.compiler.release=disabled
-org.eclipse.jdt.core.compiler.source=11
+org.eclipse.jdt.core.compiler.source=17
 org.eclipse.jdt.core.formatter.align_assignment_statements_on_columns=false
 org.eclipse.jdt.core.formatter.align_fields_grouping_blank_lines=2147483647
 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
diff --git a/nflow-metrics/.settings/org.eclipse.jdt.core.prefs b/nflow-metrics/.settings/org.eclipse.jdt.core.prefs
index a054f0819..273af937d 100644
--- a/nflow-metrics/.settings/org.eclipse.jdt.core.prefs
+++ b/nflow-metrics/.settings/org.eclipse.jdt.core.prefs
@@ -1,4 +1,4 @@
-#Sat Jul 09 00:19:01 EEST 2022
+#Sun Apr 07 10:53:42 EEST 2024
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.annotation.inheritNullAnnotations=disabled
 org.eclipse.jdt.core.compiler.annotation.missingNonNullByDefaultAnnotation=ignore
@@ -11,9 +11,9 @@ org.eclipse.jdt.core.compiler.annotation.nullable.secondary=
 org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
 org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=17
 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=11
+org.eclipse.jdt.core.compiler.compliance=17
 org.eclipse.jdt.core.compiler.debug.lineNumber=generate
 org.eclipse.jdt.core.compiler.debug.localVariable=generate
 org.eclipse.jdt.core.compiler.debug.sourceFile=generate
@@ -104,7 +104,7 @@ org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
 org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=warning
 org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
 org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=11
+org.eclipse.jdt.core.compiler.source=17
 org.eclipse.jdt.core.formatter.align_assignment_statements_on_columns=false
 org.eclipse.jdt.core.formatter.align_fields_grouping_blank_lines=2147483647
 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
diff --git a/nflow-netty/.settings/org.eclipse.jdt.core.prefs b/nflow-netty/.settings/org.eclipse.jdt.core.prefs
index 04279e743..7aa022d93 100644
--- a/nflow-netty/.settings/org.eclipse.jdt.core.prefs
+++ b/nflow-netty/.settings/org.eclipse.jdt.core.prefs
@@ -1,4 +1,4 @@
-#Sat Jul 09 00:19:02 EEST 2022
+#Sun Apr 07 10:53:50 EEST 2024
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.annotation.inheritNullAnnotations=disabled
 org.eclipse.jdt.core.compiler.annotation.missingNonNullByDefaultAnnotation=ignore
@@ -11,9 +11,9 @@ org.eclipse.jdt.core.compiler.annotation.nullable.secondary=
 org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
 org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=17
 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=11
+org.eclipse.jdt.core.compiler.compliance=17
 org.eclipse.jdt.core.compiler.debug.lineNumber=generate
 org.eclipse.jdt.core.compiler.debug.localVariable=generate
 org.eclipse.jdt.core.compiler.debug.sourceFile=generate
@@ -104,7 +104,7 @@ org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
 org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=warning
 org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
 org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=11
+org.eclipse.jdt.core.compiler.source=17
 org.eclipse.jdt.core.formatter.align_assignment_statements_on_columns=false
 org.eclipse.jdt.core.formatter.align_fields_grouping_blank_lines=2147483647
 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
diff --git a/nflow-rest-api-common/.settings/org.eclipse.jdt.core.prefs b/nflow-rest-api-common/.settings/org.eclipse.jdt.core.prefs
index f0e48869f..d144fadf8 100644
--- a/nflow-rest-api-common/.settings/org.eclipse.jdt.core.prefs
+++ b/nflow-rest-api-common/.settings/org.eclipse.jdt.core.prefs
@@ -1,4 +1,4 @@
-#Sat Jul 09 00:19:01 EEST 2022
+#Sun Apr 07 10:53:42 EEST 2024
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.annotation.inheritNullAnnotations=disabled
 org.eclipse.jdt.core.compiler.annotation.missingNonNullByDefaultAnnotation=ignore
@@ -11,9 +11,9 @@ org.eclipse.jdt.core.compiler.annotation.nullable.secondary=
 org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
 org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=17
 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=11
+org.eclipse.jdt.core.compiler.compliance=17
 org.eclipse.jdt.core.compiler.debug.lineNumber=generate
 org.eclipse.jdt.core.compiler.debug.localVariable=generate
 org.eclipse.jdt.core.compiler.debug.sourceFile=generate
@@ -104,7 +104,7 @@ org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
 org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=warning
 org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
 org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=11
+org.eclipse.jdt.core.compiler.source=17
 org.eclipse.jdt.core.formatter.align_assignment_statements_on_columns=false
 org.eclipse.jdt.core.formatter.align_fields_grouping_blank_lines=2147483647
 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
diff --git a/nflow-rest-api-common/src/main/java/io/nflow/rest/v1/msg/Action.java b/nflow-rest-api-common/src/main/java/io/nflow/rest/v1/msg/Action.java
index 1c6973986..50845675d 100644
--- a/nflow-rest-api-common/src/main/java/io/nflow/rest/v1/msg/Action.java
+++ b/nflow-rest-api-common/src/main/java/io/nflow/rest/v1/msg/Action.java
@@ -9,16 +9,18 @@
 import io.nflow.engine.model.ModelObject;
 import io.swagger.v3.oas.annotations.media.Schema;
 
+import static io.swagger.v3.oas.annotations.media.Schema.RequiredMode.REQUIRED;
+
 @Schema(description = "State change attempt. A new instance for every retry attempt.")
 @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD", justification = "jackson reads dto fields")
 public class Action extends ModelObject {
 
-  @Schema(description = "Identifier of the workflow instance action", required = true)
+  @Schema(description = "Identifier of the workflow instance action", requiredMode = REQUIRED)
   public long id;
-  @Schema(description = "Type of state", required = true, allowableValues = { "stateExecution", "stateExecutionFailed",
+  @Schema(description = "Type of state", requiredMode = REQUIRED, allowableValues = { "stateExecution", "stateExecutionFailed",
       "externalChange", "recovery" })
   public String type;
-  @Schema(description = "Name of state", required = true)
+  @Schema(description = "Name of state", requiredMode = REQUIRED)
   public String state;
   @Schema(description = "Description of state")
   public String stateText;
diff --git a/nflow-rest-api-common/src/main/java/io/nflow/rest/v1/msg/CreateWorkflowInstanceRequest.java b/nflow-rest-api-common/src/main/java/io/nflow/rest/v1/msg/CreateWorkflowInstanceRequest.java
index 7b31659fb..633da5919 100644
--- a/nflow-rest-api-common/src/main/java/io/nflow/rest/v1/msg/CreateWorkflowInstanceRequest.java
+++ b/nflow-rest-api-common/src/main/java/io/nflow/rest/v1/msg/CreateWorkflowInstanceRequest.java
@@ -9,12 +9,14 @@
 import io.nflow.engine.model.ModelObject;
 import io.swagger.v3.oas.annotations.media.Schema;
 
+import static io.swagger.v3.oas.annotations.media.Schema.RequiredMode.REQUIRED;
+
 @Schema(description = "Request for submitting a new workflow instance. Note that if externalId is given, "
     + "type and externalId pair must be unique hence enabling retry-safety.")
 @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD", justification = "jackson reads dto fields")
 public class CreateWorkflowInstanceRequest extends ModelObject {
 
-  @Schema(description = "Workflow definition type", required = true, nullable = false, minLength = 1, maxLength = 30)
+  @Schema(description = "Workflow definition type", requiredMode = REQUIRED, nullable = false, minLength = 1, maxLength = 30)
   public String type;
 
   @Schema(description = "Main business key or identifier for the new workflow instance", maxLength = 64)
diff --git a/nflow-rest-api-common/src/main/java/io/nflow/rest/v1/msg/CreateWorkflowInstanceResponse.java b/nflow-rest-api-common/src/main/java/io/nflow/rest/v1/msg/CreateWorkflowInstanceResponse.java
index 8383b8b41..35dadcae0 100644
--- a/nflow-rest-api-common/src/main/java/io/nflow/rest/v1/msg/CreateWorkflowInstanceResponse.java
+++ b/nflow-rest-api-common/src/main/java/io/nflow/rest/v1/msg/CreateWorkflowInstanceResponse.java
@@ -4,20 +4,22 @@
 import io.nflow.engine.model.ModelObject;
 import io.swagger.v3.oas.annotations.media.Schema;
 
+import static io.swagger.v3.oas.annotations.media.Schema.RequiredMode.REQUIRED;
+
 @Schema(description = "Response for submit new workflow instance")
 @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD", justification = "jackson reads dto fields")
 public class CreateWorkflowInstanceResponse extends ModelObject {
 
-  @Schema(description = "Identifier of the new workflow instance", required = true, format = "int64")
+  @Schema(description = "Identifier of the new workflow instance", requiredMode = REQUIRED, format = "int64")
   public long id;
 
-  @Schema(description = "Workflow definition type", required = true)
+  @Schema(description = "Workflow definition type", requiredMode = REQUIRED)
   public String type;
 
   @Schema(description = "Main business key or identifier for the workflow instance")
   public String businessKey;
 
-  @Schema(description = "Unique external identifier within workflow type. Generated by nFlow if not given.", required = true,
+  @Schema(description = "Unique external identifier within workflow type. Generated by nFlow if not given.", requiredMode = REQUIRED,
       minLength = 1, maxLength = 64)
   public String externalId;
 
diff --git a/nflow-rest-api-common/src/main/java/io/nflow/rest/v1/msg/ListWorkflowDefinitionResponse.java b/nflow-rest-api-common/src/main/java/io/nflow/rest/v1/msg/ListWorkflowDefinitionResponse.java
index edf0e16c1..f870d4902 100644
--- a/nflow-rest-api-common/src/main/java/io/nflow/rest/v1/msg/ListWorkflowDefinitionResponse.java
+++ b/nflow-rest-api-common/src/main/java/io/nflow/rest/v1/msg/ListWorkflowDefinitionResponse.java
@@ -1,31 +1,33 @@
 package io.nflow.rest.v1.msg;
 
-import org.joda.time.Period;
-
+import edu.umd.cs.findbugs.annotations.NonNull;
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 import io.nflow.engine.model.ModelObject;
 import io.swagger.v3.oas.annotations.media.Schema;
+import org.joda.time.Period;
+
+import static io.swagger.v3.oas.annotations.media.Schema.RequiredMode.REQUIRED;
 
 @Schema(description = "Basic information of workflow definition")
 @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD", justification = "jackson reads dto fields")
 public class ListWorkflowDefinitionResponse extends ModelObject implements Comparable<ListWorkflowDefinitionResponse> {
 
-  @Schema(description = "Type of the workflow definition", required = true)
+  @Schema(description = "Type of the workflow definition", requiredMode = REQUIRED)
   public String type;
 
-  @Schema(description = "Name of the workflow definition", required = true)
+  @Schema(description = "Name of the workflow definition", requiredMode = REQUIRED)
   public String name;
 
   @Schema(description = "Description of the workflow definition")
   public String description;
 
-  @Schema(description = "Default error state", required = true)
+  @Schema(description = "Default error state", requiredMode = REQUIRED)
   public String onError;
 
-  @Schema(description = "Workflow definition states and transitions", required = true)
+  @Schema(description = "Workflow definition states and transitions", requiredMode = REQUIRED)
   public State[] states;
 
-  @Schema(description = "Workflow settings", required = true)
+  @Schema(description = "Workflow settings", requiredMode = REQUIRED)
   public Settings settings;
 
   @Schema(description = "Supported signals")
@@ -33,10 +35,10 @@ public class ListWorkflowDefinitionResponse extends ModelObject implements Compa
 
   public static class Settings extends ModelObject {
 
-    @Schema(description = "Global transition delays for the workflow", required = true)
+    @Schema(description = "Global transition delays for the workflow", requiredMode = REQUIRED)
     public TransitionDelays transitionDelaysInMilliseconds;
 
-    @Schema(description = "Maximum retries for a state before moving to failure", required = true)
+    @Schema(description = "Maximum retries for a state before moving to failure", requiredMode = REQUIRED)
     public int maxRetries;
 
     @Schema(
@@ -44,30 +46,30 @@ public static class Settings extends ModelObject {
         type = "string", format = "duration", example = "PT15D")
     public Period historyDeletableAfter;
 
-    @Schema(description = "Default priority for new workflow instances", required = true)
+    @Schema(description = "Default priority for new workflow instances", requiredMode = REQUIRED)
     public short defaultPriority;
 
   }
 
   public static class TransitionDelays extends ModelObject {
 
-    @Schema(description = "Short delay between transitions", required = true)
+    @Schema(description = "Short delay between transitions", requiredMode = REQUIRED)
     public long waitShort;
 
-    @Schema(description = "First retry delay after failure", required = true)
+    @Schema(description = "First retry delay after failure", requiredMode = REQUIRED)
     public long minErrorWait;
 
-    @Schema(description = "Maximum delay between failure retries", required = true)
+    @Schema(description = "Maximum delay between failure retries", requiredMode = REQUIRED)
     public long maxErrorWait;
 
   }
 
   public static class Signal extends ModelObject {
 
-    @Schema(description = "Signal value", required = true)
+    @Schema(description = "Signal value", requiredMode = REQUIRED)
     public int value;
 
-    @Schema(description = "Signal description", required = true)
+    @Schema(description = "Signal description", requiredMode = REQUIRED)
     public String description;
 
   }
@@ -75,7 +77,7 @@ public static class Signal extends ModelObject {
   @Override
   @SuppressFBWarnings(value = { "EQ_COMPARETO_USE_OBJECT_EQUALS", "WEM_WEAK_EXCEPTION_MESSAGING" },
       justification = "This class has a natural ordering that is inconsistent with equals, exception message is ok")
-  public int compareTo(ListWorkflowDefinitionResponse response) {
+  public int compareTo(@NonNull ListWorkflowDefinitionResponse response) {
     if (type == null) {
       throw new IllegalStateException("type must be set");
     }
diff --git a/nflow-rest-api-common/src/main/java/io/nflow/rest/v1/msg/ListWorkflowExecutorResponse.java b/nflow-rest-api-common/src/main/java/io/nflow/rest/v1/msg/ListWorkflowExecutorResponse.java
index 223681348..14c0ec8aa 100644
--- a/nflow-rest-api-common/src/main/java/io/nflow/rest/v1/msg/ListWorkflowExecutorResponse.java
+++ b/nflow-rest-api-common/src/main/java/io/nflow/rest/v1/msg/ListWorkflowExecutorResponse.java
@@ -6,29 +6,31 @@
 import io.nflow.engine.model.ModelObject;
 import io.swagger.v3.oas.annotations.media.Schema;
 
+import static io.swagger.v3.oas.annotations.media.Schema.RequiredMode.REQUIRED;
+
 @Schema(description = "Basic information of workflow executor")
 @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD", justification = "jackson reads dto fields")
 public class ListWorkflowExecutorResponse extends ModelObject {
 
-  @Schema(description = "Identifier of the workflow executor", required = true)
+  @Schema(description = "Identifier of the workflow executor", requiredMode = REQUIRED)
   public int id;
 
-  @Schema(description = "Host where the executor is running", required = true)
+  @Schema(description = "Host where the executor is running", requiredMode = REQUIRED)
   public String host;
 
-  @Schema(description = "Executor process identifier assigned by the operating system", required = true)
+  @Schema(description = "Executor process identifier assigned by the operating system", requiredMode = REQUIRED)
   public int pid;
 
-  @Schema(description = "Executor group the executor belongs to", required = true)
+  @Schema(description = "Executor group the executor belongs to", requiredMode = REQUIRED)
   public String executorGroup;
 
-  @Schema(description = "Time when the executor was started", required = true)
+  @Schema(description = "Time when the executor was started", requiredMode = REQUIRED)
   public DateTime started;
 
-  @Schema(description = "Last time the executor updated it's heart beat to the database", required = true)
+  @Schema(description = "Last time the executor updated it's heart beat to the database", requiredMode = REQUIRED)
   public DateTime active;
 
-  @Schema(description = "Time after which the executor is considered as crashed", required = true)
+  @Schema(description = "Time after which the executor is considered as crashed", requiredMode = REQUIRED)
   public DateTime expires;
 
   @Schema(description = "Time when the executor was stopped")
diff --git a/nflow-rest-api-common/src/main/java/io/nflow/rest/v1/msg/ListWorkflowInstanceResponse.java b/nflow-rest-api-common/src/main/java/io/nflow/rest/v1/msg/ListWorkflowInstanceResponse.java
index 237a05acd..0b82c120c 100644
--- a/nflow-rest-api-common/src/main/java/io/nflow/rest/v1/msg/ListWorkflowInstanceResponse.java
+++ b/nflow-rest-api-common/src/main/java/io/nflow/rest/v1/msg/ListWorkflowInstanceResponse.java
@@ -1,6 +1,7 @@
 package io.nflow.rest.v1.msg;
 
 import static com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL;
+import static io.swagger.v3.oas.annotations.media.Schema.RequiredMode.REQUIRED;
 
 import java.util.List;
 import java.util.Map;
@@ -15,21 +16,22 @@
 
 @Schema(description = "Basic information of workflow instance")
 @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD", justification = "jackson reads dto fields")
+@SuppressWarnings("this-escape")
 public class ListWorkflowInstanceResponse extends ModelObject {
 
-  @Schema(description = "Identifier of the workflow instance", required = true)
+  @Schema(description = "Identifier of the workflow instance", requiredMode = REQUIRED)
   public long id;
 
-  @Schema(description = "Workflow instance status", required = true, allowableValues = { "created", "executing", "inProgress",
+  @Schema(description = "Workflow instance status", requiredMode = REQUIRED, allowableValues = { "created", "executing", "inProgress",
       "finished", "manual" })
   public String status;
 
-  @Schema(description = "Workflow definition type", required = true)
+  @Schema(description = "Workflow definition type", requiredMode = REQUIRED)
   public String type;
 
   @Schema(
       description = "Workflow instance priority. Larger value gets (unfair) priority in scheduling. Can be negative.",
-      required = true)
+      requiredMode = REQUIRED)
   public Short priority;
 
   @Schema(description = "Parent workflow instance id for child workflows")
@@ -41,10 +43,10 @@ public class ListWorkflowInstanceResponse extends ModelObject {
   @Schema(description = "Main business key or identifier for the workflow instance")
   public String businessKey;
 
-  @Schema(description = "Unique external identifier within a workflow type. Generated by nFlow if not given.", required = true)
+  @Schema(description = "Unique external identifier within a workflow type. Generated by nFlow if not given.", requiredMode = REQUIRED)
   public String externalId;
 
-  @Schema(description = "State of the workflow instance", required = true)
+  @Schema(description = "State of the workflow instance", requiredMode = REQUIRED)
   public String state;
 
   @Schema(description = "Text of describing the reason for state (free text)")
@@ -56,17 +58,17 @@ public class ListWorkflowInstanceResponse extends ModelObject {
   @Schema(description = "State variables for current state")
   public Map<String, Object> stateVariables;
 
-  @Schema(description = "Number of times the current state has been retried", required = true)
+  @Schema(description = "Number of times the current state has been retried", requiredMode = REQUIRED)
   public int retries;
 
   @Schema(description = "Action history of the workflow instance")
   @JsonInclude(NON_NULL)
   public List<Action> actions;
 
-  @Schema(description = "Workflow instance creation timestamp", required = true)
+  @Schema(description = "Workflow instance creation timestamp", requiredMode = REQUIRED)
   public DateTime created;
 
-  @Schema(description = "Workflow instance latest modification timestamp", required = true)
+  @Schema(description = "Workflow instance latest modification timestamp", requiredMode = REQUIRED)
   public DateTime modified;
 
   @Schema(description = "Time when workflow processing started (=start time of the first action)")
diff --git a/nflow-rest-api-common/src/main/java/io/nflow/rest/v1/msg/MaintenanceRequest.java b/nflow-rest-api-common/src/main/java/io/nflow/rest/v1/msg/MaintenanceRequest.java
index 29ea0a7c1..25ff7ec01 100644
--- a/nflow-rest-api-common/src/main/java/io/nflow/rest/v1/msg/MaintenanceRequest.java
+++ b/nflow-rest-api-common/src/main/java/io/nflow/rest/v1/msg/MaintenanceRequest.java
@@ -1,5 +1,6 @@
 package io.nflow.rest.v1.msg;
 
+import static io.swagger.v3.oas.annotations.media.Schema.RequiredMode.REQUIRED;
 import static java.util.Collections.emptySet;
 
 import java.util.Set;
@@ -28,7 +29,7 @@ public class MaintenanceRequest extends ModelObject {
   public static class MaintenanceRequestItem extends ModelObject {
     @Schema(
         description = "Workflow instances whose modified time is older than given period will be processed. Supports ISO-8601 format.",
-        type = "string", format = "duration", example = "PT15D", required = true)
+        type = "string", format = "duration", example = "PT15D", requiredMode = REQUIRED)
     public ReadablePeriod olderThanPeriod;
 
     @Schema(description = "Number of workflows to process in a single transaction.", example = "1000", defaultValue = "1000",
diff --git a/nflow-rest-api-common/src/main/java/io/nflow/rest/v1/msg/QueueStatistics.java b/nflow-rest-api-common/src/main/java/io/nflow/rest/v1/msg/QueueStatistics.java
index 2c21039b2..41de33616 100644
--- a/nflow-rest-api-common/src/main/java/io/nflow/rest/v1/msg/QueueStatistics.java
+++ b/nflow-rest-api-common/src/main/java/io/nflow/rest/v1/msg/QueueStatistics.java
@@ -4,11 +4,13 @@
 import io.nflow.engine.model.ModelObject;
 import io.swagger.v3.oas.annotations.media.Schema;
 
+import static io.swagger.v3.oas.annotations.media.Schema.RequiredMode.REQUIRED;
+
 @Schema(description = "Statistics for workflow instances.")
 @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD", justification = "jackson reads dto fields")
 public class QueueStatistics extends ModelObject {
 
-  @Schema(description = "Number for workflow instances.", required = true)
+  @Schema(description = "Number for workflow instances.", requiredMode = REQUIRED)
   public int count;
   @Schema(description = "Maximum time (ms) currently queued workflow instances have been in queue.")
   public Long maxAge;
diff --git a/nflow-rest-api-common/src/main/java/io/nflow/rest/v1/msg/State.java b/nflow-rest-api-common/src/main/java/io/nflow/rest/v1/msg/State.java
index 05381589e..870e695e5 100644
--- a/nflow-rest-api-common/src/main/java/io/nflow/rest/v1/msg/State.java
+++ b/nflow-rest-api-common/src/main/java/io/nflow/rest/v1/msg/State.java
@@ -7,6 +7,8 @@
 import io.nflow.engine.model.ModelObject;
 import io.swagger.v3.oas.annotations.media.Schema;
 
+import static io.swagger.v3.oas.annotations.media.Schema.RequiredMode.REQUIRED;
+
 @Schema(description = "Workflow definition states and transition to next states")
 @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD", justification = "jackson reads dto fields")
 public class State extends ModelObject {
@@ -21,13 +23,13 @@ public State(String id, String type, String description) {
     this.description = description;
   }
 
-  @Schema(description = "State identifier", required = true)
+  @Schema(description = "State identifier", requiredMode = REQUIRED)
   public String id;
 
-  @Schema(description = "State type", required = true, allowableValues = { "start", "normal", "manual", "wait", "end" })
+  @Schema(description = "State type", requiredMode = REQUIRED, allowableValues = { "start", "normal", "manual", "wait", "end" })
   public String type;
 
-  @Schema(description = "State description", required = true)
+  @Schema(description = "State description", requiredMode = REQUIRED)
   public String description;
 
   @Schema(description = "Permitted transitions from this state")
diff --git a/nflow-rest-api-common/src/main/java/io/nflow/rest/v1/msg/StatisticsResponse.java b/nflow-rest-api-common/src/main/java/io/nflow/rest/v1/msg/StatisticsResponse.java
index 5c76550d1..90bea9e75 100644
--- a/nflow-rest-api-common/src/main/java/io/nflow/rest/v1/msg/StatisticsResponse.java
+++ b/nflow-rest-api-common/src/main/java/io/nflow/rest/v1/msg/StatisticsResponse.java
@@ -4,15 +4,17 @@
 import io.nflow.engine.model.ModelObject;
 import io.swagger.v3.oas.annotations.media.Schema;
 
+import static io.swagger.v3.oas.annotations.media.Schema.RequiredMode.REQUIRED;
+
 @Schema(description = "Response for statistics")
 @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD", justification = "jackson reads dto fields")
 public class StatisticsResponse extends ModelObject {
 
-  @Schema(required = true)
+  @Schema(requiredMode = REQUIRED)
   // Statistics for queued workflows. Workflow instances waiting for free executors.
   public QueueStatistics queueStatistics = new QueueStatistics();
 
-  @Schema(required = true)
+  @Schema(requiredMode = REQUIRED)
   // Statistics for workflows in execution. Workflow instances currently processed by an executor.
   public QueueStatistics executionStatistics = new QueueStatistics();
 
diff --git a/nflow-rest-api-common/src/main/java/io/nflow/rest/v1/msg/WorkflowDefinitionStatisticsResponse.java b/nflow-rest-api-common/src/main/java/io/nflow/rest/v1/msg/WorkflowDefinitionStatisticsResponse.java
index ff71c9050..1d2998b39 100644
--- a/nflow-rest-api-common/src/main/java/io/nflow/rest/v1/msg/WorkflowDefinitionStatisticsResponse.java
+++ b/nflow-rest-api-common/src/main/java/io/nflow/rest/v1/msg/WorkflowDefinitionStatisticsResponse.java
@@ -7,35 +7,37 @@
 import io.nflow.engine.model.ModelObject;
 import io.swagger.v3.oas.annotations.media.Schema;
 
+import static io.swagger.v3.oas.annotations.media.Schema.RequiredMode.REQUIRED;
+
 @Schema(description = "Response for workflow definition statistics")
 @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD", justification = "jackson reads dto fields")
 public class WorkflowDefinitionStatisticsResponse extends ModelObject {
 
-  @Schema(description = "Statistics per state", required = true)
+  @Schema(description = "Statistics per state", requiredMode = REQUIRED)
   public Map<String, StateStatistics> stateStatistics = new LinkedHashMap<>();
 
   @Schema(description = "Statistics for a state")
   public static class StateStatistics extends ModelObject {
-    @Schema(description = "Instances created", required = true)
+    @Schema(description = "Instances created", requiredMode = REQUIRED)
     public AllAndQueued created = new AllAndQueued();
-    @Schema(description = "Instances in progress", required = true)
+    @Schema(description = "Instances in progress", requiredMode = REQUIRED)
     public AllAndQueued inProgress = new AllAndQueued();
-    @Schema(description = "Instances executing", required = true)
+    @Schema(description = "Instances executing", requiredMode = REQUIRED)
     public All executing = new All();
-    @Schema(description = "Instances in manual state", required = true)
+    @Schema(description = "Instances in manual state", requiredMode = REQUIRED)
     public All manual = new All();
-    @Schema(description = "Instances finished", required = true)
+    @Schema(description = "Instances finished", requiredMode = REQUIRED)
     public All finished = new All();
 
     @Schema(description = "All and queued instances")
     public static class AllAndQueued extends StateStatistics.All {
-      @Schema(description = "Statistics per state", required = true)
+      @Schema(description = "Statistics per state", requiredMode = REQUIRED)
       public long queuedInstances;
     }
 
     @Schema(description = "All instances")
     public static class All extends ModelObject {
-      @Schema(description = "Statistics per state", required = true)
+      @Schema(description = "Statistics per state", requiredMode = REQUIRED)
       public long allInstances;
     }
   }
diff --git a/nflow-rest-api-common/src/test/java/io/nflow/rest/v1/DummyTestWorkflow.java b/nflow-rest-api-common/src/test/java/io/nflow/rest/v1/DummyTestWorkflow.java
index 7a5e93492..c7a15e29e 100644
--- a/nflow-rest-api-common/src/test/java/io/nflow/rest/v1/DummyTestWorkflow.java
+++ b/nflow-rest-api-common/src/test/java/io/nflow/rest/v1/DummyTestWorkflow.java
@@ -17,6 +17,7 @@
 
 public class DummyTestWorkflow extends WorkflowDefinition {
 
+  @SuppressWarnings("this-escape")
   public DummyTestWorkflow() {
     super("dummy", BEGIN, ERROR,
         new WorkflowSettings.Builder().setMinErrorTransitionDelay(millis(300)).setMaxErrorTransitionDelay(millis(1000))
diff --git a/nflow-rest-api-common/src/test/java/io/nflow/rest/v1/converter/ListWorkflowInstanceConverterTest.java b/nflow-rest-api-common/src/test/java/io/nflow/rest/v1/converter/ListWorkflowInstanceConverterTest.java
index 0f29d4373..08f9e2380 100644
--- a/nflow-rest-api-common/src/test/java/io/nflow/rest/v1/converter/ListWorkflowInstanceConverterTest.java
+++ b/nflow-rest-api-common/src/test/java/io/nflow/rest/v1/converter/ListWorkflowInstanceConverterTest.java
@@ -201,7 +201,7 @@ public void convertWithEmptyStateVariablesWorks() {
         .build();
     WorkflowInstance i = new WorkflowInstance.Builder().setId(1).setStatus(inProgress).setType("dummy")
         .setBusinessKey("businessKey").setExternalId("externalId").setState("cState").setStateText("cState desc")
-        .setNextActivation(now()).setActions(Arrays.asList(a)).setStateVariables(new LinkedHashMap<String, String>()).build();
+        .setNextActivation(now()).setActions(Arrays.asList(a)).setStateVariables(new LinkedHashMap<>()).build();
 
     ListWorkflowInstanceResponse resp = converter.convert(i, EnumSet.of(currentStateVariables), false);
 
diff --git a/nflow-rest-api-jax-rs/.settings/org.eclipse.jdt.core.prefs b/nflow-rest-api-jax-rs/.settings/org.eclipse.jdt.core.prefs
index b94a916d7..5ba39d371 100644
--- a/nflow-rest-api-jax-rs/.settings/org.eclipse.jdt.core.prefs
+++ b/nflow-rest-api-jax-rs/.settings/org.eclipse.jdt.core.prefs
@@ -1,9 +1,9 @@
-#Sat Jul 09 00:19:01 EEST 2022
+#Sun Apr 07 10:53:42 EEST 2024
 eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
-org.eclipse.jdt.core.compiler.compliance=11
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=17
+org.eclipse.jdt.core.compiler.compliance=17
 org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
-org.eclipse.jdt.core.compiler.source=11
+org.eclipse.jdt.core.compiler.source=17
 org.eclipse.jdt.core.formatter.align_assignment_statements_on_columns=false
 org.eclipse.jdt.core.formatter.align_fields_grouping_blank_lines=2147483647
 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
diff --git a/nflow-rest-api-jax-rs/src/test/java/io/nflow/rest/JerseyCompabilityTest.java b/nflow-rest-api-jax-rs/src/test/java/io/nflow/rest/JerseyCompabilityTest.java
index ad5706768..e9564654f 100644
--- a/nflow-rest-api-jax-rs/src/test/java/io/nflow/rest/JerseyCompabilityTest.java
+++ b/nflow-rest-api-jax-rs/src/test/java/io/nflow/rest/JerseyCompabilityTest.java
@@ -27,6 +27,7 @@ public void restApiWorksInJersey() throws IOException {
   }
 
   public static class JerseyResourceConfig extends ResourceConfig {
+    @SuppressWarnings("this-escape")
     public JerseyResourceConfig() {
       packages(MaintenanceResource.class.getPackage().getName());
       register(DateTimeParamConverterProvider.class);
diff --git a/nflow-rest-api-spring-web/.settings/org.eclipse.jdt.core.prefs b/nflow-rest-api-spring-web/.settings/org.eclipse.jdt.core.prefs
index 0775141d6..60e2da0a7 100644
--- a/nflow-rest-api-spring-web/.settings/org.eclipse.jdt.core.prefs
+++ b/nflow-rest-api-spring-web/.settings/org.eclipse.jdt.core.prefs
@@ -1,4 +1,4 @@
-#Sat Jul 09 00:19:01 EEST 2022
+#Sun Apr 07 10:53:43 EEST 2024
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.annotation.inheritNullAnnotations=disabled
 org.eclipse.jdt.core.compiler.annotation.missingNonNullByDefaultAnnotation=ignore
@@ -11,9 +11,9 @@ org.eclipse.jdt.core.compiler.annotation.nullable.secondary=
 org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
 org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=17
 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=11
+org.eclipse.jdt.core.compiler.compliance=17
 org.eclipse.jdt.core.compiler.debug.lineNumber=generate
 org.eclipse.jdt.core.compiler.debug.localVariable=generate
 org.eclipse.jdt.core.compiler.debug.sourceFile=generate
@@ -104,7 +104,7 @@ org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
 org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=warning
 org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
 org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=11
+org.eclipse.jdt.core.compiler.source=17
 org.eclipse.jdt.core.formatter.align_assignment_statements_on_columns=false
 org.eclipse.jdt.core.formatter.align_fields_grouping_blank_lines=2147483647
 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
diff --git a/nflow-server-common/.settings/org.eclipse.jdt.core.prefs b/nflow-server-common/.settings/org.eclipse.jdt.core.prefs
index 0775141d6..fe680ae64 100644
--- a/nflow-server-common/.settings/org.eclipse.jdt.core.prefs
+++ b/nflow-server-common/.settings/org.eclipse.jdt.core.prefs
@@ -1,4 +1,4 @@
-#Sat Jul 09 00:19:01 EEST 2022
+#Sun Apr 07 10:53:42 EEST 2024
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.annotation.inheritNullAnnotations=disabled
 org.eclipse.jdt.core.compiler.annotation.missingNonNullByDefaultAnnotation=ignore
@@ -11,9 +11,9 @@ org.eclipse.jdt.core.compiler.annotation.nullable.secondary=
 org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
 org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=17
 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=11
+org.eclipse.jdt.core.compiler.compliance=17
 org.eclipse.jdt.core.compiler.debug.lineNumber=generate
 org.eclipse.jdt.core.compiler.debug.localVariable=generate
 org.eclipse.jdt.core.compiler.debug.sourceFile=generate
@@ -104,7 +104,7 @@ org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
 org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=warning
 org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
 org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=11
+org.eclipse.jdt.core.compiler.source=17
 org.eclipse.jdt.core.formatter.align_assignment_statements_on_columns=false
 org.eclipse.jdt.core.formatter.align_fields_grouping_blank_lines=2147483647
 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
diff --git a/nflow-server-common/src/main/java/io/nflow/server/spring/NflowStandardEnvironment.java b/nflow-server-common/src/main/java/io/nflow/server/spring/NflowStandardEnvironment.java
index 705ac0f68..7fa5b1531 100644
--- a/nflow-server-common/src/main/java/io/nflow/server/spring/NflowStandardEnvironment.java
+++ b/nflow-server-common/src/main/java/io/nflow/server/spring/NflowStandardEnvironment.java
@@ -22,6 +22,7 @@ public class NflowStandardEnvironment extends StandardEnvironment {
 
   @SuppressFBWarnings(value = "MC_OVERRIDABLE_METHOD_CALL_IN_CONSTRUCTOR",
       justification = "addExternalPropertyResource and setupDbProfile are private")
+  @SuppressWarnings("this-escape")
   public NflowStandardEnvironment(Map<String, Object> overrideProperties) {
     getPropertySources().addFirst(new MapPropertySource("override", overrideProperties));
     addExternalPropertyResource();
diff --git a/nflow-server-common/src/test/java/io/nflow/server/spring/NflowStandardEnvironmentTest.java b/nflow-server-common/src/test/java/io/nflow/server/spring/NflowStandardEnvironmentTest.java
index 611d0956f..5ae93c181 100644
--- a/nflow-server-common/src/test/java/io/nflow/server/spring/NflowStandardEnvironmentTest.java
+++ b/nflow-server-common/src/test/java/io/nflow/server/spring/NflowStandardEnvironmentTest.java
@@ -37,7 +37,7 @@ public void cleanup() {
 
   @Test
   public void environmentSpecificPropertiesEffective() {
-    NflowStandardEnvironment environment = new NflowStandardEnvironment(new HashMap<String, Object>());
+    NflowStandardEnvironment environment = new NflowStandardEnvironment(new HashMap<>());
     assertThat(environment.getProperty("nflow.executor.group"), is("junit"));
   }
 
@@ -67,7 +67,7 @@ public void missingExternalPropertiesException() {
   @Test
   public void profilesPropertyEnablesSpringProfiles() {
     setProperty("profiles", "plain.test.profile,other.test.profile");
-    NflowStandardEnvironment environment = new NflowStandardEnvironment(new HashMap<String, Object>());
+    NflowStandardEnvironment environment = new NflowStandardEnvironment(new HashMap<>());
     assertThat(environment.acceptsProfiles(Profiles.of("plain.test.profile", "other.test.profile")), is(true));
   }
 
@@ -75,13 +75,13 @@ public void profilesPropertyEnablesSpringProfiles() {
   public void multipleDatabaseProfilesPrevented() {
     setProperty("profiles", "nflow.db.profile1,nflow.db.profile2");
 
-    RuntimeException thrown = assertThrows(RuntimeException.class, () -> new NflowStandardEnvironment(new HashMap<String, Object>()));
+    RuntimeException thrown = assertThrows(RuntimeException.class, () -> new NflowStandardEnvironment(new HashMap<>()));
     assertThat(thrown.getMessage(), CoreMatchers.containsString("Multiple nflow.db profiles defined"));
   }
 
   @Test
   public void databaseProfileDefaultsToH2() {
-    NflowStandardEnvironment environment = new NflowStandardEnvironment(new HashMap<String, Object>());
+    NflowStandardEnvironment environment = new NflowStandardEnvironment(new HashMap<>());
     assertThat(environment.acceptsProfiles(Profiles.of(H2)), is(true));
   }
 }
diff --git a/nflow-tests/.settings/org.eclipse.jdt.core.prefs b/nflow-tests/.settings/org.eclipse.jdt.core.prefs
index e7df6010e..e0a9ae2ec 100644
--- a/nflow-tests/.settings/org.eclipse.jdt.core.prefs
+++ b/nflow-tests/.settings/org.eclipse.jdt.core.prefs
@@ -1,4 +1,4 @@
-#Sat Jul 09 00:19:14 EEST 2022
+#Sun Apr 07 10:53:45 EEST 2024
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.annotation.inheritNullAnnotations=disabled
 org.eclipse.jdt.core.compiler.annotation.missingNonNullByDefaultAnnotation=ignore
@@ -11,9 +11,9 @@ org.eclipse.jdt.core.compiler.annotation.nullable.secondary=
 org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
 org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=17
 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=11
+org.eclipse.jdt.core.compiler.compliance=17
 org.eclipse.jdt.core.compiler.debug.lineNumber=generate
 org.eclipse.jdt.core.compiler.debug.localVariable=generate
 org.eclipse.jdt.core.compiler.debug.sourceFile=generate
@@ -104,7 +104,7 @@ org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
 org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=warning
 org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
 org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=11
+org.eclipse.jdt.core.compiler.source=17
 org.eclipse.jdt.core.formatter.align_assignment_statements_on_columns=false
 org.eclipse.jdt.core.formatter.align_fields_grouping_blank_lines=2147483647
 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
diff --git a/nflow-tests/pom.xml b/nflow-tests/pom.xml
index 187810d3b..805d64d7f 100644
--- a/nflow-tests/pom.xml
+++ b/nflow-tests/pom.xml
@@ -76,13 +76,6 @@
       <artifactId>jcc</artifactId>
     </dependency>
   </dependencies>
-  <repositories>
-    <repository>
-      <id>pentaho-repo</id>
-      <name>pentaho-repo</name>
-      <url>https://public.nexus.pentaho.org/content/groups/omni/</url>
-    </repository>
-  </repositories>
   <build>
     <plugins>
       <plugin>
@@ -132,6 +125,12 @@
           </execution>
         </executions>
       </plugin>
+      <plugin>
+        <artifactId>maven-javadoc-plugin</artifactId>
+        <configuration>
+          <skip>true</skip>
+        </configuration>
+      </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-deploy-plugin</artifactId>
diff --git a/nflow-tests/src/main/java/io/nflow/tests/demo/workflow/ActionStateVariableWorkflow.java b/nflow-tests/src/main/java/io/nflow/tests/demo/workflow/ActionStateVariableWorkflow.java
index f6d88f4e8..9fa60073e 100644
--- a/nflow-tests/src/main/java/io/nflow/tests/demo/workflow/ActionStateVariableWorkflow.java
+++ b/nflow-tests/src/main/java/io/nflow/tests/demo/workflow/ActionStateVariableWorkflow.java
@@ -25,6 +25,7 @@ public class ActionStateVariableWorkflow extends WorkflowDefinition {
 
   private static final WorkflowState SET_VARIABLE = new State("setVariable", WorkflowStateType.start);
 
+  @SuppressWarnings("this-escape")
   public ActionStateVariableWorkflow() {
     super(WORKFLOW_TYPE, SET_VARIABLE, TestState.ERROR, new WorkflowSettings.Builder().setMinErrorTransitionDelay(ZERO)
         .setMaxErrorTransitionDelay(ZERO).setShortTransitionDelay(ZERO).setMaxRetries(3).build());
diff --git a/nflow-tests/src/main/java/io/nflow/tests/demo/workflow/BusinessKeyWorkflow.java b/nflow-tests/src/main/java/io/nflow/tests/demo/workflow/BusinessKeyWorkflow.java
index 95361ead3..5e6dac22c 100644
--- a/nflow-tests/src/main/java/io/nflow/tests/demo/workflow/BusinessKeyWorkflow.java
+++ b/nflow-tests/src/main/java/io/nflow/tests/demo/workflow/BusinessKeyWorkflow.java
@@ -14,6 +14,7 @@ public class BusinessKeyWorkflow extends WorkflowDefinition {
 
   public static final String BUSINESS_KEY_WORKFLOW_TYPE = "businessKeyWorkflow";
 
+  @SuppressWarnings("this-escape")
   public BusinessKeyWorkflow() {
     super(BUSINESS_KEY_WORKFLOW_TYPE, TestState.BEGIN, TestState.ERROR);
     setDescription("Workflow that updates business key");
diff --git a/nflow-tests/src/main/java/io/nflow/tests/demo/workflow/CreditApplicationWorkflow.java b/nflow-tests/src/main/java/io/nflow/tests/demo/workflow/CreditApplicationWorkflow.java
index 4cd38b7eb..6d3058426 100644
--- a/nflow-tests/src/main/java/io/nflow/tests/demo/workflow/CreditApplicationWorkflow.java
+++ b/nflow-tests/src/main/java/io/nflow/tests/demo/workflow/CreditApplicationWorkflow.java
@@ -39,6 +39,7 @@ public class CreditApplicationWorkflow extends WorkflowDefinition {
   private static final WorkflowState DONE = new State("done", end, "Credit application process finished");
   private static final WorkflowState ERROR = new State("error", manual, "Manual processing of failed applications");
 
+  @SuppressWarnings("this-escape")
   public CreditApplicationWorkflow() {
     super("creditApplicationProcess", CREATE_CREDIT_APPLICATION, ERROR,
         new WorkflowSettings.Builder().setMinErrorTransitionDelay(ZERO).setMaxErrorTransitionDelay(ZERO)
diff --git a/nflow-tests/src/main/java/io/nflow/tests/demo/workflow/CreditDecisionWorkflow.java b/nflow-tests/src/main/java/io/nflow/tests/demo/workflow/CreditDecisionWorkflow.java
index 5977c6172..e3408b79a 100644
--- a/nflow-tests/src/main/java/io/nflow/tests/demo/workflow/CreditDecisionWorkflow.java
+++ b/nflow-tests/src/main/java/io/nflow/tests/demo/workflow/CreditDecisionWorkflow.java
@@ -31,6 +31,7 @@ public class CreditDecisionWorkflow extends WorkflowDefinition {
   static final WorkflowState APPROVED = new State("approved", end, "Credit Decision Approved");
   static final WorkflowState REJECTED = new State("rejected", end, "Credit Decision Rejected");
 
+  @SuppressWarnings("this-escape")
   public CreditDecisionWorkflow() {
     super(CREDIT_DECISION_TYPE, INTERNAL_BLACKLIST, MANUAL_DECISION);
     setDescription("Approve or reject credit application");
diff --git a/nflow-tests/src/main/java/io/nflow/tests/demo/workflow/DeleteHistoryWorkflow.java b/nflow-tests/src/main/java/io/nflow/tests/demo/workflow/DeleteHistoryWorkflow.java
index c8a80c486..4ac7514bd 100644
--- a/nflow-tests/src/main/java/io/nflow/tests/demo/workflow/DeleteHistoryWorkflow.java
+++ b/nflow-tests/src/main/java/io/nflow/tests/demo/workflow/DeleteHistoryWorkflow.java
@@ -20,6 +20,7 @@ public class DeleteHistoryWorkflow extends WorkflowDefinition {
 
   public static final String TYPE = "deleteHistory";
 
+  @SuppressWarnings("this-escape")
   public DeleteHistoryWorkflow() {
     super(TYPE, BEGIN, ERROR,
         new WorkflowSettings.Builder().setHistoryDeletableAfter(Period.ZERO).setDeleteHistoryCondition(() -> true).build());
diff --git a/nflow-tests/src/main/java/io/nflow/tests/demo/workflow/Demo2Workflow.java b/nflow-tests/src/main/java/io/nflow/tests/demo/workflow/Demo2Workflow.java
index a80ef3b45..37f220b3f 100644
--- a/nflow-tests/src/main/java/io/nflow/tests/demo/workflow/Demo2Workflow.java
+++ b/nflow-tests/src/main/java/io/nflow/tests/demo/workflow/Demo2Workflow.java
@@ -15,6 +15,7 @@ public class Demo2Workflow extends WorkflowDefinition {
 
   public static final String DEMO2_WORKFLOW_TYPE = "demo2";
 
+  @SuppressWarnings("this-escape")
   public Demo2Workflow() {
     super(DEMO2_WORKFLOW_TYPE, BEGIN, ERROR);
     setDescription("Simple demo workflow: start -> process -> end");
diff --git a/nflow-tests/src/main/java/io/nflow/tests/demo/workflow/DemoWorkflow.java b/nflow-tests/src/main/java/io/nflow/tests/demo/workflow/DemoWorkflow.java
index bf752bc41..c319be581 100644
--- a/nflow-tests/src/main/java/io/nflow/tests/demo/workflow/DemoWorkflow.java
+++ b/nflow-tests/src/main/java/io/nflow/tests/demo/workflow/DemoWorkflow.java
@@ -18,6 +18,7 @@ public class DemoWorkflow extends WorkflowDefinition {
 
   public static final String DEMO_WORKFLOW_TYPE = "demo";
 
+  @SuppressWarnings("this-escape")
   public DemoWorkflow() {
     super(DEMO_WORKFLOW_TYPE, BEGIN, ERROR);
     setDescription("Simple demo workflow: start -> process -> end");
diff --git a/nflow-tests/src/main/java/io/nflow/tests/demo/workflow/FibonacciWorkflow.java b/nflow-tests/src/main/java/io/nflow/tests/demo/workflow/FibonacciWorkflow.java
index eb2ac9505..221d0c33c 100644
--- a/nflow-tests/src/main/java/io/nflow/tests/demo/workflow/FibonacciWorkflow.java
+++ b/nflow-tests/src/main/java/io/nflow/tests/demo/workflow/FibonacciWorkflow.java
@@ -36,6 +36,7 @@ public class FibonacciWorkflow extends WorkflowDefinition {
   private static final WorkflowState N_MINUS_1 = new State("nMinus1");
   private static final WorkflowState N_MINUS_2 = new State("nMinus2");
 
+  @SuppressWarnings("this-escape")
   public FibonacciWorkflow() {
     super(FIBONACCI_TYPE, BEGIN, ERROR);
     setDescription("Fibonacci series generator using recursive process. Each step is handled by a new child workflow.");
diff --git a/nflow-tests/src/main/java/io/nflow/tests/demo/workflow/ForeverWaitingWorkflow.java b/nflow-tests/src/main/java/io/nflow/tests/demo/workflow/ForeverWaitingWorkflow.java
index af8c6ddb6..e3d364cac 100644
--- a/nflow-tests/src/main/java/io/nflow/tests/demo/workflow/ForeverWaitingWorkflow.java
+++ b/nflow-tests/src/main/java/io/nflow/tests/demo/workflow/ForeverWaitingWorkflow.java
@@ -20,6 +20,7 @@ public class ForeverWaitingWorkflow extends WorkflowDefinition {
 
   public static final String FOREVER_WAITING_WORKFLOW_TYPE = "foreverWaiting";
 
+  @SuppressWarnings("this-escape")
   public ForeverWaitingWorkflow() {
     super(FOREVER_WAITING_WORKFLOW_TYPE, BEGIN, ERROR);
     setDescription("Workflow that waits for a year in 'waiting' state");
diff --git a/nflow-tests/src/main/java/io/nflow/tests/demo/workflow/NoRetryWorkflow.java b/nflow-tests/src/main/java/io/nflow/tests/demo/workflow/NoRetryWorkflow.java
index bcdad41f3..965ef03ed 100644
--- a/nflow-tests/src/main/java/io/nflow/tests/demo/workflow/NoRetryWorkflow.java
+++ b/nflow-tests/src/main/java/io/nflow/tests/demo/workflow/NoRetryWorkflow.java
@@ -17,6 +17,7 @@ public class NoRetryWorkflow extends WorkflowDefinition {
 
   public static final String TYPE = "noRetry";
 
+  @SuppressWarnings("this-escape")
   public NoRetryWorkflow() {
     super(TYPE, TestState.BEGIN, TestState.ERROR,
         new WorkflowSettings.Builder().setExceptionAnalyzer(exceptionAnalyzer()).build());
diff --git a/nflow-tests/src/main/java/io/nflow/tests/demo/workflow/ProcessCreditApplicationWorkflow.java b/nflow-tests/src/main/java/io/nflow/tests/demo/workflow/ProcessCreditApplicationWorkflow.java
index 1e7eb5622..cd2b2976c 100644
--- a/nflow-tests/src/main/java/io/nflow/tests/demo/workflow/ProcessCreditApplicationWorkflow.java
+++ b/nflow-tests/src/main/java/io/nflow/tests/demo/workflow/ProcessCreditApplicationWorkflow.java
@@ -50,6 +50,7 @@ public class ProcessCreditApplicationWorkflow extends WorkflowDefinition {
       "Process must be handled manually because of an unexpected situation");
   private static final WorkflowState DONE = new State("done", end, "Credit application has been completed.");
 
+  @SuppressWarnings("this-escape")
   public ProcessCreditApplicationWorkflow() {
     super("processCreditApplication", CREATE_CREDIT_APPLICATION, MANUAL_PROCESSING);
     setName("Process credit application");
diff --git a/nflow-tests/src/main/java/io/nflow/tests/demo/workflow/RemoteWorkflow.java b/nflow-tests/src/main/java/io/nflow/tests/demo/workflow/RemoteWorkflow.java
new file mode 100644
index 000000000..7e547ce34
--- /dev/null
+++ b/nflow-tests/src/main/java/io/nflow/tests/demo/workflow/RemoteWorkflow.java
@@ -0,0 +1,30 @@
+package io.nflow.tests.demo.workflow;
+
+import io.nflow.engine.workflow.definition.NextAction;
+import io.nflow.engine.workflow.definition.StateExecution;
+import io.nflow.engine.workflow.definition.WorkflowDefinition;
+
+import static io.nflow.engine.workflow.definition.NextAction.moveToState;
+import static io.nflow.engine.workflow.definition.NextAction.stopInState;
+import static io.nflow.tests.demo.workflow.TestState.*;
+
+public class RemoteWorkflow extends WorkflowDefinition {
+
+    public static final String REMOTE_WORKFLOW_TYPE = "remote";
+
+    @SuppressWarnings("this-escape")
+    public RemoteWorkflow() {
+      super(REMOTE_WORKFLOW_TYPE, BEGIN, ERROR);
+      setDescription("Remote workflow: start -> process -> end");
+      permit(BEGIN, PROCESS);
+      permit(PROCESS, DONE);
+    }
+
+    public NextAction begin(@SuppressWarnings("unused") StateExecution execution) {
+      return moveToState(PROCESS, "Go to process state");
+    }
+
+    public NextAction process(@SuppressWarnings("unused") StateExecution execution) {
+      return stopInState(DONE, "Go to done state");
+    }
+  }
diff --git a/nflow-tests/src/main/java/io/nflow/tests/demo/workflow/SimpleWorkflow.java b/nflow-tests/src/main/java/io/nflow/tests/demo/workflow/SimpleWorkflow.java
index 7c7a8b423..a32ba789c 100644
--- a/nflow-tests/src/main/java/io/nflow/tests/demo/workflow/SimpleWorkflow.java
+++ b/nflow-tests/src/main/java/io/nflow/tests/demo/workflow/SimpleWorkflow.java
@@ -13,6 +13,7 @@ public class SimpleWorkflow extends WorkflowDefinition {
 
   public static final String SIMPLE_WORKFLOW_TYPE = "simple";
 
+  @SuppressWarnings("this-escape")
   public SimpleWorkflow() {
     super(SIMPLE_WORKFLOW_TYPE, BEGIN, ERROR);
     setDescription("Simple demo workflow: start -> done");
diff --git a/nflow-tests/src/main/java/io/nflow/tests/demo/workflow/SlowWorkflow.java b/nflow-tests/src/main/java/io/nflow/tests/demo/workflow/SlowWorkflow.java
index 2330e8945..3e6c8be55 100644
--- a/nflow-tests/src/main/java/io/nflow/tests/demo/workflow/SlowWorkflow.java
+++ b/nflow-tests/src/main/java/io/nflow/tests/demo/workflow/SlowWorkflow.java
@@ -26,6 +26,7 @@ public class SlowWorkflow extends WorkflowDefinition {
 
   public static final WorkflowState INTERRUPTED = new State("interrupted", end);
 
+  @SuppressWarnings("this-escape")
   public SlowWorkflow() {
     super(SLOW_WORKFLOW_TYPE, BEGIN, ERROR);
     setDescription("Workflow for testing a state that has a long execution time");
diff --git a/nflow-tests/src/main/java/io/nflow/tests/demo/workflow/StateWorkflow.java b/nflow-tests/src/main/java/io/nflow/tests/demo/workflow/StateWorkflow.java
index 44cf85e9d..82efb84bf 100644
--- a/nflow-tests/src/main/java/io/nflow/tests/demo/workflow/StateWorkflow.java
+++ b/nflow-tests/src/main/java/io/nflow/tests/demo/workflow/StateWorkflow.java
@@ -30,6 +30,7 @@ public class StateWorkflow extends WorkflowDefinition {
   public static final WorkflowState STATE_4 = new State("state4", "Do nothing");
   public static final WorkflowState STATE_5 = new State("state5", "Update variable 2");
 
+  @SuppressWarnings("this-escape")
   public StateWorkflow() {
     super(STATE_WORKFLOW_TYPE, STATE_1, ERROR, new WorkflowSettings.Builder().setMinErrorTransitionDelay(ZERO)
         .setMaxErrorTransitionDelay(ZERO).setShortTransitionDelay(ZERO).setMaxRetries(3).build());
diff --git a/nflow-tests/src/main/java/io/nflow/tests/demo/workflow/StatisticsWorkflow.java b/nflow-tests/src/main/java/io/nflow/tests/demo/workflow/StatisticsWorkflow.java
new file mode 100644
index 000000000..1a2247c94
--- /dev/null
+++ b/nflow-tests/src/main/java/io/nflow/tests/demo/workflow/StatisticsWorkflow.java
@@ -0,0 +1,32 @@
+package io.nflow.tests.demo.workflow;
+
+import io.nflow.engine.workflow.definition.NextAction;
+import io.nflow.engine.workflow.definition.StateExecution;
+import io.nflow.engine.workflow.definition.WorkflowDefinition;
+import org.springframework.stereotype.Component;
+
+import static io.nflow.engine.workflow.definition.NextAction.moveToState;
+import static io.nflow.engine.workflow.definition.NextAction.stopInState;
+import static io.nflow.tests.demo.workflow.TestState.*;
+
+@Component
+public class StatisticsWorkflow extends WorkflowDefinition {
+
+    public static final String STATISTICS_WORKFLOW_TYPE = "statistics";
+
+    @SuppressWarnings("this-escape")
+    public StatisticsWorkflow() {
+      super(STATISTICS_WORKFLOW_TYPE, BEGIN, ERROR);
+      setDescription("Statistics workflow: start -> process -> end");
+      permit(BEGIN, PROCESS);
+      permit(PROCESS, DONE);
+    }
+
+    public NextAction begin(@SuppressWarnings("unused") StateExecution execution) {
+      return moveToState(PROCESS, "Go to process state");
+    }
+
+    public NextAction process(@SuppressWarnings("unused") StateExecution execution) {
+      return stopInState(DONE, "Go to done state");
+    }
+  }
diff --git a/nflow-tests/src/main/java/io/nflow/tests/demo/workflow/WithdrawLoanWorkflow.java b/nflow-tests/src/main/java/io/nflow/tests/demo/workflow/WithdrawLoanWorkflow.java
index bc9904d9c..34515186f 100644
--- a/nflow-tests/src/main/java/io/nflow/tests/demo/workflow/WithdrawLoanWorkflow.java
+++ b/nflow-tests/src/main/java/io/nflow/tests/demo/workflow/WithdrawLoanWorkflow.java
@@ -37,6 +37,7 @@ public class WithdrawLoanWorkflow extends WorkflowDefinition {
   private static final WorkflowState DONE = new State("done", end, "Credit application has been completed.");
 
   @Inject
+  @SuppressWarnings("this-escape")
   public WithdrawLoanWorkflow() {
     super("withdrawLoan", CREATE_LOAN, MANUAL_PROCESSING);
     setName("Withdraw loan");
diff --git a/nflow-tests/src/main/java/io/nflow/tests/demo/workflow/WordGeneratorErrorsWorkflow.java b/nflow-tests/src/main/java/io/nflow/tests/demo/workflow/WordGeneratorErrorsWorkflow.java
index 2fbaf0b92..1a1f0480e 100644
--- a/nflow-tests/src/main/java/io/nflow/tests/demo/workflow/WordGeneratorErrorsWorkflow.java
+++ b/nflow-tests/src/main/java/io/nflow/tests/demo/workflow/WordGeneratorErrorsWorkflow.java
@@ -20,6 +20,7 @@ public class WordGeneratorErrorsWorkflow extends WordGeneratorWorkflow {
       .setMinErrorTransitionDelay(millis(300)).setMaxErrorTransitionDelay(millis(1000)).setShortTransitionDelay(millis(200))
       .setMaxRetries(10).setHistoryDeletableAfter(days(2)).build();
 
+  @SuppressWarnings("this-escape")
   public WordGeneratorErrorsWorkflow() {
     super("wordGeneratorErrors", wordGeneratorErrorsWorkSettings);
     setDescription("Workflow for testing randomly failing states");
diff --git a/nflow-tests/src/main/java/io/nflow/tests/demo/workflow/WordGeneratorWorkflow.java b/nflow-tests/src/main/java/io/nflow/tests/demo/workflow/WordGeneratorWorkflow.java
index 1eb42a2e1..fc315594b 100644
--- a/nflow-tests/src/main/java/io/nflow/tests/demo/workflow/WordGeneratorWorkflow.java
+++ b/nflow-tests/src/main/java/io/nflow/tests/demo/workflow/WordGeneratorWorkflow.java
@@ -51,6 +51,7 @@ public WorkflowStateType getType() {
 
   private static final State[] STATE_VALUES = State.values();
 
+  @SuppressWarnings("this-escape")
   protected WordGeneratorWorkflow(String flowName, WorkflowSettings settings) {
     super(flowName, State.start, State.error, settings);
     setDescription("Generate random words");
diff --git a/nflow-tests/src/main/resources/nflow-remote-workflow.txt b/nflow-tests/src/main/resources/nflow-remote-workflow.txt
new file mode 100644
index 000000000..730d5fd9b
--- /dev/null
+++ b/nflow-tests/src/main/resources/nflow-remote-workflow.txt
@@ -0,0 +1 @@
+io.nflow.tests.demo.workflow.RemoteWorkflow
\ No newline at end of file
diff --git a/nflow-tests/src/test/java/io/nflow/tests/AbruptExecutorRecoveryTest.java b/nflow-tests/src/test/java/io/nflow/tests/AbruptExecutorRecoveryTest.java
index 3db21ae03..a41023d51 100644
--- a/nflow-tests/src/test/java/io/nflow/tests/AbruptExecutorRecoveryTest.java
+++ b/nflow-tests/src/test/java/io/nflow/tests/AbruptExecutorRecoveryTest.java
@@ -13,7 +13,7 @@ public class AbruptExecutorRecoveryTest extends AbstractExecutorRecoveryTest {
   public static NflowServerConfig server = new NflowServerConfig.Builder()
       .prop("nflow.executor.timeout.seconds", 1)
       .prop("nflow.executor.keepalive.seconds", 5)
-      .prop("nflow.dispatcher.await.termination.seconds", 1)
+      .prop("nflow.dispatcher.await.termination.seconds", 3)
       .prop("nflow.db.h2.url", "jdbc:h2:mem:abruptexecutorrecoverytest;TRACE_LEVEL_FILE=4;DB_CLOSE_DELAY=-1")
       .build();
 
diff --git a/nflow-tests/src/test/java/io/nflow/tests/CodelessEngineTest.java b/nflow-tests/src/test/java/io/nflow/tests/CodelessEngineTest.java
index da0c5236b..83ebba8f3 100644
--- a/nflow-tests/src/test/java/io/nflow/tests/CodelessEngineTest.java
+++ b/nflow-tests/src/test/java/io/nflow/tests/CodelessEngineTest.java
@@ -15,8 +15,8 @@
 import java.util.Map;
 import java.util.concurrent.atomic.AtomicReference;
 
-import static io.nflow.tests.demo.workflow.Demo2Workflow.DEMO2_WORKFLOW_TYPE;
-import static io.nflow.tests.demo.workflow.TestState.DONE;
+import static io.nflow.tests.demo.workflow.RemoteWorkflow.REMOTE_WORKFLOW_TYPE;
+import static io.nflow.tests.demo.workflow.TestState.*;
 import static java.time.Duration.ofSeconds;
 import static java.util.Collections.singletonMap;
 import static java.util.concurrent.TimeUnit.SECONDS;
@@ -58,14 +58,17 @@ public Demo2Workflow demo2Workflow() {
   @Order(1)
   public void codelessServerHasNoWorkflowsDefinitions() {
     ListWorkflowDefinitionResponse[] definitions = getWorkflowDefinitions();
-    assertWorkflowDefinitionExists(DEMO2_WORKFLOW_TYPE, definitions, false);
+    assertWorkflowDefinitionExists(REMOTE_WORKFLOW_TYPE, definitions, false);
   }
 
   @Test
   @Order(2)
   public void startCodeServer() throws Exception {
     server.setSpringContextClass(CodeConfiguration.class);
-    codeServer.set(server.anotherServer(Map.of("nflow.autoinit", "true", "nflow.autostart", "true")));
+    codeServer.set(server.anotherServer(Map.of(
+            "nflow.autoinit", "true",
+            "nflow.autostart", "true",
+            "nflow.non_spring_workflows_filename", "nflow-remote-workflow.txt")));
     codeServer.get().before(getClass().getSimpleName());
   }
 
@@ -74,14 +77,14 @@ public void startCodeServer() throws Exception {
   public void codelessServerSeesTheDefinition() throws Exception {
     SECONDS.sleep(1);
     ListWorkflowDefinitionResponse[] definitions = getWorkflowDefinitions();
-    assertWorkflowDefinitionExists(DEMO2_WORKFLOW_TYPE, definitions, true);
+    assertWorkflowDefinitionExists(REMOTE_WORKFLOW_TYPE, definitions, true);
   }
 
   @Test
   @Order(4)
   public void codelessCanInsertWorkflow() {
     var req = new CreateWorkflowInstanceRequest();
-    req.type = DEMO2_WORKFLOW_TYPE;
+    req.type = REMOTE_WORKFLOW_TYPE;
     req.businessKey = "1";
     req.stateVariables = singletonMap("test", 1);
     resp = createWorkflowInstance(req);
diff --git a/nflow-tests/src/test/java/io/nflow/tests/DemoWorkflowTest.java b/nflow-tests/src/test/java/io/nflow/tests/DemoWorkflowTest.java
index aa1b243be..8d439c0c4 100644
--- a/nflow-tests/src/test/java/io/nflow/tests/DemoWorkflowTest.java
+++ b/nflow-tests/src/test/java/io/nflow/tests/DemoWorkflowTest.java
@@ -19,6 +19,7 @@
 
 import jakarta.ws.rs.core.Response;
 
+import org.joda.time.DateTime;
 import org.junit.jupiter.api.MethodOrderer;
 import org.junit.jupiter.api.Order;
 import org.junit.jupiter.api.Test;
@@ -100,6 +101,7 @@ public void queryWorkflowWithActionsReturnsEmptyActions() {
     CreateWorkflowInstanceRequest req = new CreateWorkflowInstanceRequest();
     req.type = DEMO_WORKFLOW_TYPE;
     req.businessKey = "2";
+    req.activationTime = DateTime.now().plusSeconds(5);
     resp = createWorkflowInstance(req);
 
     ListWorkflowInstanceResponse instance = getWorkflowInstance(resp.id);
diff --git a/nflow-tests/src/test/java/io/nflow/tests/StatisticsTest.java b/nflow-tests/src/test/java/io/nflow/tests/StatisticsTest.java
index 5d3054132..f5e3c7d4c 100644
--- a/nflow-tests/src/test/java/io/nflow/tests/StatisticsTest.java
+++ b/nflow-tests/src/test/java/io/nflow/tests/StatisticsTest.java
@@ -1,6 +1,6 @@
 package io.nflow.tests;
 
-import static io.nflow.tests.demo.workflow.DemoWorkflow.DEMO_WORKFLOW_TYPE;
+import static io.nflow.tests.demo.workflow.StatisticsWorkflow.STATISTICS_WORKFLOW_TYPE;
 import static java.util.Collections.singletonMap;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.is;
@@ -8,6 +8,7 @@
 import static org.joda.time.DateTime.now;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
+import io.nflow.tests.demo.workflow.StatisticsWorkflow;
 import org.joda.time.DateTime;
 import org.junit.jupiter.api.MethodOrderer;
 import org.junit.jupiter.api.Order;
@@ -20,15 +21,15 @@
 import io.nflow.rest.v1.msg.UpdateWorkflowInstanceRequest;
 import io.nflow.rest.v1.msg.WorkflowDefinitionStatisticsResponse;
 import io.nflow.rest.v1.msg.WorkflowDefinitionStatisticsResponse.StateStatistics;
-import io.nflow.tests.DemoWorkflowTest.DemoConfiguration;
 import io.nflow.tests.extension.NflowServerConfig;
+import org.springframework.context.annotation.ComponentScan;
 
 @TestMethodOrder(MethodOrderer.OrderAnnotation.class)
 public class StatisticsTest extends AbstractNflowTest {
 
   static DateTime FUTURE = now().plusYears(1);
 
-  public static NflowServerConfig server = new NflowServerConfig.Builder().springContextClass(DemoConfiguration.class)
+  public static NflowServerConfig server = new NflowServerConfig.Builder().springContextClass(StatisticsTestConfiguration.class)
     .prop("nflow.executor.timeout.seconds", 1)
     .prop("nflow.executor.keepalive.seconds", 5)
     .prop("nflow.dispatcher.await.termination.seconds", 1)
@@ -36,6 +37,11 @@ public class StatisticsTest extends AbstractNflowTest {
     .prop("nflow.db.h2.url", "jdbc:h2:mem:statisticstest;TRACE_LEVEL_FILE=4;DB_CLOSE_DELAY=-1")
     .build();
 
+  @ComponentScan(basePackageClasses = StatisticsWorkflow.class)
+  static class StatisticsTestConfiguration {
+    // for component scanning only
+  }
+
   private static CreateWorkflowInstanceResponse resp;
 
   public StatisticsTest() {
@@ -46,7 +52,7 @@ public StatisticsTest() {
   @Order(1)
   public void submitWorkflow() {
     CreateWorkflowInstanceRequest req = new CreateWorkflowInstanceRequest();
-    req.type = DEMO_WORKFLOW_TYPE;
+    req.type = STATISTICS_WORKFLOW_TYPE;
     req.businessKey = "1";
     req.activationTime = FUTURE;
     resp = createWorkflowInstance(req);
@@ -64,7 +70,7 @@ public void queryStatistics() {
   @Test
   @Order(3)
   public void queryDefinitionStatistics() {
-    WorkflowDefinitionStatisticsResponse statistics = getDefinitionStatistics(DEMO_WORKFLOW_TYPE);
+    WorkflowDefinitionStatisticsResponse statistics = getDefinitionStatistics(STATISTICS_WORKFLOW_TYPE);
     assertThat(statistics.stateStatistics, is(notNullValue()));
     StateStatistics stats = statistics.stateStatistics.get("begin");
     assertThat(stats.created.allInstances, is(1L));
@@ -105,7 +111,7 @@ public void queryStatistics_again() {
   @Test
   @Order(8)
   public void queryDefinitionStatistics_again() {
-    WorkflowDefinitionStatisticsResponse statistics = getDefinitionStatistics(DEMO_WORKFLOW_TYPE);
+    WorkflowDefinitionStatisticsResponse statistics = getDefinitionStatistics(STATISTICS_WORKFLOW_TYPE);
     assertThat(statistics.stateStatistics, is(notNullValue()));
     StateStatistics stats = statistics.stateStatistics.get("begin");
     assertThat(stats.created.allInstances, is(1L));
diff --git a/pom.xml b/pom.xml
index 2d76ec06b..90be456ff 100644
--- a/pom.xml
+++ b/pom.xml
@@ -112,80 +112,80 @@
     <jdk.version>17</jdk.version>
     <jacocoArgLine></jacocoArgLine>
     <surefire.forkcount>1C</surefire.forkcount>
-    <apache.cxf.version>4.0.2</apache.cxf.version>
-    <build-helper.version>3.4.0</build-helper.version>
-    <commons.lang.version>2.6</commons.lang.version>
-    <commons.lang3.version>3.13.0</commons.lang3.version>
+    <asm.version>9.7</asm.version>
+    <apache.cxf.version>4.0.4</apache.cxf.version>
+    <build-helper.version>3.5.0</build-helper.version>
+    <commons.lang3.version>3.14.0</commons.lang3.version>
     <core-utils.version>1.4</core-utils.version>
     <coveralls.version>4.3.0</coveralls.version>
-    <db2-jcc.version>11.5.8.0</db2-jcc.version>
+    <db2-jcc.version>11.5.9.0</db2-jcc.version>
     <el.version>4.0.2</el.version>
-    <frontend-maven.version>1.13.4</frontend-maven.version>
+    <frontend-maven.version>1.15.0</frontend-maven.version>
     <guice.version>7.0.0</guice.version>
-    <h2.version>2.2.220</h2.version>
+    <h2.version>2.2.224</h2.version>
     <hamcrest.version>2.2</hamcrest.version>
     <hibernate.validator.version>8.0.1.Final</hibernate.validator.version>
-    <hikaricp.version>5.0.1</hikaricp.version>
-    <jackson.version>2.15.2</jackson.version>
-    <jackson-databind.version>2.15.2</jackson-databind.version>
-    <javassist.version>3.29.2-GA</javassist.version>
+    <hikaricp.version>5.1.0</hikaricp.version>
+    <jackson.version>2.17.0</jackson.version>
+    <jackson-databind.version>2.17.0</jackson-databind.version>
+    <javassist.version>3.30.2-GA</javassist.version>
     <jakarta.annotation-api.version>2.1.1</jakarta.annotation-api.version>
     <jakarta.servlet-api.version>6.0.0</jakarta.servlet-api.version>
     <jakarta.inject-api.version>2.0.1</jakarta.inject-api.version>
     <jakarta.ws.rs.version>3.1.0</jakarta.ws.rs.version>
-    <jakarta.xml.bind-api.version>4.0.0</jakarta.xml.bind-api.version>
-    <jaxws-api.version>4.0.0</jaxws-api.version>
+    <jakarta.xml.bind-api.version>4.0.2</jakarta.xml.bind-api.version>
+    <jaxws-api.version>4.0.1</jaxws-api.version>
     <jersey.version>3.1.3</jersey.version>
-    <jetty.version>11.0.15</jetty.version>
-    <jodatime.version>2.12.5</jodatime.version>
+    <jetty.version>11.0.20</jetty.version>
+    <jodatime.version>2.12.7</jodatime.version>
     <junit5.version>5.10.0</junit5.version>
-    <junit-platform.version>1.10.0</junit-platform.version>
-    <logback-classic.version>1.4.11</logback-classic.version>
-    <mariadb.version>3.1.4</mariadb.version>
-    <maven-assembly.version>3.6.0</maven-assembly.version>
-    <maven-clean.version>3.3.1</maven-clean.version>
-    <maven-compiler.version>3.11.0</maven-compiler.version>
+    <junit-platform.version>1.10.2</junit-platform.version>
+    <logback-classic.version>1.5.3</logback-classic.version>
+    <mariadb.version>3.3.3</mariadb.version>
+    <maven-assembly.version>3.7.1</maven-assembly.version>
+    <maven-clean.version>3.3.2</maven-clean.version>
+    <maven-compiler.version>3.13.0</maven-compiler.version>
     <maven-deploy.version>3.1.1</maven-deploy.version>
-    <maven-download.version>1.7.1</maven-download.version>
+    <maven-download.version>1.8.1</maven-download.version>
     <maven-eclipse.version>2.10</maven-eclipse.version>
-    <maven-enforcer.version>3.3.0</maven-enforcer.version>
-    <maven-gpg.version>3.1.0</maven-gpg.version>
+    <maven-enforcer.version>3.4.1</maven-enforcer.version>
+    <maven-gpg.version>3.2.2</maven-gpg.version>
     <maven-install.version>3.1.1</maven-install.version>
-    <maven-jacoco.version>0.8.10</maven-jacoco.version>
+    <maven-jacoco.version>0.8.12</maven-jacoco.version>
     <maven-jar.version>3.3.0</maven-jar.version>
-    <maven-javadoc.version>3.5.0</maven-javadoc.version>
-    <maven-jxr.version>3.3.0</maven-jxr.version>
-    <maven-pmd.version>3.21.0</maven-pmd.version>
-    <maven-project-info.version>3.4.5</maven-project-info.version>
+    <maven-javadoc.version>3.6.3</maven-javadoc.version>
+    <maven-jxr.version>3.3.2</maven-jxr.version>
+    <maven-pmd.version>3.21.2</maven-pmd.version>
+    <maven-project-info.version>3.5.0</maven-project-info.version>
     <maven-release.version>3.0.1</maven-release.version>
     <maven-resources.version>3.3.1</maven-resources.version>
-    <maven-shade.version>3.5.0</maven-shade.version>
-    <maven-site.version>4.0.0-M9</maven-site.version>
-    <maven-source.version>3.3.0</maven-source.version>
-    <maven-surefire.version>3.1.2</maven-surefire.version>
-    <metrics.version>4.2.19</metrics.version>
-    <mockito.version>5.4.0</mockito.version>
-    <mssql.version>12.4.0.jre11</mssql.version>
-    <mysql.version>8.1.0</mysql.version>
+    <maven-shade.version>3.5.2</maven-shade.version>
+    <maven-site.version>4.0.0-M13</maven-site.version>
+    <maven-source.version>3.3.1</maven-source.version>
+    <maven-surefire.version>3.2.5</maven-surefire.version>
+    <metrics.version>4.2.25</metrics.version>
+    <mockito.version>5.11.0</mockito.version>
+    <mssql.version>12.6.1.jre11</mssql.version>
+    <mysql.version>8.3.0</mysql.version>
     <nexus-staging-maven.version>1.6.13</nexus-staging-maven.version>
-    <node.version>v18.12.1</node.version> <!-- https://nodejs.org/en/download/releases/ -->
-    <npm.version>8.19.2</npm.version>     <!-- https://github.com/npm/cli/releases -->
+    <node.version>v20.12.1</node.version> <!-- https://nodejs.org/en/download/releases/ -->
+    <npm.version>10.5.0</npm.version>     <!-- https://github.com/npm/cli/releases -->
     <nitor-matchers.version>1.3</nitor-matchers.version>
     <ojdbc.version>23.2.0.0</ojdbc.version>
-    <postgresql.version>42.6.0</postgresql.version>
+    <postgresql.version>42.7.3</postgresql.version>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-    <reactor.core.version>3.5.9</reactor.core.version>
-    <reactor.netty.version>1.1.10</reactor.netty.version>
+    <reactor.core.version>3.6.4</reactor.core.version>
+    <reactor.netty.version>1.1.17</reactor.netty.version>
     <reflections.version>0.10.2</reflections.version>
-    <slf4j.version>2.0.7</slf4j.version>
-    <spotbugs.version>4.7.3</spotbugs.version>
-    <spotbugs-contrib.version>7.4.6</spotbugs-contrib.version>
-    <spotbugs-maven-plugin.version>4.7.3.5</spotbugs-maven-plugin.version>
+    <slf4j.version>2.0.12</slf4j.version>
+    <spotbugs.version>4.8.3</spotbugs.version>
+    <spotbugs-contrib.version>7.6.4</spotbugs-contrib.version>
+    <spotbugs-maven-plugin.version>4.8.3.1</spotbugs-maven-plugin.version>
     <spring.version>6.0.11</spring.version>
-    <swagger.version>2.2.15</swagger.version>
+    <swagger.version>2.2.21</swagger.version>
     <validation.api.version>3.0.2</validation.api.version>
-    <versions-maven-plugin.version>2.16.0</versions-maven-plugin.version>
+    <versions-maven-plugin.version>2.16.2</versions-maven-plugin.version>
   </properties>
   <build>
     <pluginManagement>
@@ -221,6 +221,8 @@
             <perCoreThreadCount>true</perCoreThreadCount>
             <threadCount>1</threadCount>
             <forkCount>${surefire.forkcount}</forkCount>
+            <!-- workaround for buggy cxf implementation on top of the "new" java async http client -->
+            <argLine>-Dorg.apache.cxf.transport.http.forceURLConnection=true</argLine>
           </configuration>
         </plugin>
         <plugin>
@@ -314,6 +316,31 @@
               <artifactId>spotbugs</artifactId>
               <version>${spotbugs.version}</version>
             </dependency>
+            <dependency>
+              <groupId>org.ow2.asm</groupId>
+              <artifactId>asm</artifactId>
+              <version>${asm.version}</version>
+            </dependency>
+            <dependency>
+              <groupId>org.ow2.asm</groupId>
+              <artifactId>asm-analysis</artifactId>
+              <version>${asm.version}</version>
+            </dependency>
+            <dependency>
+              <groupId>org.ow2.asm</groupId>
+              <artifactId>asm-commons</artifactId>
+              <version>${asm.version}</version>
+            </dependency>
+            <dependency>
+              <groupId>org.ow2.asm</groupId>
+              <artifactId>asm-tree</artifactId>
+              <version>${asm.version}</version>
+            </dependency>
+            <dependency>
+              <groupId>org.ow2.asm</groupId>
+              <artifactId>asm-util</artifactId>
+              <version>${asm.version}</version>
+            </dependency>
           </dependencies>
           <configuration>
             <xmlOutput>true</xmlOutput>
@@ -388,10 +415,11 @@
                 <bannedDependencies>
                   <excludes>
                     <exclude>commons-logging:commons-logging</exclude>
+                    <exclude>commons-lang:commons-lang</exclude>
                   </excludes>
                 </bannedDependencies>
                 <requireMavenVersion>
-                  <version>3.8</version>
+                  <version>3.8.8</version>
                 </requireMavenVersion>
                 <requireJavaVersion>
                   <version>${jdk.version}</version>
@@ -408,9 +436,10 @@
           <links>
             <link>https://docs.spring.io/spring/docs/${spring.version}/javadoc-api/</link>
           </links>
-          <excludePackageNames>io.nflow.engine.internal</excludePackageNames>
+          <excludePackageNames>io.nflow.engine.internal.storage.db,io.nflow.engine.internal.*</excludePackageNames>
           <quiet>true</quiet>
-          <failOnWarning>true</failOnWarning>
+          <failOnError>true</failOnError>
+          <failOnWarnings>false</failOnWarnings>
         </configuration>
         <executions>
           <execution>
@@ -508,14 +537,14 @@
             <artifactId>maven-enforcer-plugin</artifactId>
             <executions>
               <execution>
-                <id>require-java11</id>
+                <id>require-java17</id>
                 <goals>
                   <goal>enforce</goal>
                 </goals>
                 <configuration>
                   <rules>
                     <requireJavaVersion>
-                      <version>[11,)</version>
+                      <version>[17,)</version>
                     </requireJavaVersion>
                   </rules>
                 </configuration>
diff --git a/scripts/setup-db-db2.sh b/scripts/setup-db-db2.sh
index cb8893bca..c17cf2b9c 100755
--- a/scripts/setup-db-db2.sh
+++ b/scripts/setup-db-db2.sh
@@ -5,15 +5,16 @@ tool=$(command -v podman)
 [ -z "$tool" ] && echo "podman or docker required" && exit 1
 
 DB_VERSION=${DB_VERSION:-latest}
+# podman search --list-tags icr.io/db2_community/db2
 case $DB_VERSION in
   old)
-    DB_VERSION=11.5.0.0a
+    DB_VERSION=11.5.5.1
     ;;
   latest)
-    DB_VERSION=11.5.8.0
+    DB_VERSION=11.5.9.0
     ;;
 esac
 
-$tool run --pull=always --rm --name db2 --cap-add IPC_LOCK --cap-add IPC_OWNER -e PERSISTENT_HOME=false -e DB2INST1_PASSWORD=nflow -e LICENSE=accept -e DBNAME=nflow -e ARCHIVE_LOGS=false --publish 50000:50000 --detach ibmcom/db2:$DB_VERSION
+$tool run --pull=always --rm --name db2 --cap-add IPC_LOCK --cap-add IPC_OWNER -e PERSISTENT_HOME=false -e DB2INST1_PASSWORD=nflow -e LICENSE=accept -e DBNAME=nflow -e ARCHIVE_LOGS=false --publish 50000:50000 --detach icr.io/db2_community/db2:$DB_VERSION
 
-fgrep -m1 'Setup has completed' <(timeout 240 $tool logs -f db2)
+grep -F -m1 'Setup has completed' <(timeout 240 $tool logs -f db2)
diff --git a/scripts/setup-db-mariadb.sh b/scripts/setup-db-mariadb.sh
index f792a58b4..21b28490e 100755
--- a/scripts/setup-db-mariadb.sh
+++ b/scripts/setup-db-mariadb.sh
@@ -7,13 +7,13 @@ tool=$(command -v podman)
 DB_VERSION=${DB_VERSION:-latest}
 case $DB_VERSION in
   old)
-    DB_VERSION=10.3 # supported until may/2023
+    DB_VERSION=10.4 # supported until Jun/2024
     ;;
   latest)
-    DB_VERSION=10.10
+    DB_VERSION=11.3.2
     ;;
 esac
 
-$tool run --pull=always --rm --name mariadb -e MYSQL_RANDOM_ROOT_PASSWORD=yes -e MYSQL_DATABASE=nflow -e MYSQL_USER=nflow -e MYSQL_PASSWORD=nflow --publish 3306:3306 --detach mariadb:$DB_VERSION --character-set-server=utf8mb4 --collation-server=utf8mb4_unicode_ci --sync-binlog=0 --innodb-flush-log-at-trx-commit=2
+$tool run --pull=always --rm --name mariadb -e MYSQL_RANDOM_ROOT_PASSWORD=yes -e MYSQL_DATABASE=nflow -e MYSQL_USER=nflow -e MYSQL_PASSWORD=nflow --publish 3306:3306 --detach docker.io/library/mariadb:$DB_VERSION --character-set-server=utf8mb4 --collation-server=utf8mb4_unicode_ci --sync-binlog=0 --innodb-flush-log-at-trx-commit=2
 
-fgrep -m1 'ready for connections' <(timeout 240 $tool logs -f mariadb 2>&1)
+grep -F -m1 'ready for connections' <(timeout 240 $tool logs -f mariadb 2>&1)
diff --git a/scripts/setup-db-mysql.sh b/scripts/setup-db-mysql.sh
index e730d12b8..4a839b48e 100755
--- a/scripts/setup-db-mysql.sh
+++ b/scripts/setup-db-mysql.sh
@@ -7,13 +7,13 @@ tool=$(command -v podman)
 DB_VERSION=${DB_VERSION:-latest}
 case $DB_VERSION in
   old)
-    DB_VERSION=5.7 # supported until oct/2023
+    DB_VERSION=8.0 # supported until Apr/2026
     ;;
   latest)
-    DB_VERSION=8.0
+    DB_VERSION=8.3
     ;;
 esac
 
 $tool run --pull=always  --rm --name mysql -e MYSQL_RANDOM_ROOT_PASSWORD=yes -e MYSQL_DATABASE=nflow -e MYSQL_USER=nflow -e MYSQL_PASSWORD=nflow --publish 3306:3306 --detach mysql:$DB_VERSION --character-set-server=utf8mb4 --collation-server=utf8mb4_unicode_ci --sync-binlog=0 --innodb-flush-log-at-trx-commit=2
 
-fgrep -m1 'ready for connections' <(timeout 240 $tool logs -f mysql 2>&1)
+grep -F -m1 'ready for connections' <(timeout 240 $tool logs -f mysql 2>&1)
diff --git a/scripts/setup-db-oracle.sh b/scripts/setup-db-oracle.sh
index 6c0689cd6..2c636d62f 100755
--- a/scripts/setup-db-oracle.sh
+++ b/scripts/setup-db-oracle.sh
@@ -7,23 +7,14 @@ tool=$(command -v podman)
 DB_VERSION=${DB_VERSION:-latest}
 case $DB_VERSION in
   old)
-#    DB_VERSION=18.4.0-xe
+    IMAGE=docker.io/gvenzl/oracle-xe
     DB_VERSION=18-slim
     ;;
   latest)
-#    DB_VERSION=21.3.0-xe
-    DB_VERSION=21-slim
+    IMAGE=docker.io/gvenzl/oracle-free
+    DB_VERSION=23.3-slim
     ;;
 esac
 
-#$tool run --pull=always --rm --name oracle --publish 1521:1521 -e ORACLE_PWD=nflow --detach container-registry.oracle.com/database/express:$DB_VERSION
-#$tool cp oracle:/opt/oracle/product/21c/dbhomeXE/jdbc/lib/ojdbc11.jar ojdbc11.jar
-
-#fgrep -m1 'DATABASE IS READY' <(timeout 240 $tool logs -f oracle)
-
-# create user nflow identified by nflow;
-# grant CONNECT, CREATE SESSION, ALTER SESSION, CREATE MATERIALIZED VIEW, CREATE PROCEDURE, CREATE PUBLIC SYNONYM, CREATE ROLE, CREATE SEQUENCE, CREATE SYNONYM, CREATE TABLE, CREATE TRIGGER, CREATE TYPE, CREATE VIEW, UNLIMITED TABLESPACE to nflow;
-
-
-$tool run --pull=always --rm --name oracle --publish 1521:1521 -e ORACLE_PASSWORD=nflow -e APP_USER=nflow -e APP_USER_PASSWORD=nflow --detach gvenzl/oracle-xe:$DB_VERSION
-fgrep -m1 'DATABASE IS READY' <(timeout 240 $tool logs -f oracle)
+$tool run --pull=always --rm --name oracle --publish 1521:1521 -e ORACLE_DATABASE=nflow -e ORACLE_PASSWORD=nflow -e APP_USER=nflow -e APP_USER_PASSWORD=nflow --detach $IMAGE:$DB_VERSION
+grep -F -m1 'DATABASE IS READY' <(timeout 240 $tool logs -f oracle)
diff --git a/scripts/setup-db-postgresql.sh b/scripts/setup-db-postgresql.sh
index 722df8e1f..057b3fdef 100755
--- a/scripts/setup-db-postgresql.sh
+++ b/scripts/setup-db-postgresql.sh
@@ -7,13 +7,13 @@ tool=$(command -v podman)
 DB_VERSION=${DB_VERSION:-latest}
 case $DB_VERSION in
   old)
-    DB_VERSION=11 # supported until nov/2023
+    DB_VERSION=12 # supported until Nov/2024
     ;;
   latest)
-    DB_VERSION=15
+    DB_VERSION=16
     ;;
 esac
 
-$tool run --pull=always  --rm --name postgres -e POSTGRES_DB=nflow -e POSTGRES_USER=nflow -e POSTGRES_PASSWORD=nflow --publish 5432:5432 --detach postgres:$DB_VERSION -c fsync=off -c full_page_writes=off
+$tool run --pull=always  --rm --name postgres -e POSTGRES_DB=nflow -e POSTGRES_USER=nflow -e POSTGRES_PASSWORD=nflow --publish 5432:5432 --detach docker.io/library/postgres:$DB_VERSION -c fsync=off -c full_page_writes=off
 
-fgrep -m1 'listening on IPv4' <(timeout 240 $tool logs -f postgres 2>&1)
+grep -F -m1 'listening on IPv4' <(timeout 240 $tool logs -f postgres 2>&1)
diff --git a/scripts/setup-db-sqlserver.sh b/scripts/setup-db-sqlserver.sh
index f527af4b5..6d6dc329d 100755
--- a/scripts/setup-db-sqlserver.sh
+++ b/scripts/setup-db-sqlserver.sh
@@ -16,7 +16,7 @@ esac
 
 $tool run --pull=always  --rm --name mssql -e 'ACCEPT_EULA=Y' -e 'MSSQL_SA_PASSWORD=passWord1%' --publish 1433:1433 --detach mcr.microsoft.com/mssql/server:$DB_VERSION
 
-fgrep -m1 'Recovery is complete' <(timeout 240 $tool logs -f mssql 2>&1)
+grep -F -m1 'Recovery is complete' <(timeout 240 $tool logs -f mssql 2>&1)
 
 sqlcmd="$tool exec -t mssql /opt/mssql-tools/bin/sqlcmd -S localhost -U sa -P passWord1% -e -x"
 $sqlcmd -Q "create database nflow"