diff --git a/.ci/incubator-kie-tools-ci-build.Dockerfile b/.ci/incubator-kie-tools-ci-build.Dockerfile
index 79366f15533..8e254c465c2 100644
--- a/.ci/incubator-kie-tools-ci-build.Dockerfile
+++ b/.ci/incubator-kie-tools-ci-build.Dockerfile
@@ -95,7 +95,7 @@ RUN curl -s "https://get.sdkman.io" | bash && \
     source "$HOME/.sdkman/bin/sdkman-init.sh" && \
     sdk install java 17.0.11-tem && \
     sudo update-alternatives --install /usr/local/bin/java java $(which java) 1 && \
-    sdk install maven 3.9.6 && \
+    sdk install maven 3.9.9 && \
     sudo update-alternatives --install /usr/local/bin/mvn mvn $(which mvn) 1 && \
     sdk flush
 
diff --git a/.github/actions/setup-env/action.yml b/.github/actions/setup-env/action.yml
index 9ea30074b63..de5b5fc8b56 100644
--- a/.github/actions/setup-env/action.yml
+++ b/.github/actions/setup-env/action.yml
@@ -85,7 +85,7 @@ runs:
     - name: "Set up Maven"
       uses: stCarolas/setup-maven@v5
       with:
-        maven-version: 3.9.6
+        maven-version: 3.9.9
 
     - uses: actions/setup-python@v5
       with:
