diff --git a/docker-compose.yml b/docker-compose.yml
index 1acb93b..2f52811 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -17,7 +17,7 @@
 version: '3'
 services:
   dry-run:
-    image: gradle:6.8-jdk
+    image: gradle:7.4.2-jdk17
     working_dir: /src
     command: sh -c "./docker.sh dry-run"
     network_mode: "host"
@@ -26,7 +26,7 @@
       - gradle-cache:/home/gradle/.gradle
 
   publish-release-for-voting:
-    image: gradle:6.8-jdk
+    image: gradle:7.4.2-jdk17
     working_dir: /src
     command: sh -c "./docker.sh publish-release-for-voting"
     volumes:
@@ -34,7 +34,7 @@
       - gradle-cache:/home/gradle/.gradle
 
   clean:
-    image: gradle:6.8-jdk
+    image: gradle:7.4.2-jdk17
     working_dir: /src
     command: sh -c "./docker.sh clean"
     volumes:
@@ -42,7 +42,7 @@
       - gradle-cache:/home/gradle/.gradle
 
   promote-release:
-    image: gradle:6.8-jdk
+    image: gradle:7.4.2-jdk17
     working_dir: /src
     command: sh -c "./docker.sh promote-release"
     volumes:
@@ -50,7 +50,7 @@
       - gradle-cache:/home/gradle/.gradle
 
   test:
-    image: gradle:6.8-jdk
+    image: gradle:7.4.2-jdk17
     working_dir: /src
     command: sh -c "./docker.sh test"
     volumes:
diff --git a/site/docker-compose.yml b/site/docker-compose.yml
index 97c7d16..5a15308 100644
--- a/site/docker-compose.yml
+++ b/site/docker-compose.yml
@@ -29,7 +29,7 @@
     volumes:
       - .:/srv/jekyll
   generate-javadoc:
-    image: openjdk:15
+    image: openjdk:17
     working_dir: /usr/src/calcite-avatica
     command: sh -c "./gradlew javadocAggregate; rm -rf site/target/avatica/javadocAggregate; mkdir -p site/target/avatica; mv build/docs/javadocAggregate site/target/avatica"
     volumes: