diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 151ceca..f3282df 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -29,9 +29,11 @@ jobs:
           - target: csharp
             implementation: netcore6.0
           - target: graphviz
-            implementation: 8
+            implementation: 9
           - target: go
             implementation: 1.21
+          - target: go
+            implementation: 1.22
           - target: java
             implementation: zulu7
           - target: java
@@ -40,6 +42,8 @@ jobs:
             implementation: temurin11
           - target: java
             implementation: temurin17
+          - target: java
+            implementation: temurin21
           - target: javascript
             implementation: nodejs4
           - target: javascript
@@ -61,7 +65,7 @@ jobs:
           - target: php
             implementation: 7.1
           - target: php
-            implementation: 8.2
+            implementation: 8.3
           - target: python
             implementation: 2.7
           - target: python
@@ -73,7 +77,7 @@ jobs:
           - target: ruby
             implementation: 2.3
           - target: ruby
-            implementation: 3.2
+            implementation: 3.3
 
     steps:
       - name: Dump matrix context
diff --git a/src/go/1.22-linux-x86_64/Dockerfile b/src/go/1.22-linux-x86_64/Dockerfile
new file mode 100644
index 0000000..050a401
--- /dev/null
+++ b/src/go/1.22-linux-x86_64/Dockerfile
@@ -0,0 +1,27 @@
+FROM golang:1.22-alpine
+
+# Copy files common for all images
+COPY 4img/* ./
+
+RUN ./prepare-alpine-init
+
+# Ruby is required for test infrastructure (aggregators, test result converters) to work
+RUN ./prepare-alpine-ruby
+
+# Required to download go-junit-report release in ./prepare-go-deps
+RUN apk add curl
+
+# Required for `go get` to work
+RUN apk add git
+
+RUN ./prepare-alpine-uninit
+
+# # Install rest of go-specific dependencies
+# RUN ./prepare
+
+# Validate that we've got correct version, e.g. something like this:
+#
+# $ go version
+# go version go1.22.0 linux/amd64
+
+RUN ./validate '^go version go1\.22\.'
diff --git a/src/graphviz/8-linux-x86_64/build b/src/go/1.22-linux-x86_64/build
similarity index 100%
rename from src/graphviz/8-linux-x86_64/build
rename to src/go/1.22-linux-x86_64/build
diff --git a/src/graphviz/8-linux-x86_64/run-it b/src/go/1.22-linux-x86_64/run-it
similarity index 100%
rename from src/graphviz/8-linux-x86_64/run-it
rename to src/go/1.22-linux-x86_64/run-it
diff --git a/src/graphviz/8-linux-x86_64/Dockerfile b/src/graphviz/9-linux-x86_64/Dockerfile
similarity index 75%
rename from src/graphviz/8-linux-x86_64/Dockerfile
rename to src/graphviz/9-linux-x86_64/Dockerfile
index 3cc81a0..6057e38 100644
--- a/src/graphviz/8-linux-x86_64/Dockerfile
+++ b/src/graphviz/9-linux-x86_64/Dockerfile
@@ -1,4 +1,4 @@
-FROM alpine:3.18
+FROM alpine:3.19
 
 # Copy files common for all images
 COPY 4img/* ./
@@ -13,6 +13,6 @@ RUN \
 # Validate that we've got correct version, e.g. something like this:
 #
 # $ dot -V
-# dot - graphviz version 8.0.5 (20230430.1635)
+# dot - graphviz version 9.0.0 (20230911.1827)
 
-RUN ./validate '^dot - graphviz version 8\.'
+RUN ./validate '^dot - graphviz version 9\.'
diff --git a/src/php/8.2-linux-x86_64/build b/src/graphviz/9-linux-x86_64/build
similarity index 100%
rename from src/php/8.2-linux-x86_64/build
rename to src/graphviz/9-linux-x86_64/build
diff --git a/src/php/8.2-linux-x86_64/run-it b/src/graphviz/9-linux-x86_64/run-it
similarity index 100%
rename from src/php/8.2-linux-x86_64/run-it
rename to src/graphviz/9-linux-x86_64/run-it
diff --git a/src/java/temurin21-linux-x86_64/Dockerfile b/src/java/temurin21-linux-x86_64/Dockerfile
new file mode 100644
index 0000000..e5d10e1
--- /dev/null
+++ b/src/java/temurin21-linux-x86_64/Dockerfile
@@ -0,0 +1,17 @@
+FROM eclipse-temurin:21
+
+# Copy files common for all images
+COPY 4img/* ./
+
+# Install all dependencies
+RUN ./prepare-apt-ruby
+RUN ./prepare-java-deps
+
+# Validate that we've got correct version, e.g. something like this:
+#
+# $ java -version
+# openjdk version "21.0.2" 2024-01-16 LTS
+# OpenJDK Runtime Environment Temurin-21.0.2+13 (build 21.0.2+13-LTS)
+# OpenJDK 64-Bit Server VM Temurin-21.0.2+13 (build 21.0.2+13-LTS, mixed mode, sharing)
+
+RUN ./validate '^openjdk version "21\.'
diff --git a/src/ruby/3.2-linux-x86_64/build b/src/java/temurin21-linux-x86_64/build
similarity index 100%
rename from src/ruby/3.2-linux-x86_64/build
rename to src/java/temurin21-linux-x86_64/build
diff --git a/src/ruby/3.2-linux-x86_64/run-it b/src/java/temurin21-linux-x86_64/run-it
similarity index 100%
rename from src/ruby/3.2-linux-x86_64/run-it
rename to src/java/temurin21-linux-x86_64/run-it
diff --git a/src/php/8.2-linux-x86_64/Dockerfile b/src/php/8.3-linux-x86_64/Dockerfile
similarity index 61%
rename from src/php/8.2-linux-x86_64/Dockerfile
rename to src/php/8.3-linux-x86_64/Dockerfile
index a058966..90d7ba5 100644
--- a/src/php/8.2-linux-x86_64/Dockerfile
+++ b/src/php/8.3-linux-x86_64/Dockerfile
@@ -1,4 +1,4 @@
-FROM php:8.2
+FROM php:8.3
 
 # Copy files common for all images
 COPY 4img/* ./
@@ -10,8 +10,8 @@ RUN ./prepare
 # Validate that we've got correct version, e.g. something like this:
 #
 # $ php --version
-# PHP 8.2.7 (cli) (built: Jul  4 2023 14:24:49) (NTS)
+# PHP 8.3.3 (cli) (built: Feb 16 2024 20:53:43) (NTS)
 # Copyright (c) The PHP Group
-# Zend Engine v4.2.7, Copyright (c) Zend Technologies
+# Zend Engine v4.3.3, Copyright (c) Zend Technologies
 
-RUN ./validate '^PHP 8\.2\.'
+RUN ./validate '^PHP 8\.3\.'
diff --git a/src/php/8.3-linux-x86_64/build b/src/php/8.3-linux-x86_64/build
new file mode 120000
index 0000000..552d52a
--- /dev/null
+++ b/src/php/8.3-linux-x86_64/build
@@ -0,0 +1 @@
+../../generic-build
\ No newline at end of file
diff --git a/src/php/8.3-linux-x86_64/run-it b/src/php/8.3-linux-x86_64/run-it
new file mode 120000
index 0000000..7461764
--- /dev/null
+++ b/src/php/8.3-linux-x86_64/run-it
@@ -0,0 +1 @@
+../../generic-run-it
\ No newline at end of file
diff --git a/src/ruby/3.2-linux-x86_64/Dockerfile b/src/ruby/3.3-linux-x86_64/Dockerfile
similarity index 63%
rename from src/ruby/3.2-linux-x86_64/Dockerfile
rename to src/ruby/3.3-linux-x86_64/Dockerfile
index 00dad9e..11e0113 100644
--- a/src/ruby/3.2-linux-x86_64/Dockerfile
+++ b/src/ruby/3.3-linux-x86_64/Dockerfile
@@ -1,4 +1,4 @@
-FROM ruby:3.2
+FROM ruby:3.3
 
 # Copy files common for all images
 COPY 4img/* ./
@@ -9,6 +9,6 @@ RUN ./prepare
 # Validate that we've got correct version, e.g. something like this:
 #
 # $ ruby --version
-# ruby 3.2.2 (2023-03-30 revision e51014f9c0) [x86_64-linux]
+# ruby 3.3.0 (2023-12-25 revision 5124f9ac75) [x86_64-linux]
 
-RUN ./validate '^ruby 3\.2\.'
+RUN ./validate '^ruby 3\.3\.'
diff --git a/src/ruby/3.3-linux-x86_64/build b/src/ruby/3.3-linux-x86_64/build
new file mode 120000
index 0000000..552d52a
--- /dev/null
+++ b/src/ruby/3.3-linux-x86_64/build
@@ -0,0 +1 @@
+../../generic-build
\ No newline at end of file
diff --git a/src/ruby/3.3-linux-x86_64/run-it b/src/ruby/3.3-linux-x86_64/run-it
new file mode 120000
index 0000000..7461764
--- /dev/null
+++ b/src/ruby/3.3-linux-x86_64/run-it
@@ -0,0 +1 @@
+../../generic-run-it
\ No newline at end of file