diff --git a/modules/maven/17/module.yaml b/modules/maven/17/module.yaml
index e8e75adf..e92c5de0 100644
--- a/modules/maven/17/module.yaml
+++ b/modules/maven/17/module.yaml
@@ -1,13 +1,13 @@
 schema_version: 1
 name: jboss.container.maven
-version: '3.8.17'
-description: Provides Maven v3.8 capabilities to an image.
+version: '3.9.17'
+description: Provides Maven v3.9 capabilities to an image.
 
 envs:
-- name: JBOSS_CONTAINER_MAVEN_38_MODULE
-  value: /opt/jboss/container/maven/38/
+- name: JBOSS_CONTAINER_MAVEN_39_MODULE
+  value: /opt/jboss/container/maven/39/
 - name: MAVEN_VERSION
-  value: '3.8'
+  value: '3.9'
 
 modules:
   install:
diff --git a/modules/maven/21/module.yaml b/modules/maven/21/module.yaml
index e8d8c10c..71dce609 100644
--- a/modules/maven/21/module.yaml
+++ b/modules/maven/21/module.yaml
@@ -1,13 +1,13 @@
 schema_version: 1
 name: jboss.container.maven
-version: '3.8.21'
-description: Provides Maven v3.8 capabilities to an image.
+version: '3.9.21'
+description: Provides Maven v3.9 capabilities to an image.
 
 envs:
-- name: JBOSS_CONTAINER_MAVEN_38_MODULE
-  value: /opt/jboss/container/maven/38/
+- name: JBOSS_CONTAINER_MAVEN_39_MODULE
+  value: /opt/jboss/container/maven/39/
 - name: MAVEN_VERSION
-  value: '3.8'
+  value: '3.9'
 
 modules:
   install:
diff --git a/modules/maven/module/artifacts/maven.module b/modules/maven/module/artifacts/maven.module
index e437f0e5..96bd86fd 100644
--- a/modules/maven/module/artifacts/maven.module
+++ b/modules/maven/module/artifacts/maven.module
@@ -1,5 +1,5 @@
 [maven]
 name=maven
-stream=3.8
+stream=3.9
 profiles=
 state=enabled
diff --git a/ubi9-openjdk-17.yaml b/ubi9-openjdk-17.yaml
index 825027ff..1740cc48 100644
--- a/ubi9-openjdk-17.yaml
+++ b/ubi9-openjdk-17.yaml
@@ -51,7 +51,7 @@ modules:
   - name: jboss.container.openjdk.jdk
     version: "17"
   - name: jboss.container.maven
-    version: "3.8.17"
+    version: "3.9.17"
   - name: jboss.container.util.tzdata
   - name: jboss.container.java.s2i.bash
 
diff --git a/ubi9-openjdk-21.yaml b/ubi9-openjdk-21.yaml
index 5caddc97..4979de73 100644
--- a/ubi9-openjdk-21.yaml
+++ b/ubi9-openjdk-21.yaml
@@ -51,7 +51,7 @@ modules:
   - name: jboss.container.openjdk.jdk
     version: "21"
   - name: jboss.container.maven
-    version: "3.8.21"
+    version: "3.9.21"
   - name: jboss.container.util.tzdata
   - name: jboss.container.java.s2i.bash
   - name: jboss.container.util.tzdata