diff --git a/modules/jdk/21/module.yaml b/modules/jdk/21/module.yaml
index c5a9b000..27d76cf0 100644
--- a/modules/jdk/21/module.yaml
+++ b/modules/jdk/21/module.yaml
@@ -4,21 +4,7 @@ name: "jboss.container.openjdk.jdk"
 description: "Installs the JDK for OpenJDK 21."
 version: &jdkver "21"
 
-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-21"
-- name: "JAVA_VENDOR"
-  value: "openjdk"
-- name: "JAVA_VERSION"
-  value: *jdkver
 - name: JBOSS_CONTAINER_OPENJDK_JDK_MODULE
   value: /opt/jboss/container/openjdk/jdk
 
diff --git a/modules/jdk/25/module.yaml b/modules/jdk/25/module.yaml
index e3cfb341..bbfc9c03 100644
--- a/modules/jdk/25/module.yaml
+++ b/modules/jdk/25/module.yaml
@@ -4,21 +4,7 @@ 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
 
diff --git a/modules/jre/21/module.yaml b/modules/jre/21/module.yaml
index cbe8743c..9212ccac 100644
--- a/modules/jre/21/module.yaml
+++ b/modules/jre/21/module.yaml
@@ -14,7 +14,7 @@ labels:
 
 envs:
 - name: "JAVA_HOME"
-  value: "/usr/lib/jvm/jre"
+  value: "/usr/lib/jvm/java-21-openjdk"
 - name: "JAVA_VENDOR"
   value: "openjdk"
 - name: "JAVA_VERSION"
diff --git a/modules/jre/25/module.yaml b/modules/jre/25/module.yaml
index 738dbdc7..f39c0188 100644
--- a/modules/jre/25/module.yaml
+++ b/modules/jre/25/module.yaml
@@ -14,7 +14,7 @@ labels:
 
 envs:
 - name: "JAVA_HOME"
-  value: "/usr/lib/jvm/jre"
+  value: "/usr/lib/jvm/java-25-openjdk"
 - name: "JAVA_VENDOR"
   value: "openjdk"
 - name: "JAVA_VERSION"