diff --git a/.github/workflows/build-dependabot.yml b/.github/workflows/build-dependabot.yml
index 2ed6498..e6f137a 100644
--- a/.github/workflows/build-dependabot.yml
+++ b/.github/workflows/build-dependabot.yml
@@ -30,10 +30,10 @@ jobs:
       - name: 🧹 Remove toolchains.xml
         run: rm $HOME/.m2/toolchains.xml || true
 
-      - name: 🛠️ Set up JDK 17
+      - name: 🛠️ Set up JDK 21
         uses: actions/setup-java@v3
         with:
-          java-version: '17'
+          java-version: '21'
           distribution: 'zulu'
 
 
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index d81260c..def19fc 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -33,10 +33,10 @@ jobs:
       - name: 🧹 Remove toolchains.xml
         run: rm $HOME/.m2/toolchains.xml || true
 
-      - name: 🛠️ Set up JDK 17
+      - name: 🛠️ Set up JDK 21
         uses: actions/setup-java@v3
         with:
-          java-version: '17'
+          java-version: '21'
           distribution: 'zulu'
 
 
diff --git a/.github/workflows/bump-version.yml b/.github/workflows/bump-version.yml
index 61115fc..bca67fc 100644
--- a/.github/workflows/bump-version.yml
+++ b/.github/workflows/bump-version.yml
@@ -36,10 +36,10 @@ jobs:
       - name: 🧹 Remove toolchains.xml
         run: rm $HOME/.m2/toolchains.xml || true
 
-      - name: 🛠️ Set up JDK 17
+      - name: 🛠️ Set up JDK 21
         uses: actions/setup-java@v3
         with:
-          java-version: '17'
+          java-version: '21'
           distribution: 'zulu'
 
 
diff --git a/.github/workflows/create-release-on-master.yml b/.github/workflows/create-release-on-master.yml
index f882e07..37d7713 100644
--- a/.github/workflows/create-release-on-master.yml
+++ b/.github/workflows/create-release-on-master.yml
@@ -21,10 +21,10 @@ jobs:
       - name: 🧹 Remove toolchains.xml
         run: rm $HOME/.m2/toolchains.xml || true
 
-      - name: 🛠️ Set up JDK 17
+      - name: 🛠️ Set up JDK 21
         uses: actions/setup-java@v3
         with:
-          java-version: '17'
+          java-version: '21'
           distribution: 'zulu'
 
 
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 7bdebfe..b7f4311 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -36,10 +36,10 @@ jobs:
       - name: 🧹 Remove toolchains.xml
         run: rm $HOME/.m2/toolchains.xml || true
 
-      - name: 🛠️ Set up JDK 17
+      - name: 🛠️ Set up JDK 21
         uses: actions/setup-java@v3
         with:
-          java-version: '17'
+          java-version: '21'
           distribution: 'zulu'
 
 
diff --git a/judo-tatami-asm-validation/.classpath b/judo-tatami-asm-validation/.classpath
index 7495292..c1ea872 100644
--- a/judo-tatami-asm-validation/.classpath
+++ b/judo-tatami-asm-validation/.classpath
@@ -13,7 +13,7 @@
 			<attribute name="test" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17">
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
diff --git a/judo-tatami-asm2expression/.classpath b/judo-tatami-asm2expression/.classpath
index ba573e9..2ba7869 100644
--- a/judo-tatami-asm2expression/.classpath
+++ b/judo-tatami-asm2expression/.classpath
@@ -13,7 +13,7 @@
 			<attribute name="test" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17">
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
diff --git a/judo-tatami-asm2keycloak/.classpath b/judo-tatami-asm2keycloak/.classpath
index fac0f40..d5dd755 100644
--- a/judo-tatami-asm2keycloak/.classpath
+++ b/judo-tatami-asm2keycloak/.classpath
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17">
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
diff --git a/judo-tatami-asm2rdbms/.classpath b/judo-tatami-asm2rdbms/.classpath
index a168026..19ba333 100644
--- a/judo-tatami-asm2rdbms/.classpath
+++ b/judo-tatami-asm2rdbms/.classpath
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17">
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
diff --git a/judo-tatami-expression-asm-validation/.classpath b/judo-tatami-expression-asm-validation/.classpath
index fbb97ec..8047479 100644
--- a/judo-tatami-expression-asm-validation/.classpath
+++ b/judo-tatami-expression-asm-validation/.classpath
@@ -13,7 +13,7 @@
 			<attribute name="test" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17">
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
diff --git a/judo-tatami-expression-psm-validation/.classpath b/judo-tatami-expression-psm-validation/.classpath
index fbb97ec..8047479 100644
--- a/judo-tatami-expression-psm-validation/.classpath
+++ b/judo-tatami-expression-psm-validation/.classpath
@@ -13,7 +13,7 @@
 			<attribute name="test" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17">
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
diff --git a/judo-tatami-psm-validation/.classpath b/judo-tatami-psm-validation/.classpath
index fbb97ec..8047479 100644
--- a/judo-tatami-psm-validation/.classpath
+++ b/judo-tatami-psm-validation/.classpath
@@ -13,7 +13,7 @@
 			<attribute name="test" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17">
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
diff --git a/judo-tatami-psm2asm/.classpath b/judo-tatami-psm2asm/.classpath
index a168026..19ba333 100644
--- a/judo-tatami-psm2asm/.classpath
+++ b/judo-tatami-psm2asm/.classpath
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17">
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
diff --git a/judo-tatami-psm2measure/.classpath b/judo-tatami-psm2measure/.classpath
index 6ce57ba..0ab387f 100644
--- a/judo-tatami-psm2measure/.classpath
+++ b/judo-tatami-psm2measure/.classpath
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17">
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
diff --git a/judo-tatami-rdbms2liquibase/.classpath b/judo-tatami-rdbms2liquibase/.classpath
index 07986cf..f19fdfc 100644
--- a/judo-tatami-rdbms2liquibase/.classpath
+++ b/judo-tatami-rdbms2liquibase/.classpath
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17">
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
diff --git a/judo-tatami-rdbms2liquibase/pom.xml b/judo-tatami-rdbms2liquibase/pom.xml
index aa0f13c..847cdd8 100644
--- a/judo-tatami-rdbms2liquibase/pom.xml
+++ b/judo-tatami-rdbms2liquibase/pom.xml
@@ -136,21 +136,21 @@
 		<dependency>
 			<groupId>org.testcontainers</groupId>
 			<artifactId>postgresql</artifactId>
-			<version>1.15.2</version>
+			<version>1.21.1</version>
 			<scope>test</scope>
 		</dependency>
 		
 		<dependency>
 			<groupId>org.testcontainers</groupId>
 			<artifactId>testcontainers</artifactId>
-			<version>1.17.3</version>
+			<version>1.21.1</version>
 			<scope>test</scope>
 		</dependency>
 
 		<dependency>
 			<groupId>org.testcontainers</groupId>
 			<artifactId>junit-jupiter</artifactId>
-			<version>1.17.3</version>
+			<version>1.21.1</version>
 			<scope>test</scope>
 		</dependency>
 
diff --git a/pom.xml b/pom.xml
index 09deaaa..8ed7767 100644
--- a/pom.xml
+++ b/pom.xml
@@ -65,43 +65,43 @@
         <maven.build.timestamp.format>yyyyMMddHHmmss</maven.build.timestamp.format>
         <src.dir>src/main</src.dir>
 
-        <maven.compiler.source>17</maven.compiler.source>
-        <maven.compiler.target>17</maven.compiler.target>
+        <maven.compiler.source>21</maven.compiler.source>
+        <maven.compiler.target>21</maven.compiler.target>
         <!--suppress UnresolvedMavenProperty -->
         <logback-test-config>${maven.multiModuleProjectDirectory}/logback-test.xml</logback-test-config>
         <logback-version>1.5.12</logback-version>
         <lombok-version>1.18.34</lombok-version>
 
-        <karaf-version>4.4.5</karaf-version>
+        <karaf-version>4.4.7</karaf-version>
         <pax-exam-version>4.13.5</pax-exam-version>
         <slf4j-version>2.0.16</slf4j-version>
 
         <surefire-version>3.5.1</surefire-version>
 
         <liquibase-version>4.4.3</liquibase-version>
-        <epsilon-runtime-version>1.5.1.20250220_144839_7dae83fe_develop</epsilon-runtime-version>
+        <epsilon-runtime-version>2.8.0.20250604_211612_b4253e0f_feature_JNG_6310_UpdateEpsilon</epsilon-runtime-version>
 
-        <java-embedded-compiler-version>1.1.0.20241127_155258_d7d48758_develop</java-embedded-compiler-version>
+        <java-embedded-compiler-version>1.1.0.20250604_211621_27199bfa_feature_JNG_6310_UpdateEpsilon</java-embedded-compiler-version>
 
-        <judo-tatami-core-version>1.1.4.20250221_041410_af676eb7_develop</judo-tatami-core-version>
+        <judo-tatami-core-version>1.1.4.20250605_174420_77230eba_feature_JNG_6310_UpdateEpsilon</judo-tatami-core-version>
 
         <!-- Model versions -->
