diff --git a/.github/skills/github-actions-workflows/SKILL.md b/.github/skills/github-actions-workflows/SKILL.md
index 2f705d7a81..9f8c571078 100644
--- a/.github/skills/github-actions-workflows/SKILL.md
+++ b/.github/skills/github-actions-workflows/SKILL.md
@@ -21,7 +21,7 @@ Create and maintain secure, efficient CI/CD pipelines using GitHub Actions for t
 
 | Component | Version | Notes |
 |-----------|---------|-------|
-| **Java JDK** | 26-ea (Temurin) | Source level 21 |
+| **Java JDK** | 26 (Temurin) | Source level 21 |
 | **Maven** | 3.9.14 | Multi-module reactor build |
 | **PostgreSQL** | 18 | Extensions: pgaudit, pgcrypto, pg_stat_statements |
 | **Node.js** | 24 | MCP servers, Playwright |
@@ -54,7 +54,7 @@ jobs:
       - name: Set up JDK 26
         uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00 # v4.7.1
         with:
-          java-version: '26-ea'
+          java-version: '26'
           distribution: 'temurin'
           cache: 'maven'
 
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
index fc67374788..086d33d4e8 100644
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -118,7 +118,7 @@ jobs:
         uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5.2.0
         with:
           distribution: "temurin"
-          java-version: "26-ea"
+          java-version: "26"
           # Disable built-in cache - we use optimized manual caching below
           cache: ""
 
diff --git a/.github/workflows/copilot-setup-steps.yml b/.github/workflows/copilot-setup-steps.yml
index 491300aa93..f6a28e9833 100644
--- a/.github/workflows/copilot-setup-steps.yml
+++ b/.github/workflows/copilot-setup-steps.yml
@@ -153,7 +153,7 @@ jobs:
         uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5.2.0
         with:
           distribution: "temurin"
-          java-version: "26-ea"
+          java-version: "26"
           # Disable built-in cache - we use optimized manual caching below
           cache: ""
 
diff --git a/.github/workflows/javadoc-generation.yml b/.github/workflows/javadoc-generation.yml
index 554c2d49ef..7f63e88837 100644
--- a/.github/workflows/javadoc-generation.yml
+++ b/.github/workflows/javadoc-generation.yml
@@ -81,7 +81,7 @@ jobs:
         uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5.2.0
         with:
           distribution: 'temurin'
-          java-version: '26-ea'
+          java-version: '26'
           java-package: 'jdk'
           check-latest: true
           # Disable built-in cache - we use optimized manual caching below
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 106c106b89..4c43f2ef4b 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -89,7 +89,7 @@ jobs:
       uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5.2.0
       with:
         distribution: 'temurin'
-        java-version: '26-ea'
+        java-version: '26'
         java-package: 'jdk'  # Explicitly specify JDK package
         check-latest: true   # Always get latest patch version
         # Disable built-in cache - we use optimized manual caching below
diff --git a/service.impl/pom.xml b/service.impl/pom.xml
index a009d328ad..9344bbe46f 100644
--- a/service.impl/pom.xml
+++ b/service.impl/pom.xml
@@ -104,11 +104,6 @@
       <artifactId>protobuf-java</artifactId>
       <version>4.34.1</version>
     </dependency>
-    <dependency>
-      <groupId>org.eclipse.jdt</groupId>
-      <artifactId>ecj</artifactId>
-      <version>3.45.0</version>
-    </dependency>
     <dependency>
       <groupId>org.quartz-scheduler</groupId>
       <artifactId>quartz</artifactId>
@@ -377,7 +372,15 @@
     </dependency>
   </dependencies>
   <build>
-    <plugins></plugins>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-surefire-plugin</artifactId>
+        <configuration>
+          <argLine>${surefireArgLine} ${testAdditionalRuntimeArgLine} -Ddrools.dialect.java.compiler.lnglevel=21</argLine>
+        </configuration>
+      </plugin>
+    </plugins>
     <extensions></extensions>
   </build>
 </project>
