diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index d4db8462a..b247ec2e0 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -30,8 +30,7 @@ jobs:
           sudo sysctl -w vm.max_map_count=262144
       - uses: ./.github/actions/opensearch
         with:
-          # TODO: change cluster-version back to `latest` after OS 2.9.1 or later is released
-          cluster-version: "2.8.0"
+          cluster-version: latest
           disable-security: true
       - uses: ruby/setup-ruby@v1
         with:
@@ -65,8 +64,7 @@ jobs:
           sudo sysctl -w vm.max_map_count=262144
       - uses: ./.github/actions/opensearch
         with:
-          # TODO: change cluster-version back to `latest` after OS 2.9.1 or later is released
-          cluster-version: "2.8.0"
+          cluster-version: latest
           disable-security: true
       - uses: ruby/setup-ruby@v1
         with:
diff --git a/CHANGELOG.md b/CHANGELOG.md
index f21165622..32558f69d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,6 +8,7 @@ Inspired from [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
 ### Deprecated
 ### Removed
 ### Fixed
+- Switch back to the latest OpenSearch version when testing in CI ([#219](https://github.com/opensearch-project/opensearch-ruby/pull/219))
 ### Security
 
 ## [3.1.0]