diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml
index 9e09d27..0300842 100644
--- a/.github/workflows/tests.yaml
+++ b/.github/workflows/tests.yaml
@@ -30,11 +30,11 @@ jobs:
           - [phoenix, 1.3-4.13]
           - [phoenix, 1.4-4.14]
           - [phoenix, 2.0-5.0]
-          - [hsqldb, 1.18.0]
-          - [hsqldb, 1.19.0]
           - [hsqldb, 1.20.0]
           - [hsqldb, 1.21.0]
           - [hsqldb, 1.22.0]
+          - [hsqldb, 1.23.0]
+          - [hsqldb, 1.24.0]
 
     runs-on: ubuntu-latest
 
diff --git a/docker-compose.yml b/docker-compose.yml
index 9f54e59..7d9204b 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -19,7 +19,7 @@ services:
     image: ghcr.io/boostport/hbase-phoenix-all-in-one:${PHOENIX_VERSION:-2.0-5.0}
 
   hsqldb:
-    image: apache/calcite-avatica-hypersql:${HSQLDB_VERSION:-1.22.0}
+    image: apache/calcite-avatica-hypersql:${HSQLDB_VERSION:-1.24.0}
     command: -u jdbc:hsqldb:mem:public
 
   test:
@@ -104,7 +104,7 @@ services:
     working_dir: /source
     command: sh -c "./docker.sh compile-protobuf"
     environment:
-      AVATICA_VERSION: 1.22.0
+      AVATICA_VERSION: 1.24.0
       PROTOBUF_VERSION: 21.5
     volumes:
       - .:/source