diff --git a/src/ruby-rails-postgres/devcontainer-template.json b/src/ruby-rails-postgres/devcontainer-template.json
index fa1d0db1..0c90e41e 100644
--- a/src/ruby-rails-postgres/devcontainer-template.json
+++ b/src/ruby-rails-postgres/devcontainer-template.json
@@ -1,6 +1,6 @@
 {
     "id": "ruby-rails-postgres",
-    "version": "6.0.0",
+    "version": "6.0.1",
     "name": "Ruby on Rails & Postgres",
     "description": "Develop Ruby on Rails applications with Postgres. Includes a Rails application container and PostgreSQL server.",
     "documentationURL": "https://github.com/devcontainers/templates/tree/main/src/ruby-rails-postgres",
@@ -14,14 +14,11 @@
                 "4-trixie",
                 "3.4-trixie",
                 "3.3-trixie",
-                "3.2-trixie",				
                 "4-bookworm",
                 "3.4-bookworm",
                 "3.3-bookworm",
-                "3.2-bookworm",
                 "3.4-bullseye",				
-                "3.3-bullseye",
-                "3.2-bullseye"
+                "3.3-bullseye"
             ],
 			"default": "4-trixie"
         }	
diff --git a/src/ruby/devcontainer-template.json b/src/ruby/devcontainer-template.json
index 9b2693ef..3edd7838 100644
--- a/src/ruby/devcontainer-template.json
+++ b/src/ruby/devcontainer-template.json
@@ -1,6 +1,6 @@
 {
     "id": "ruby",
-    "version": "6.0.0",
+    "version": "6.0.1",
     "name": "Ruby",
     "description": "Develop Ruby based applications. includes everything you need to get up and running.",
     "documentationURL": "https://github.com/devcontainers/templates/tree/main/src/ruby",
@@ -14,14 +14,11 @@
                 "4-trixie",
                 "3.4-trixie",				
                 "3.3-trixie",
-                "3.2-trixie",				
                 "4-bookworm",
                 "3.4-bookworm",				
                 "3.3-bookworm",
-                "3.2-bookworm",
                 "3.4-bullseye",				
-                "3.3-bullseye",
-                "3.2-bullseye"
+                "3.3-bullseye"
             ],
             "default": "4-trixie"
         }
diff --git a/src/universal/.devcontainer/devcontainer.json b/src/universal/.devcontainer/devcontainer.json
index 0682322d..791c88db 100644
--- a/src/universal/.devcontainer/devcontainer.json
+++ b/src/universal/.devcontainer/devcontainer.json
@@ -3,7 +3,7 @@
 {
 	"name": "Default Linux Universal",
 	// Or use a Dockerfile or Docker Compose file. More info: https://containers.dev/guide/dockerfile
-	"image": "mcr.microsoft.com/devcontainers/universal:5-linux"
+	"image": "mcr.microsoft.com/devcontainers/universal:6-linux"
 
 	// Features to add to the dev container. More info: https://containers.dev/features.
 	// "features": {},
diff --git a/src/universal/devcontainer-template.json b/src/universal/devcontainer-template.json
index 205e7e99..7e2d2a97 100644
--- a/src/universal/devcontainer-template.json
+++ b/src/universal/devcontainer-template.json
@@ -1,6 +1,6 @@
 {
     "id": "universal",
-    "version": "2.0.0",
+    "version": "2.0.1",
     "name": "Default Linux Universal",
     "description": "Use or extend the new Ubuntu-based default, large, multi-language universal container for GitHub Codespaces.",
     "documentationURL": "https://github.com/devcontainers/templates/tree/main/src/universal",
diff --git a/test/universal/test.sh b/test/universal/test.sh
index 51a84038..0a89f932 100755
--- a/test/universal/test.sh
+++ b/test/universal/test.sh
@@ -113,21 +113,17 @@ check "RAILS_DEVELOPMENT_HOSTS is set correctly" echo $RAILS_DEVELOPMENT_HOSTS |
 check "oryx" oryx --version
 
 # Install platforms with oryx build tool
-check "oryx-install-dotnet-2.1" oryx prep --skip-detection --platforms-and-versions dotnet=2.1.30
-check "dotnet-2-installed-by-oryx" ls /opt/dotnet/ | grep 2.1
-check "dotnet-version-on-path-is-2.1.12" dotnet --version | grep 2.1
+check "oryx-install-dotnet-8.0" oryx prep --skip-detection --platforms-and-versions dotnet=8.0.23
+check "dotnet-8-installed-by-oryx" ls /opt/dotnet/ | grep 8.0
+check "dotnet-version-on-path-is-8.0.23" dotnet --version | grep 8.0.23
 
-check "oryx-install-nodejs-12.22.11" oryx prep --skip-detection --platforms-and-versions nodejs=12.22.11
-check "nodejs-12.22.11-installed-by-oryx" ls /opt/nodejs/ | grep 12.22.11
-check "nodejs-version-on-path-is-2.1.12" node --version | grep v12.22.11
+check "oryx-install-nodejs-20.11.0" oryx prep --skip-detection --platforms-and-versions nodejs=20.11.0
+check "nodejs-20.11.0-installed-by-oryx" ls /opt/nodejs/ | grep 20.11.0
+check "nodejs-version-on-path-is-20.11.0" node --version | grep v20.11.0
 
-check "oryx-install-php-7.3.25" oryx prep --skip-detection --platforms-and-versions php=7.3.25
-check "php-7.3.25-installed-by-oryx" ls /opt/php/ | grep 7.3.25
-check "php-version-on-path-is-2.1.12" php --version | grep 7.3.25
-
-check "oryx-install-java-12.0.2" oryx prep --skip-detection --platforms-and-versions java=12.0.2
-check "java-12.0.2-installed-by-oryx" ls /opt/java/ | grep 12.0.2
-check "java-version-on-path-is-12.0.2" java --version | grep 12.0.2
+check "oryx-install-php-8.1.30" oryx prep --skip-detection --platforms-and-versions php=8.1.30
+check "php-8.1.30-installed-by-oryx" ls /opt/php/ | grep 8.1.30
+check "php-version-on-path-is-8.1.30" php --version | grep 8.1.30
 
 ls -la /home/codespace