diff --git a/service.impl/src/main/java/com/hack23/cia/service/impl/rules/RulesConfiguration.java b/service.impl/src/main/java/com/hack23/cia/service/impl/rules/RulesConfiguration.java
index ab96e7412b..c524227945 100644
--- a/service.impl/src/main/java/com/hack23/cia/service/impl/rules/RulesConfiguration.java
+++ b/service.impl/src/main/java/com/hack23/cia/service/impl/rules/RulesConfiguration.java
@@ -49,7 +49,8 @@ public KieContainer kieContainer() {
 		final KieServices kieServices = KieServices.Factory.get();
 		final KieContainer kContainer = kieServices.getKieClasspathContainer();
 
-		LOGGER.info("Using classloader {}, parent {}",kContainer.getClassLoader(),kContainer.getClassLoader().getParent());
+		LOGGER.info("Using classloader {}, parent {}", kContainer.getClassLoader(),
+				kContainer.getClassLoader().getParent());
 
 		final Results verifyResults = kContainer.verify();
 		for (final Message m : verifyResults.getMessages()) {
@@ -58,14 +59,12 @@ public KieContainer kieContainer() {
 
 		final KieBase kieBase = kContainer.getKieBase();
 
-
 		for (final KiePackage kp : kieBase.getKiePackages()) {
 			for (final Rule rule : kp.getRules()) {
-				LOGGER.info("Loadded Rule: {} {}", kp, rule.getName());
+				LOGGER.info("Loaded Rule: {} {}", kp, rule.getName());
 			}
 		}
 
-
 		return kContainer;
 	}
 }
diff --git a/service.impl/src/main/resources/META-INF/kmodule.xml b/service.impl/src/main/resources/META-INF/kmodule.xml
index c2034e5d8f..a7e15448f2 100644
--- a/service.impl/src/main/resources/META-INF/kmodule.xml
+++ b/service.impl/src/main/resources/META-INF/kmodule.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <kmodule xmlns="http://www.drools.org/xsd/kmodule">
-  <kbase name="KBase1" default="true" packages="com.hack23.cia.service.impl.rules.party, com.hack23.cia.service.impl.rules.politician, com.hack23.cia.service.impl.rules.application">
-      <ksession name="KieSession" default="true"/>
-  </kbase>  
+  <kbase name="KBase1" default="true" packages="com.hack23.cia.service.impl.rules.party, com.hack23.cia.service.impl.rules.politician, com.hack23.cia.service.impl.rules.application, com.hack23.cia.service.impl.rules.committee, com.hack23.cia.service.impl.rules.ministry">
+    <ksession name="KieSession" default="true"/>
+  </kbase>
 </kmodule>
\ No newline at end of file
diff --git a/service.impl/src/test/java/com/hack23/cia/service/impl/AbstractServiceFunctionalIntegrationTest.java b/service.impl/src/test/java/com/hack23/cia/service/impl/AbstractServiceFunctionalIntegrationTest.java
index 6a5aa731bf..f1be85c982 100644
--- a/service.impl/src/test/java/com/hack23/cia/service/impl/AbstractServiceFunctionalIntegrationTest.java
+++ b/service.impl/src/test/java/com/hack23/cia/service/impl/AbstractServiceFunctionalIntegrationTest.java
@@ -59,7 +59,8 @@
 		"classpath:META-INF/cia-service-external-riksdagen.xml",
 		"classpath:META-INF/cia-service-external-worldbank.xml",
 		"classpath:META-INF/cia-service-external-val.xml",
-"classpath:/META-INF/cia-test-context.xml" })
+		"classpath:META-INF/cia-service-external-esv.xml",
+		"classpath:/META-INF/cia-test-context.xml" })
 public abstract class AbstractServiceFunctionalIntegrationTest extends AbstractFunctionalIntegrationTest {
 
 	/** The Constant EXPECT_A_RESULT. */