diff --git a/src/go-postgres/devcontainer-template.json b/src/go-postgres/devcontainer-template.json
index 6e07658a..2c34825e 100644
--- a/src/go-postgres/devcontainer-template.json
+++ b/src/go-postgres/devcontainer-template.json
@@ -1,6 +1,6 @@
 {
     "id": "go-postgres",
-    "version": "3.1.0",
+    "version": "4.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",
@@ -12,13 +12,13 @@
             "description": "Go version:",
             "proposals": [
                 "1-bookworm",
+				"1.22-bookworm",
                 "1.21-bookworm",
-                "1.20-bookworm",
                 "1-bullseye",
-                "1.21-bullseye",
-                "1.20-bullseye"
+				"1.22-bullseye",
+                "1.21-bullseye"
             ],
-            "default": "1.21-bullseye"
+            "default": "1.22-bookworm"
         }
     },
     "platforms": [
diff --git a/src/go/devcontainer-template.json b/src/go/devcontainer-template.json
index d19fbcd5..bcd48d3a 100644
--- a/src/go/devcontainer-template.json
+++ b/src/go/devcontainer-template.json
@@ -1,6 +1,6 @@
 {
     "id": "go",
-    "version": "3.1.0",
+    "version": "4.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",
@@ -12,13 +12,13 @@
             "description": "Go version:",
             "proposals": [
                 "1-bookworm",
+				"1.22-bookworm",
                 "1.21-bookworm",
-                "1.20-bookworm",
                 "1-bullseye",
-                "1.21-bullseye",
-                "1.20-bullseye"
+				"1.22-bullseye",
+                "1.21-bullseye"
             ],
-            "default": "1.21-bullseye"
+            "default": "1.22-bookworm"
         }
     },
     "platforms": [