diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 73e9e6d9..08cd8d27 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -12,7 +12,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        java: ['21', '22']
+        java: ['23', '24-ea']
     steps:
     - uses: actions/checkout@v2
     - uses: actions/setup-java@v2
diff --git a/pom.xml b/pom.xml
index 077d37d5..38e7fa5c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>io.airlift</groupId>
         <artifactId>airbase</artifactId>
-        <version>157</version>
+        <version>235</version>
     </parent>
 
     <groupId>io.trino.tempto</groupId>
@@ -50,7 +50,7 @@
             <dependency>
                 <groupId>org.apache.groovy</groupId>
                 <artifactId>groovy-bom</artifactId>
-                <version>4.0.21</version>
+                <version>4.0.26</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
diff --git a/tempto-examples/bin/run_on_docker.sh b/tempto-examples/bin/run_on_docker.sh
index 9bf37275..74f5223c 100755
--- a/tempto-examples/bin/run_on_docker.sh
+++ b/tempto-examples/bin/run_on_docker.sh
@@ -76,12 +76,12 @@ function termination_handler(){
 }
 
 SCRIPT_DIR=$(dirname $(absolutepath "$0"))
-DOCKER_COMPOSE="docker-compose -f ${SCRIPT_DIR}/../docker/docker-compose.yml"
+DOCKER_COMPOSE="docker compose -f ${SCRIPT_DIR}/../docker/docker-compose.yml"
 
 source "${SCRIPT_DIR}/../target/classes/tempto.env"
 
 # check docker and docker compose installation
-docker-compose version
+docker compose version
 docker version
 
 trap termination_handler INT TERM
@@ -91,7 +91,7 @@ ${DOCKER_COMPOSE} pull --quiet
 
 ${DOCKER_COMPOSE} build
 ${DOCKER_COMPOSE} up -d 
-${DOCKER_COMPOSE} logs --no-color trino-master cassandra hadoop-master psql1 psql2 ssh kafka &
+${DOCKER_COMPOSE} logs -f -t --no-color trino-master cassandra hadoop-master psql1 psql2 ssh kafka &
 
 retry check_hive
 retry check_trino
diff --git a/tempto-examples/docker/ssh/Dockerfile b/tempto-examples/docker/ssh/Dockerfile
index 2c65a02f..2b2a9784 100755
--- a/tempto-examples/docker/ssh/Dockerfile
+++ b/tempto-examples/docker/ssh/Dockerfile
@@ -1,4 +1,4 @@
-FROM ghcr.io/trinodb/testing/centos7-oj11:53
+FROM ghcr.io/trinodb/testing/almalinux9-oj17:108
 
 RUN yum install -y openssh-server openssh-clients passwd
 RUN echo s3cr37_p@55 | passwd --stdin root
diff --git a/tempto-examples/docker/trino-cli/Dockerfile b/tempto-examples/docker/trino-cli/Dockerfile
index 06ea8ec3..3ff937a6 100755
--- a/tempto-examples/docker/trino-cli/Dockerfile
+++ b/tempto-examples/docker/trino-cli/Dockerfile
@@ -1,4 +1,4 @@
-FROM ghcr.io/trinodb/testing/centos7-oj11:53
+FROM ghcr.io/trinodb/testing/almalinux9-oj17:108
 
-RUN curl -SL https://repo1.maven.org/maven2/io/trino/trino-cli/356/trino-cli-356-executable.jar -o trino-cli.jar
+RUN curl -SL https://repo1.maven.org/maven2/io/trino/trino-cli/472/trino-cli-472-executable.jar -o trino-cli.jar
 
diff --git a/tempto-examples/docker/trino-server/Dockerfile b/tempto-examples/docker/trino-server/Dockerfile
index 2af57fea..2586ad91 100755
--- a/tempto-examples/docker/trino-server/Dockerfile
+++ b/tempto-examples/docker/trino-server/Dockerfile
@@ -1,13 +1,5 @@
-FROM ghcr.io/trinodb/testing/centos7-oj11:53
+FROM trinodb/trino:472
 
-RUN yum install -y tar
+COPY etc /etc/trino
 
-RUN curl -SL https://repo1.maven.org/maven2/io/trino/trino-server/356/trino-server-356.tar.gz \
-      | tar xz \
-      && mv $(find -type d -name 'trino-server*') trino-server
-
-RUN mkdir /trino-server/etc
-
-COPY etc /trino-server/etc/
-
-CMD /trino-server/bin/launcher run
+CMD /usr/lib/trino/bin/run-trino
diff --git a/tempto-examples/docker/trino-server/etc/jvm.config b/tempto-examples/docker/trino-server/etc/jvm.config
index 6d09df2b..49c82526 100644
--- a/tempto-examples/docker/trino-server/etc/jvm.config
+++ b/tempto-examples/docker/trino-server/etc/jvm.config
@@ -1,6 +1,5 @@
 -server
 -Xmx2G
--XX:-UseBiasedLocking
 -XX:+UseG1GC
 -XX:G1HeapRegionSize=32M
 -XX:+ExplicitGCInvokesConcurrent