diff --git a/src/go-postgres/.devcontainer/Dockerfile b/src/go-postgres/.devcontainer/Dockerfile
index 8b945a45..3c801df2 100644
--- a/src/go-postgres/.devcontainer/Dockerfile
+++ b/src/go-postgres/.devcontainer/Dockerfile
@@ -1,4 +1,4 @@
-FROM mcr.microsoft.com/devcontainers/go:1-${templateOption:imageVariant}
+FROM mcr.microsoft.com/devcontainers/go:2-${templateOption:imageVariant}
 
 # [Optional] Uncomment this section to install additional OS packages.
 # RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \
diff --git a/src/go-postgres/README.md b/src/go-postgres/README.md
index 4123f7b1..f1aac8ba 100644
--- a/src/go-postgres/README.md
+++ b/src/go-postgres/README.md
@@ -7,7 +7,7 @@ Use and develop Go + Postgres applications. Includes appropriate runtime args, G
 
 | Options Id | Description | Type | Default Value |
 |-----|-----|-----|-----|
-| imageVariant | Go version: | string | 1.23-bookworm |
+| imageVariant | Go version: | string | 1.25-trixie |
 
 This template references an image that was [pre-built](https://containers.dev/implementors/reference/#prebuilding) to automatically include needed devcontainer.json metadata.
 
diff --git a/src/go-postgres/devcontainer-template.json b/src/go-postgres/devcontainer-template.json
index 4ace9be8..759d6d36 100644
--- a/src/go-postgres/devcontainer-template.json
+++ b/src/go-postgres/devcontainer-template.json
@@ -1,6 +1,6 @@
 {
     "id": "go-postgres",
-    "version": "4.2.0",
+    "version": "5.0.0",
     "name": "Go & PostgreSQL",
     "description": "Use and develop Go + Postgres applications. Includes appropriate runtime args, Go, common tools, extensions, and dependencies.",
     "documentationURL": "https://github.com/devcontainers/templates/tree/main/src/go-postgres",
@@ -11,16 +11,16 @@
             "type": "string",
             "description": "Go version:",
             "proposals": [
-                "1-bookworm",
+                "1-trixie",
+				"1.25-trixie",
+				"1.24-trixie",
+				"1-bookworm",
+				"1.25-bookworm",
                 "1.24-bookworm",
-                "1.23-bookworm",
-                "1.22-bookworm",
                 "1-bullseye",
-                "1.24-bullseye",
-                "1.23-bullseye",
-                "1.22-bullseye"
+                "1.24-bullseye"
             ],
-            "default": "1.24-bookworm"
+            "default": "1.25-trixie"
         }
     },
     "platforms": ["Go"],
diff --git a/src/go/.devcontainer/devcontainer.json b/src/go/.devcontainer/devcontainer.json
index 047779ca..e3099526 100644
--- a/src/go/.devcontainer/devcontainer.json
+++ b/src/go/.devcontainer/devcontainer.json
@@ -1,9 +1,9 @@
 // For format details, see https://aka.ms/devcontainer.json. For config options, see the
-// README at: https://github.com/devcontainers/templates/tree/main/src/go
+// README at: https://github.com/devcontainers/templates/tree/main/src/go .
 {
 	"name": "Go",
 	// Or use a Dockerfile or Docker Compose file. More info: https://containers.dev/guide/dockerfile
-	"image": "mcr.microsoft.com/devcontainers/go:1-${templateOption:imageVariant}"
+	"image": "mcr.microsoft.com/devcontainers/go:2-${templateOption:imageVariant}"
 
 	// Features to add to the dev container. More info: https://containers.dev/features.
 	// "features": {},
diff --git a/src/go/README.md b/src/go/README.md
index 321608e3..35c83739 100644
--- a/src/go/README.md
+++ b/src/go/README.md
@@ -7,7 +7,7 @@ Develop Go based applications. Includes appropriate runtime args, Go, common too
 
 | Options Id | Description | Type | Default Value |
 |-----|-----|-----|-----|
-| imageVariant | Go version: | string | 1.23-bookworm |
+| imageVariant | Go version: | string | 1.25-trixie |
 
 This template references an image that was [pre-built](https://containers.dev/implementors/reference/#prebuilding) to automatically include needed devcontainer.json metadata.
 
diff --git a/src/go/devcontainer-template.json b/src/go/devcontainer-template.json
index f396ba1a..79c4a1ae 100644
--- a/src/go/devcontainer-template.json
+++ b/src/go/devcontainer-template.json
@@ -1,6 +1,6 @@
 {
     "id": "go",
-    "version": "4.2.0",
+    "version": "5.0.0",
     "name": "Go",
     "description": "Develop Go based applications. Includes appropriate runtime args, Go, common tools, extensions, and dependencies.",
     "documentationURL": "https://github.com/devcontainers/templates/tree/main/src/go",
@@ -11,16 +11,14 @@
             "type": "string",
             "description": "Go version:",
             "proposals": [
-                "1-bookworm",
+				"1-trixie",
+				"1.24-trixie",
+				"1.25-trixie",
+                "1.25-bookworm",
                 "1.24-bookworm",
-                "1.23-bookworm",
-                "1.22-bookworm",
-                "1-bullseye",
-                "1.24-bullseye",
-                "1.23-bullseye",
-                "1.22-bullseye"
+                "1.24-bullseye"
             ],
-            "default": "1.24-bookworm"
+            "default": "1.25-trixie"
         }
     },
     "platforms": ["Go"],