diff --git a/src/java-postgres/.devcontainer/Dockerfile b/src/java-postgres/.devcontainer/Dockerfile
index 13cbe7e5..2a8e1b39 100644
--- a/src/java-postgres/.devcontainer/Dockerfile
+++ b/src/java-postgres/.devcontainer/Dockerfile
@@ -1,4 +1,4 @@
-FROM mcr.microsoft.com/devcontainers/java:1-${templateOption:imageVariant}
+FROM mcr.microsoft.com/devcontainers/java:2-${templateOption:imageVariant}
 
 ARG INSTALL_MAVEN="${templateOption:installMaven}"
 ARG MAVEN_VERSION=""
diff --git a/src/java-postgres/README.md b/src/java-postgres/README.md
index b06733bb..675ccab4 100644
--- a/src/java-postgres/README.md
+++ b/src/java-postgres/README.md
@@ -7,7 +7,7 @@ Develop applications with Java and PostgreSQL. Includes a Java application conta
 
 | Options Id | Description | Type | Default Value |
 |-----|-----|-----|-----|
-| imageVariant | Java version (use -bookworm, or -bullseye variants on local arm64/Apple Silicon): | string | 21-bullseye |
+| imageVariant | Java version (use -trixie, or -bookworm variants on local arm64/Apple Silicon): | string | 21-trixie |
 | installMaven | Install Maven, a management tool for Java | boolean | false |
 | installGradle | Install Gradle, a build automation tool for multi-language software development | boolean | false |
 
diff --git a/src/java-postgres/devcontainer-template.json b/src/java-postgres/devcontainer-template.json
index 23d07574..57d2030b 100644
--- a/src/java-postgres/devcontainer-template.json
+++ b/src/java-postgres/devcontainer-template.json
@@ -1,6 +1,6 @@
 {
     "id": "java-postgres",
-    "version": "4.0.2",
+    "version": "5.0.0",
     "name": "Java & PostgreSQL",
     "description": "Develop applications with Java and PostgreSQL. Includes a Java application container and PostgreSQL server.",
     "documentationURL": "https://github.com/devcontainers/templates/tree/main/src/java-postgres",
@@ -11,16 +11,15 @@
             "type": "string",
             "description": "Java version (use -bookworm, or -bullseye variants on local arm64/Apple Silicon):",
             "proposals": [
+				"21-trixie",
+				"17-trixie",
+			    "11-trixie",
                 "21-bookworm",
                 "17-bookworm",
                 "11-bookworm",
-                "8-bookworm",
-                "21-bullseye",
-                "17-bullseye",
-                "11-bullseye",
-                "8-bullseye"
+                "8-bookworm"
             ],
-            "default": "21-bullseye"
+            "default": "21-trixie"
         },
         "installMaven": {
             "type": "boolean",
diff --git a/src/java/.devcontainer/devcontainer.json b/src/java/.devcontainer/devcontainer.json
index 4664b357..62d17fd2 100644
--- a/src/java/.devcontainer/devcontainer.json
+++ b/src/java/.devcontainer/devcontainer.json
@@ -3,7 +3,7 @@
 {
 	"name": "Java",
 	// Or use a Dockerfile or Docker Compose file. More info: https://containers.dev/guide/dockerfile
-	"image": "mcr.microsoft.com/devcontainers/java:1-${templateOption:imageVariant}",
+	"image": "mcr.microsoft.com/devcontainers/java:2-${templateOption:imageVariant}",
 
 	"features": {
 		"ghcr.io/devcontainers/features/java:1": {
diff --git a/src/java/README.md b/src/java/README.md
index 96977c3d..040f9598 100644
--- a/src/java/README.md
+++ b/src/java/README.md
@@ -7,7 +7,7 @@ Develop Java applications. Includes the JDK and Java extensions.
 
 | Options Id | Description | Type | Default Value |
 |-----|-----|-----|-----|
-| imageVariant | Java version (use -bookworm, or -bullseye variants on local arm64/Apple Silicon): | string | 21-bullseye |
+| imageVariant | Java version (use -trixie, or -bookworm variants on local arm64/Apple Silicon): | string | 21-trixie |
 | installMaven | Install Maven, a management tool for Java | boolean | false |
 | installGradle | Install Gradle, a build automation tool for multi-language software development | boolean | false |
 
diff --git a/src/java/devcontainer-template.json b/src/java/devcontainer-template.json
index 4dc3c394..3a5e9c25 100644
--- a/src/java/devcontainer-template.json
+++ b/src/java/devcontainer-template.json
@@ -1,6 +1,6 @@
 {
     "id": "java",
-    "version": "4.0.2",
+    "version": "5.0.0",
     "name": "Java",
     "description": "Develop Java applications. Includes the JDK and Java extensions.",
     "documentationURL": "https://github.com/devcontainers/templates/tree/main/src/java",
@@ -9,18 +9,17 @@
     "options": {
         "imageVariant": {
             "type": "string",
-            "description": "Java version (use -bookworm, or -bullseye variants on local arm64/Apple Silicon):",
+            "description": "Java version (use -trixie, or -bookworm,  variants on local arm64/Apple Silicon):",
             "proposals": [
+				"21-trixie",
+				"17-trixie",
+			    "11-trixie",
                 "21-bookworm",
                 "17-bookworm",
                 "11-bookworm",
-                "8-bookworm",
-                "21-bullseye",
-                "17-bullseye",
-                "11-bullseye",
-                "8-bullseye"
+                "8-bookworm"
             ],
-            "default": "21-bullseye"
+            "default": "21-trixie"
         },
         "installMaven": {
             "type": "boolean",