diff --git a/README.md b/README.md
index 475d650883b..952fc282de0 100644
--- a/README.md
+++ b/README.md
@@ -47,7 +47,7 @@ To build and test all packages of the Apache KIE Tools project, you're going to
 
 - Node `20` _(To install, follow these instructions: https://nodejs.org/en/download/package-manager/)_
 - pnpm `9.3.0` _(To install, follow these instructions: https://pnpm.io/installation#using-npm)_
-- Maven `3.9.6`
+- Maven `3.9.9`
 - Java `17`
 - Go `1.22.9` _(To install, follow these instructions: https://go.dev/doc/install)_
 - Python `3.12` _(To install, follow these instructions: https://www.python.org/downloads/)_
diff --git a/devbox.json b/devbox.json
index 813cd77d89e..531dec14c27 100644
--- a/devbox.json
+++ b/devbox.json
@@ -3,7 +3,7 @@
   "packages": {
     "temurin-bin-17": "17.0.9",
     "nodejs": "22.11.0",
-    "maven": "3.9.6",
+    "maven": "3.9.9",
     "kubernetes-helm": "3.13.3",
     "gnumake": "4.4.1",
     "go": "1.22.9",
diff --git a/devbox.lock b/devbox.lock
index 3f05cc69d6f..2a162848589 100644
--- a/devbox.lock
+++ b/devbox.lock
@@ -109,23 +109,51 @@
         }
       }
     },
-    "maven@3.9.6": {
-      "last_modified": "2024-06-12T20:55:33Z",
-      "resolved": "github:NixOS/nixpkgs/a9858885e197f984d92d7fe64e9fff6b2e488d40#maven",
+    "maven@3.9.9": {
+      "last_modified": "2024-12-23T21:10:33Z",
+      "resolved": "github:NixOS/nixpkgs/de1864217bfa9b5845f465e771e0ecb48b30e02d#maven",
       "source": "devbox-search",
-      "version": "3.9.6",
+      "version": "3.9.9",
       "systems": {
         "aarch64-darwin": {
-          "store_path": "/nix/store/anjg4vldn49by6biv5xnhqq1mg34pbf2-apache-maven-3.9.6"
+          "outputs": [
+            {
+              "name": "out",
+              "path": "/nix/store/skgavbzs2qnkf4sqr9fzdgpwym6cyz6w-maven-3.9.9",
+              "default": true
+            }
+          ],
+          "store_path": "/nix/store/skgavbzs2qnkf4sqr9fzdgpwym6cyz6w-maven-3.9.9"
         },
         "aarch64-linux": {
-          "store_path": "/nix/store/x0b2lf5938xbqkmyy0dy3m5scbzhn758-apache-maven-3.9.6"
+          "outputs": [
+            {
+              "name": "out",
+              "path": "/nix/store/d2d8y3d3v0bghv6v59m6ln3m154sp93d-maven-3.9.9",
+              "default": true
+            }
+          ],
+          "store_path": "/nix/store/d2d8y3d3v0bghv6v59m6ln3m154sp93d-maven-3.9.9"
         },
         "x86_64-darwin": {
-          "store_path": "/nix/store/w6crqg0hzr9ywg4nfkiqhkfy9rscq5pz-apache-maven-3.9.6"
+          "outputs": [
+            {
+              "name": "out",
+              "path": "/nix/store/kfg5rnrxx0a6xcfkcsvj4rmangcfg01s-maven-3.9.9",
+              "default": true
+            }
+          ],
+          "store_path": "/nix/store/kfg5rnrxx0a6xcfkcsvj4rmangcfg01s-maven-3.9.9"
         },
         "x86_64-linux": {
-          "store_path": "/nix/store/21kyz6bqsr97gjd3lc8g600zc1cksd1d-apache-maven-3.9.6"
+          "outputs": [
+            {
+              "name": "out",
+              "path": "/nix/store/dqv2ipvqa1ngydsgv0bcqxfr4xdq6zi6-maven-3.9.9",
+              "default": true
+            }
+          ],
+          "store_path": "/nix/store/dqv2ipvqa1ngydsgv0bcqxfr4xdq6zi6-maven-3.9.9"
         }
       }
     },
diff --git a/examples/process-compact-architecture/README.md b/examples/process-compact-architecture/README.md
index 63b715b1d19..e4a2005cea3 100644
--- a/examples/process-compact-architecture/README.md
+++ b/examples/process-compact-architecture/README.md
@@ -191,7 +191,7 @@ public class Offer {
 
 - Java 17+ installed
 - Environment variable JAVA_HOME set accordingly
-- Maven 3.9.6+ installed
+- Maven 3.9.9+ installed
 - Docker and Docker Compose to run the required example infrastructure.
 
 And when using native image compilation, you will also need:
diff --git a/examples/process-user-tasks-subsystem/README.md b/examples/process-user-tasks-subsystem/README.md
index 5273b1702b2..9d8aaa9d19c 100644
--- a/examples/process-user-tasks-subsystem/README.md
+++ b/examples/process-user-tasks-subsystem/README.md
@@ -59,7 +59,7 @@ You will need:
 
 - Java 17 installed
 - Environment variable JAVA_HOME set accordingly
-- Maven 3.9.6 installed
+- Maven 3.9.9 installed
 
 When using native image compilation, you will also need:
 
diff --git a/examples/sonataflow-greeting/README.md b/examples/sonataflow-greeting/README.md
index 690e9005cbe..378abf06970 100644
--- a/examples/sonataflow-greeting/README.md
+++ b/examples/sonataflow-greeting/README.md
@@ -41,7 +41,7 @@ You will need:
 
 - Java 17 installed
 - Environment variable JAVA_HOME set accordingly
-- Maven 3.9.6 installed
+- Maven 3.9.9 installed
 
 When using native image compilation, you will also need:
 
diff --git a/packages/dev-deployment-kogito-quarkus-blank-app-image/Containerfile b/packages/dev-deployment-kogito-quarkus-blank-app-image/Containerfile
index d593ff44c4f..dc57ccdfcd0 100644
--- a/packages/dev-deployment-kogito-quarkus-blank-app-image/Containerfile
+++ b/packages/dev-deployment-kogito-quarkus-blank-app-image/Containerfile
@@ -30,7 +30,7 @@ COPY --chown=$USER_ID:$USER_ID dist-dev/quarkus-app $HOME_PATH/app/
 COPY --chown=$USER_ID:$USER_ID dist-dev/settings.xml /tmp/kogito/.m2/settings.xml
 
 # Pre-populate local Maven repository for faster startup
-RUN ./mvnw -Dmaven=3.9.6 clean package -B -nsu --settings /tmp/kogito/.m2/settings.xml -Dmaven.test.skip -Dmaven.repo.local=/tmp/kogito/.m2/repository -Dquarkus.http.non-application-root-path=${ROOT_PATH}/q -Dquarkus.http.root-path=${ROOT_PATH} \
+RUN ./mvnw -Dmaven=3.9.9 clean package -B -nsu --settings /tmp/kogito/.m2/settings.xml -Dmaven.test.skip -Dmaven.repo.local=/tmp/kogito/.m2/repository -Dquarkus.http.non-application-root-path=${ROOT_PATH}/q -Dquarkus.http.root-path=${ROOT_PATH} \
   && chgrp -R 0 $HOME_PATH/app && chmod -R g=u $HOME_PATH/app && chgrp -R 0 /tmp/kogito && chmod -R g=u /tmp/kogito && chgrp -R 0 /.m2 && chmod -R g=u /.m2
 
 USER $USER_ID
@@ -39,4 +39,4 @@ EXPOSE 8080
 
 ENTRYPOINT ["/bin/bash", "-c"]
 
-CMD ["dev-deployment-upload-service && cp -r $HOME_PATH/app/. /tmp/app && cd /tmp/app && ./mvnw -Dmaven=3.9.6 quarkus:dev -o -s=/tmp/kogito/.m2/settings.xml -Dquarkus.analytics.disabled=true -Ddebug=false -Dmaven.repo.local=/tmp/kogito/.m2/repository -Dquarkus.http.non-application-root-path=${ROOT_PATH}/q -Dquarkus.http.root-path=${ROOT_PATH}"]
+CMD ["dev-deployment-upload-service && cp -r $HOME_PATH/app/. /tmp/app && cd /tmp/app && ./mvnw -Dmaven=3.9.9 quarkus:dev -o -s=/tmp/kogito/.m2/settings.xml -Dquarkus.analytics.disabled=true -Ddebug=false -Dmaven.repo.local=/tmp/kogito/.m2/repository -Dquarkus.http.non-application-root-path=${ROOT_PATH}/q -Dquarkus.http.root-path=${ROOT_PATH}"]
diff --git a/packages/kie-sandbox-fs/package.json b/packages/kie-sandbox-fs/package.json
index fc91b4dab5f..a8ce2c27b7b 100644
--- a/packages/kie-sandbox-fs/package.json
+++ b/packages/kie-sandbox-fs/package.json
@@ -38,9 +38,9 @@
   ],
   "scripts": {
     "build:dev": "rimraf dist && pnpm copy:src",
-    "build:prod": "rimraf dist && pnpm copy:src && pnpm test",
+    "build:prod": "rimraf dist && pnpm copy:src && pnpm test-e2e",
     "copy:src": "copyfiles -u 1 \"src/**/*.{js,ts}\" dist/",
-    "test": "run-script-if --ignore-errors \"$(build-env tests.ignoreFailures)\" --bool \"$(build-env tests.run)\" --then \"karma start --single-run --watch\""
+    "test-e2e": "run-script-if --ignore-errors \"$(build-env endToEndTests.ignoreFailures)\" --bool \"$(build-env endToEndTests.run)\" --then \"karma start --single-run --watch\""
   },
   "dependencies": {
     "@isomorphic-git/idb-keyval": "^3.3.2",
diff --git a/repo/KOGITO_UPGRADE_PROCESS.md b/repo/KOGITO_UPGRADE_PROCESS.md
index 2a118e9fd7b..353f79bfe64 100644
--- a/repo/KOGITO_UPGRADE_PROCESS.md
+++ b/repo/KOGITO_UPGRADE_PROCESS.md
@@ -57,7 +57,7 @@ The suggested strategy is to check all:
 
 To double-check that all the versions are correctly updated, please perform a search with grep (or the IDE-integrated search) if the old version is still referenced somewhere. As a key, you can use:
 
-- The version number (eg. `17` for Java and `3.9.6` for Maven);
+- The version number (eg. `17` for Java and `3.9.9` for Maven);
 - OpenJDK references (`openjdk`);
 - Apache Maven references (`apache-maven`);
 - GitHub Action references (`java-version` and `maven-version`);
diff --git a/repo/build-dependencies-versions.json b/repo/build-dependencies-versions.json
index 131e4d76781..9d28e2094f8 100644
--- a/repo/build-dependencies-versions.json
+++ b/repo/build-dependencies-versions.json
@@ -1,7 +1,7 @@
 {
   "go": "1.22.9",
   "java": "17",
-  "maven": "3.9.6",
+  "maven": "3.9.9",
   "node": "22.13.1",
   "pnpm": "9.3.0",
   "python3": "3.12.2",