diff --git a/.github/workflows/elasticsearch.yml b/.github/workflows/elasticsearch.yml
index f865ca6..f08ebd4 100644
--- a/.github/workflows/elasticsearch.yml
+++ b/.github/workflows/elasticsearch.yml
@@ -174,7 +174,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        elasticsearch: ["8.18.0-SNAPSHOT"]
+        elasticsearch: ["8.18.0-SNAPSHOT", "9.0.0-SNAPSHOT"]
     steps:
       - name: Checkout
         uses: actions/checkout@v1
diff --git a/elasticsearch/run-elasticsearch.sh b/elasticsearch/run-elasticsearch.sh
index ae096ea..d7e0fba 100755
--- a/elasticsearch/run-elasticsearch.sh
+++ b/elasticsearch/run-elasticsearch.sh
@@ -131,7 +131,7 @@ do
   fi
 done
 
-if [ "x${MAJOR_VERSION}" == 'x8' ] && [ "${SECURITY_ENABLED}" == 'true' ]; then
+if ([ "x${MAJOR_VERSION}" == 'x8' ] || [ "x${MAJOR_VERSION}" == 'x9' ]) && [ "${SECURITY_ENABLED}" == 'true' ]; then
   docker run \
     --network $NETWORK_NAME \
     --rm \