diff --git a/modules/jdk/25/module.yaml b/modules/jdk/25/module.yaml
new file mode 100644
index 00000000..bf544a5b
--- /dev/null
+++ b/modules/jdk/25/module.yaml
@@ -0,0 +1,32 @@
+schema_version: 1
+
+name: "jboss.container.openjdk.jdk"
+description: "Installs the JDK for OpenJDK 25."
+version: &jdkver "25"
+
+labels:
+- name: "org.jboss.product"
+  value: "openjdk"
+- name: "org.jboss.product.version"
+  value: *jdkver
+- name: "org.jboss.product.openjdk.version"
+  value: *jdkver
+
+envs:
+- name: "JAVA_HOME"
+  value: "/usr/lib/jvm/java-25"
+- name: "JAVA_VENDOR"
+  value: "openjdk"
+- name: "JAVA_VERSION"
+  value: *jdkver
+- name: JBOSS_CONTAINER_OPENJDK_JDK_MODULE
+  value: /opt/jboss/container/openjdk/jdk
+
+packages:
+  install:
+  - java-25-openjdk-devel
+
+modules:
+  install:
+  - name: jboss.container.user
+  - name: jboss.container.openjdk
diff --git a/modules/jre/25/module.yaml b/modules/jre/25/module.yaml
new file mode 100644
index 00000000..55e38300
--- /dev/null
+++ b/modules/jre/25/module.yaml
@@ -0,0 +1,32 @@
+schema_version: 1
+
+name: "jboss.container.openjdk.jre"
+description: "Installs only the JRE headless for OpenJDK 25."
+version: &jdkver "25"
+
+labels:
+- name: "org.jboss.product"
+  value: "openjdk"
+- name: "org.jboss.product.version"
+  value: *jdkver
+- name: "org.jboss.product.openjdk.version"
+  value: *jdkver
+
+envs:
+- name: "JAVA_HOME"
+  value: "/usr/lib/jvm/jre"
+- name: "JAVA_VENDOR"
+  value: "openjdk"
+- name: "JAVA_VERSION"
+  value: *jdkver
+- name: JBOSS_CONTAINER_OPENJDK_JRE_MODULE
+  value: /opt/jboss/container/openjdk/jre
+
+packages:
+  install:
+  - java-25-openjdk-headless
+
+modules:
+  install:
+  - name: jboss.container.user
+  - name: jboss.container.openjdk