diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 9d4f066fec..e475ec9f02 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -255,6 +255,10 @@ jobs:
         source .venv/bin/activate
         mkdir "$NLTK_DATA"
         make install-ci
+    - name: Setup docker-compose
+      uses: KengoTODA/actions-setup-docker-compose@v1
+      with:
+        version: '2.22.0'
     - name: Test Ingest (unit)
       run: |
         source .venv/bin/activate
diff --git a/scripts/elasticsearch-test-helpers/create-and-check-es.sh b/scripts/elasticsearch-test-helpers/create-and-check-es.sh
index 12b69726d7..dc06c21a16 100755
--- a/scripts/elasticsearch-test-helpers/create-and-check-es.sh
+++ b/scripts/elasticsearch-test-helpers/create-and-check-es.sh
@@ -5,9 +5,9 @@ set -e
 SCRIPT_DIR=$(dirname "$(realpath "$0")")
 
 # Create the Elasticsearch cluster
-docker-compose --version
-docker-compose -f "$SCRIPT_DIR"/docker-compose.yaml up --wait
-docker-compose -f "$SCRIPT_DIR"/docker-compose.yaml ps
+docker compose version
+docker compose -f "$SCRIPT_DIR"/docker-compose.yaml up --wait
+docker compose -f "$SCRIPT_DIR"/docker-compose.yaml ps
 
 
 echo "Cluster is live."