diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 9192a7cd..b8e47116 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -1 +1 @@
-* @tsurdilo @manick02 @ricardozanini
\ No newline at end of file
+* @fjtirado @ricardozanini
\ No newline at end of file
diff --git a/.github/OWNERS b/.github/OWNERS
index 04e2113e..0db9cb96 100644
--- a/.github/OWNERS
+++ b/.github/OWNERS
@@ -1,10 +1,8 @@
 reviewers:
-  - tsurdilo
-  - manick02
   - ricardozanini
+  - fjtirado
 approvers:
-  - tsurdilo
-  - manick02
   - ricardozanini
+  - fjtirado
 labels:
   - sig/contributor-experience
\ No newline at end of file
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index 06541a8b..cceba24a 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -11,4 +11,4 @@ updates:
       interval: "weekly"
     assignees:
       - ricardozanini
-      - tsurdilo
+      - fjtirado
diff --git a/.github/project.yml b/.github/project.yml
index 96953fd8..a1073663 100644
--- a/.github/project.yml
+++ b/.github/project.yml
@@ -1,3 +1,3 @@
 release:
-  current-version: 5.0.0.Final
-  next-version: 7.0.0-SNAPSHOT
+  current-version: 5.2.0.Final
+  next-version: 5.3.0-SNAPSHOT
diff --git a/.github/workflows/maven-verify.yml b/.github/workflows/maven-verify.yml
index 1b7d432c..4311cd74 100644
--- a/.github/workflows/maven-verify.yml
+++ b/.github/workflows/maven-verify.yml
@@ -6,21 +6,21 @@ name: sdk-java Verify
 on:
   push:
     branches:
-      - main
+      - 5.*
   pull_request:
     branches:
-      - main
+      - 5.*
 jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
 
-      - name: Set up JDK 11
-        uses: actions/setup-java@v3
+      - name: Set up JDK 17
+        uses: actions/setup-java@v4
         with:
           distribution: temurin
-          java-version: 11
+          java-version: 17
           cache: 'maven'
 
       - name: Verify with Maven
diff --git a/.github/workflows/pre-release.yml b/.github/workflows/pre-release.yml
index ce904c75..44f54117 100644
--- a/.github/workflows/pre-release.yml
+++ b/.github/workflows/pre-release.yml
@@ -11,7 +11,7 @@ jobs:
     name: pre release
 
     steps:
-      - uses: radcortez/project-metadata-action@master
+      - uses: radcortez/project-metadata-action@main
         name: retrieve project metadata
         id: metadata
         with:
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index ef4ee698..2e4ec8ce 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -10,7 +10,7 @@ jobs:
   release:
     runs-on: ubuntu-latest
     name: release
-    if: ${{github.event.pull_request.merged == true}}
+    if: ${{ github.event.pull_request.merged == true }}
 
     steps:
       - uses: radcortez/project-metadata-action@main
@@ -20,7 +20,7 @@ jobs:
           github-token: ${{secrets.GITHUB_TOKEN}}
           metadata-file-path: '.github/project.yml'
 
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Import GPG key
         id: import_gpg
@@ -29,11 +29,11 @@ jobs:
           gpg_private_key: ${{ secrets.GPG_PRIVATE_KEY }}
           passphrase: ${{ secrets.GPG_PASSPHRASE }}
 
-      - name: Set up JDK 11
-        uses: actions/setup-java@v3
+      - name: Set up JDK 17
+        uses: actions/setup-java@v4
         with:
           distribution: temurin
-          java-version: 11
+          java-version: 17
           cache: 'maven'
           server-id: ossrh
           server-username: MAVEN_USERNAME
@@ -51,7 +51,7 @@ jobs:
           cat release.properties
           git checkout ${{github.base_ref}}
           git rebase release
-          mvn -B release:perform -Darguments=-DperformRelease -DperformRelease -Prelease
+          mvn -B release:perform -Prelease -Darguments="-DperformRelease"
         env:
           MAVEN_USERNAME: ${{ secrets.OSSRH_USERNAME }}
           MAVEN_PASSWORD: ${{ secrets.OSSRH_PASSWORD }}
diff --git a/README.md b/README.md
index 5ac8f45f..b1ecec85 100644
--- a/README.md
+++ b/README.md
@@ -20,7 +20,7 @@ to parse and validate workflow definitions as well as generate the workflow diag
 
 | Latest Releases | Conformance to spec version |
 | :---: | :---: |
-| [5.0.0.Final](https://github.com/serverlessworkflow/sdk-java/releases/tag/5.0.0.Final) | [v0.8](https://github.com/serverlessworkflow/specification/tree/0.8.x) |
+| [5.1.0.Final](https://github.com/serverlessworkflow/sdk-java/releases/tag/5.1.0.Final) | [v0.8](https://github.com/serverlessworkflow/specification/tree/0.8.x) |
 | [4.0.5.Final](https://github.com/serverlessworkflow/sdk-java/releases/tag/4.0.5.Final) | [v0.8](https://github.com/serverlessworkflow/specification/tree/0.8.x) |
 | [3.0.0.Final](https://github.com/serverlessworkflow/sdk-java/releases/tag/3.0.0.Final) | [v0.7](https://github.com/serverlessworkflow/specification/tree/0.7.x) |
 | [2.0.0.Final](https://github.com/serverlessworkflow/sdk-java/releases/tag/2.0.0.Final) | [v0.6](https://github.com/serverlessworkflow/specification/tree/0.6.x) |
@@ -29,9 +29,9 @@ to parse and validate workflow definitions as well as generate the workflow diag
 ### JDK Version
 
 | SDK Version | JDK Version |
-| :---: | :---: |
-| 5.0.0 and after | 11 |
-| 4.0.x and before | 8 | 
+| :---: |:-----------:|
+| 5.0.0 and after |     17      |
+| 4.0.x and before |      8      | 
 
 ### Getting Started
 
@@ -75,31 +75,31 @@ b) Add the following dependencies to your pom.xml `dependencies` section:
 <dependency>
     <groupId>io.serverlessworkflow</groupId>
     <artifactId>serverlessworkflow-api</artifactId>
-    <version>5.0.0-SNAPSHOT</version>
+    <version>5.1.0.Final</version>
 </dependency>
 
 <dependency>
     <groupId>io.serverlessworkflow</groupId>
     <artifactId>serverlessworkflow-spi</artifactId>
-    <version>5.0.0-SNAPSHOT</version>
+    <version>5.1.0.Final</version>
 </dependency>
 
 <dependency>
     <groupId>io.serverlessworkflow</groupId>
     <artifactId>serverlessworkflow-validation</artifactId>
-    <version>5.0.0-SNAPSHOT</version>
+    <version>5.1.0.Final</version>
 </dependency>
 
 <dependency>
     <groupId>io.serverlessworkflow</groupId>
     <artifactId>serverlessworkflow-diagram</artifactId>
-    <version>5.0.0-SNAPSHOT</version>
+    <version>5.1.0.Final</version>
 </dependency>
 
 <dependency>
     <groupId>io.serverlessworkflow</groupId>
     <artifactId>serverlessworkflow-util</artifactId>
-    <version>5.0.0-SNAPSHOT</version>
+    <version>5.1.0.Final</version>
 </dependency>
 ```
 
@@ -114,11 +114,11 @@ maven { url "https://oss.sonatype.org/content/repositories/snapshots" }
 b) Add the following dependencies to your build.gradle `dependencies` section:
 
 ```text
-implementation("io.serverlessworkflow:serverlessworkflow-api:5.0.0-SNAPSHOT")
-implementation("io.serverlessworkflow:serverlessworkflow-spi:5.0.0-SNAPSHOT")
-implementation("io.serverlessworkflow:serverlessworkflow-validation:5.0.0-SNAPSHOT")
-implementation("io.serverlessworkflow:serverlessworkflow-diagram:5.0.0-SNAPSHOT")
-implementation("io.serverlessworkflow:serverlessworkflow-util:5.0.0-SNAPSHOT")
+implementation("io.serverlessworkflow:serverlessworkflow-api:5.1.0.Final")
+implementation("io.serverlessworkflow:serverlessworkflow-spi:5.1.0.Final")
+implementation("io.serverlessworkflow:serverlessworkflow-validation:5.1.0.Final")
+implementation("io.serverlessworkflow:serverlessworkflow-diagram:5.1.0.Final")
+implementation("io.serverlessworkflow:serverlessworkflow-util:5.1.0.Final")
 ```
 
 ### How to Use 
diff --git a/api/pom.xml b/api/pom.xml
index 78c9aada..ccaadb0c 100644
--- a/api/pom.xml
+++ b/api/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>io.serverlessworkflow</groupId>
         <artifactId>serverlessworkflow-parent</artifactId>
-        <version>5.0.0.Final</version>
+        <version>5.3.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>serverlessworkflow-api</artifactId>
diff --git a/api/src/main/java/io/serverlessworkflow/api/mapper/BaseObjectMapper.java b/api/src/main/java/io/serverlessworkflow/api/mapper/BaseObjectMapper.java
index 2f71947d..c47f4c2c 100644
--- a/api/src/main/java/io/serverlessworkflow/api/mapper/BaseObjectMapper.java
+++ b/api/src/main/java/io/serverlessworkflow/api/mapper/BaseObjectMapper.java
@@ -24,7 +24,7 @@
 
 public class BaseObjectMapper extends ObjectMapper {
 
-  private WorkflowModule workflowModule;
+  private final WorkflowModule workflowModule;
 
   public BaseObjectMapper(JsonFactory factory, WorkflowPropertySource workflowPropertySource) {
     super(factory);
@@ -33,7 +33,7 @@ public BaseObjectMapper(JsonFactory factory, WorkflowPropertySource workflowProp
 
     configure(SerializationFeature.INDENT_OUTPUT, true);
     registerModule(workflowModule);
-    configure(SerializationFeature.WRITE_EMPTY_JSON_ARRAYS, false);
+    setSerializationInclusion(JsonInclude.Include.NON_EMPTY);
     configOverride(Map.class)
         .setInclude(
             JsonInclude.Value.construct(
diff --git a/api/src/main/resources/schema/events/eventref.json b/api/src/main/resources/schema/events/eventref.json
index 76334993..c0e04a7a 100644
--- a/api/src/main/resources/schema/events/eventref.json
+++ b/api/src/main/resources/schema/events/eventref.json
@@ -16,7 +16,8 @@
       "description": "Maximum amount of time (ISO 8601 format) to wait for the result event. If not defined it should default to the actionExecutionTimeout"
     },
     "data": {
-      "type": "string",
+      "type": "object",
+      "existingJavaType": "com.fasterxml.jackson.databind.JsonNode",
       "description": "Expression which selects parts of the states data output to become the data of the produced event."
     },
     "contextAttributes": {
diff --git a/api/src/main/resources/schema/produce/produceevent.json b/api/src/main/resources/schema/produce/produceevent.json
index f094824e..37c3a7bb 100644
--- a/api/src/main/resources/schema/produce/produceevent.json
+++ b/api/src/main/resources/schema/produce/produceevent.json
@@ -8,7 +8,8 @@
       "minLength": 1
     },
     "data": {
-      "type": "string",
+      "type": "object",
+      "existingJavaType": "com.fasterxml.jackson.databind.JsonNode",
       "description": "Workflow expression which selects parts of the states data output to become the data of the produced event"
     },
     "contextAttributes": {
@@ -20,4 +21,4 @@
   "required": [
     "eventRef"
   ]
-}
\ No newline at end of file
+}
diff --git a/diagram-rest/pom.xml b/diagram-rest/pom.xml
index cbaafe2b..9beb9d68 100644
--- a/diagram-rest/pom.xml
+++ b/diagram-rest/pom.xml
@@ -10,12 +10,12 @@
     </parent>
     <groupId>io.serverless</groupId>
     <artifactId>serverlessworkflow-diagram-rest</artifactId>
-    <version>5.0.0-SNAPSHOT</version>
+    <version>5.1.0-SNAPSHOT</version>
     <name>Serverless Workflow :: Diagram :: Rest API</name>
     <description>Rest Api Module for Diagram Generation</description>
 	<properties>
 		<version.webflux.core>1.6.13</version.webflux.core>
-		<version.sw>5.0.0-SNAPSHOT</version.sw>
+		<version.sw>5.1.0-SNAPSHOT</version.sw>
 	</properties>
     <dependencies>
         <dependency>
diff --git a/diagram/pom.xml b/diagram/pom.xml
index 84e5e03e..551748a0 100644
--- a/diagram/pom.xml
+++ b/diagram/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>io.serverlessworkflow</groupId>
         <artifactId>serverlessworkflow-parent</artifactId>
-        <version>5.0.0.Final</version>
+        <version>5.3.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>serverlessworkflow-diagram</artifactId>
diff --git a/pom.xml b/pom.xml
index a5af87d0..472cae16 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
 
   <groupId>io.serverlessworkflow</groupId>
   <artifactId>serverlessworkflow-parent</artifactId>
-  <version>5.0.0.Final</version>
+  <version>5.3.0-SNAPSHOT</version>
   <packaging>pom</packaging>
 
   <name>Serverless Workflow :: Parent</name>
@@ -20,7 +20,7 @@
   </developers>
   <organization>
     <name>CNCF</name>
-    <url>https://www.cncf.io//</url>
+    <url>https://www.cncf.io/</url>
   </organization>
   <licenses>
     <license>
@@ -33,7 +33,7 @@
     <connection>scm:git:git@github.com:serverlessworkflow/sdk-java.git</connection>
     <developerConnection>scm:git:git@github.com:serverlessworkflow/sdk-java.git</developerConnection>
     <url>https://github.com/serverlessworkflow/sdk-java</url>
-    <tag>5.0.0.Final</tag>
+    <tag>5.1.0-SNAPSHOT</tag>
   </scm>
 
   <modules>
@@ -45,45 +45,45 @@
   </modules>
 
   <properties>
-    <java.version>11</java.version>
+    <java.version>17</java.version>
     <maven.compiler.source>${java.version}</maven.compiler.source>
     <maven.compiler.target>${java.version}</maven.compiler.target>
+    <maven.compiler.release>${java.version}</maven.compiler.release>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <version.maven>3.6.2</version.maven>
+    <version.maven>3.9.9</version.maven>
 
-    <!-- Plugin versions, please keep in alphabetical order -->
-    <version.buildnumber.plugin>3.2.0</version.buildnumber.plugin>
-    <version.checkstyle.plugin>3.3.1</version.checkstyle.plugin>
-    <version.compiler.plugin>3.13.0</version.compiler.plugin>
-    <version.deploy.plugin>3.1.2</version.deploy.plugin>
-    <version.enforcer.plugin>3.0.0-M2</version.enforcer.plugin>
-    <version.failsafe.plugin>3.2.5</version.failsafe.plugin>
-    <version.fmt-maven-plugin>2.23</version.fmt-maven-plugin>
-    <version.gpg.plugin>3.2.4</version.gpg.plugin>
-    <version.jar.plugin>3.4.1</version.jar.plugin>
+    <!-- Plugin versions -->
+    <version.buildnumber.plugin>3.2.1</version.buildnumber.plugin>
+    <version.checkstyle.plugin>3.6.0</version.checkstyle.plugin>
+    <version.compiler.plugin>3.14.0</version.compiler.plugin>
+    <version.deploy.plugin>3.1.4</version.deploy.plugin>
+    <version.enforcer.plugin>3.5.0</version.enforcer.plugin>
+    <version.failsafe.plugin>3.5.3</version.failsafe.plugin>
+    <version.fmt-maven-plugin>2.27</version.fmt-maven-plugin>
+    <version.gpg.plugin>3.2.7</version.gpg.plugin>
+    <version.jar.plugin>3.4.2</version.jar.plugin>
     <version.jdk>${java.version}</version.jdk>
-    <version.jsonschema2pojo-maven-plugin>1.1.2</version.jsonschema2pojo-maven-plugin>
-    <version.javadoc.plugin>3.6.3</version.javadoc.plugin>
-    <version.release.plugin>3.0.1</version.release.plugin>
+    <version.jsonschema2pojo-maven-plugin>1.2.2</version.jsonschema2pojo-maven-plugin>
+    <version.javadoc.plugin>3.11.2</version.javadoc.plugin>
+    <version.release.plugin>3.1.1</version.release.plugin>
     <version.source.plugin>3.3.1</version.source.plugin>
-    <version.surefire.plugin>3.2.5</version.surefire.plugin>
+    <version.surefire.plugin>3.5.3</version.surefire.plugin>
 
-
-    <!-- Dependencies versions, please keep in alphabetical order -->
-    <version.ch.qos.logback>1.5.6</version.ch.qos.logback>
-    <version.com.fasterxml.jackson>2.17.1</version.com.fasterxml.jackson>
-    <version.com.networknt>1.4.0</version.com.networknt>
-    <version.commons.lang>3.14.0</version.commons.lang>
-    <version.graphviz>0.17.0</version.graphviz>
-    <version.hamcrest>1.3</version.hamcrest>
-    <version.jakarta.validation>3.1.0</version.jakarta.validation>
-    <version.jsonassert>1.5.0</version.jsonassert>
-    <version.org.assertj>3.26.0</version.org.assertj>
-    <version.org.junit.jupiter>5.10.2</version.org.junit.jupiter>
-    <version.org.mockito>5.12.0</version.org.mockito>
-    <version.org.slf4j>2.0.13</version.org.slf4j>
+    <!-- Dependency versions -->
+    <version.ch.qos.logback>1.5.18</version.ch.qos.logback>
+    <version.com.fasterxml.jackson>2.19.0</version.com.fasterxml.jackson>
+    <version.com.networknt>1.5.7</version.com.networknt>
+    <version.commons.lang>3.17.0</version.commons.lang>
+    <version.graphviz>0.18.1</version.graphviz>
+    <version.hamcrest>3.0</version.hamcrest>
+    <version.jakarta.validation>3.1.1</version.jakarta.validation>
+    <version.jsonassert>1.5.3</version.jsonassert>
+    <version.org.assertj>3.27.3</version.org.assertj>
+    <version.org.junit.jupiter>5.13.1</version.org.junit.jupiter>
+    <version.org.mockito>5.18.0</version.org.mockito>
+    <version.org.slf4j>2.0.17</version.org.slf4j>
     <version.plantuml>8059</version.plantuml>
-    <version.thymeleaf>3.1.2.RELEASE</version.thymeleaf>
+    <version.thymeleaf>3.1.3.RELEASE</version.thymeleaf>
 
 
     <!-- Checkstyle props -->
diff --git a/spi/pom.xml b/spi/pom.xml
index b84de57c..12d4744c 100644
--- a/spi/pom.xml
+++ b/spi/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>io.serverlessworkflow</groupId>
         <artifactId>serverlessworkflow-parent</artifactId>
-        <version>5.0.0.Final</version>
+        <version>5.3.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>serverlessworkflow-spi</artifactId>
diff --git a/utils/pom.xml b/utils/pom.xml
index 109d2ab6..2624bfc4 100644
--- a/utils/pom.xml
+++ b/utils/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>io.serverlessworkflow</groupId>
         <artifactId>serverlessworkflow-parent</artifactId>
-        <version>5.0.0.Final</version>
+        <version>5.3.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>serverlessworkflow-util</artifactId>
diff --git a/validation/pom.xml b/validation/pom.xml
index e5a45a89..d21542e8 100644
--- a/validation/pom.xml
+++ b/validation/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>io.serverlessworkflow</groupId>
         <artifactId>serverlessworkflow-parent</artifactId>
-        <version>5.0.0.Final</version>
+        <version>5.3.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>serverlessworkflow-validation</artifactId>