-        <judo-dao-api-version>1.0.4.20250521_140838_63edcd65_develop</judo-dao-api-version>
-        <judo-sdk-common-version>1.0.4.20250522_041720_81294039_develop</judo-sdk-common-version>
-        <judo-operation-utils-version>1.1.3.20250522_041728_58ece43b_develop</judo-operation-utils-version>
-        <judo-meta-rdbms-version>1.0.2.20250222_040702_8ea8a157_develop</judo-meta-rdbms-version>
-		<judo-meta-psm-version>1.3.0.20250319_094042_9d9ee438_develop</judo-meta-psm-version>
-        <judo-meta-jql-version>1.0.4.20250222_040637_1cddfa73_develop</judo-meta-jql-version>
-        <judo-meta-asm-version>1.1.4.20250224_090702_f96624c2_develop</judo-meta-asm-version>
-        <judo-meta-expression-version>1.0.5.20250222_041137_c751bf6e_develop</judo-meta-expression-version>
-        <judo-meta-expression-psm-version>1.0.5.20250319_115945_ad3e6d9b_develop</judo-meta-expression-psm-version>
-        <judo-meta-expression-asm-version>1.0.5.20250225_041316_163ba3b5_develop</judo-meta-expression-asm-version>
-        <judo-meta-keycloak-version>1.0.1.20250602_042222_8bcc6f26_develop</judo-meta-keycloak-version>
-        <judo-meta-measure-version>1.0.2.20250222_040644_be0843f8_develop</judo-meta-measure-version>
-        <judo-meta-liquibase-version>1.0.2.20250222_040917_9666758e_develop</judo-meta-liquibase-version>
-        <judo-dispatcher-api-version>1.0.3.20241127_150146_84f2988d_develop</judo-dispatcher-api-version>
-
-        <xtext-version>2.28.0</xtext-version>
+        <judo-dao-api-version>1.0.4.20250604_005315_768f80d4_feature_JNG_6310_UpdateEpsilon</judo-dao-api-version>
+        <judo-sdk-common-version>1.0.4.20250605_175505_e840aacc_feature_JNG_6310_UpdateEpsilon</judo-sdk-common-version>
+        <judo-operation-utils-version>1.1.3.20250605_175458_03cf9f22_feature_JNG_6310_UpdateEpsilon</judo-operation-utils-version>
+        <judo-meta-rdbms-version>1.0.2.20250605_174903_11d6023e_feature_JNG_6310_UpdateEpsilon</judo-meta-rdbms-version>
+		<judo-meta-psm-version>1.3.0.20250605_174913_79cb2ca3_feature_JNG_6310_UpdateEpsilon</judo-meta-psm-version>
+        <judo-meta-jql-version>1.0.4.20250605_174424_b1a524b1_feature_JNG_6310_UpdateEpsilon</judo-meta-jql-version>
+        <judo-meta-asm-version>1.1.4.20250605_174926_12ee9fa4_feature_JNG_6310_UpdateEpsilon</judo-meta-asm-version>
+        <judo-meta-expression-version>1.0.5.20250605_175521_9e559cd2_feature_JNG_6310_UpdateEpsilon</judo-meta-expression-version>
+        <judo-meta-expression-psm-version>1.0.5.20250605_175946_eb2d4576_feature_JNG_6310_UpdateEpsilon</judo-meta-expression-psm-version>
+        <judo-meta-expression-asm-version>1.0.5.20250605_175940_a61d364b_feature_JNG_6310_UpdateEpsilon</judo-meta-expression-asm-version>
+        <judo-meta-keycloak-version>1.0.1.20250605_175027_f61519cc_feature_JNG_6310_UpdateEpsilon</judo-meta-keycloak-version>
+        <judo-meta-measure-version>1.0.2.20250605_174947_2b53f72d_feature_JNG_6310_UpdateEpsilon</judo-meta-measure-version>
+        <judo-meta-liquibase-version>1.0.2.20250605_174854_fa5988aa_feature_JNG_6310_UpdateEpsilon</judo-meta-liquibase-version>
+        <judo-dispatcher-api-version>1.0.3.20250604_005327_6d1e7640_feature_JNG_6310_UpdateEpsilon</judo-dispatcher-api-version>
+
+        <xtext-version>2.39.0</xtext-version>
 
         <surefire-version>3.5.1</surefire-version>
 
@@ -979,7 +979,7 @@
                     <plugin>
                         <groupId>org.simplify4u.plugins</groupId>
                         <artifactId>sign-maven-plugin</artifactId>
-                        <version>1.0.1</version>
+                        <version>1.1.0</version>
                         <executions>
                             <execution>
                                 <goals>