diff --git a/.ci/opendistro/Dockerfile.opendistro b/.ci/opendistro/Dockerfile.opendistro
deleted file mode 100644
index 05f319324..000000000
--- a/.ci/opendistro/Dockerfile.opendistro
+++ /dev/null
@@ -1,7 +0,0 @@
-ARG OPENDISTRO_VERSION
-FROM amazon/opendistro-for-elasticsearch:${OPENDISTRO_VERSION}
-
-ARG es_path=/usr/share/elasticsearch
-
-ARG SECURE_INTEGRATION
-RUN if [ "$SECURE_INTEGRATION" != "true" ] ; then $es_path/bin/elasticsearch-plugin remove opendistro_security; fi
diff --git a/.ci/opendistro/docker-compose.yml b/.ci/opendistro/docker-compose.yml
deleted file mode 100644
index cb25dbce2..000000000
--- a/.ci/opendistro/docker-compose.yml
+++ /dev/null
@@ -1,16 +0,0 @@
-version: '3'
-
-services:
-  elasticsearch:
-    build:
-      context: .
-      dockerfile: Dockerfile.opendistro
-      args:
-        - SECURE_INTEGRATION=${SECURE_INTEGRATION:-false}
-        - OPENDISTRO_VERSION=${OPENDISTRO_VERSION:-latest}
-    environment:
-      - discovery.type=single-node
-      - bootstrap.memory_lock=true
-    ports:
-      - '9200:9200'
-    user: elasticsearch
diff --git a/.github/workflows/bundler.yml b/.github/workflows/bundler.yml
index 7c0e3787b..55cb70876 100644
--- a/.github/workflows/bundler.yml
+++ b/.github/workflows/bundler.yml
@@ -7,10 +7,6 @@ jobs:
     name: Bundler support
     runs-on: ubuntu-latest
 
-    strategy:
-      matrix:
-        cluster: ['opendistro', 'opensearch']
-
     steps:
       - uses: actions/checkout@v2
 
@@ -21,9 +17,9 @@ jobs:
           sudo sysctl -w fs.file-max=262144
           sudo sysctl -w vm.max_map_count=262144
 
-      - name: Runs ${{ matrix.cluster }} cluster
+      - name: Runs OpenSearch cluster
         run: |
-          make cluster.clean cluster.${{ matrix.cluster }}.build cluster.${{ matrix.cluster }}.start
+          make cluster.clean cluster.opensearch.build cluster.opensearch.start
 
       - name: Use Node.js 14.x
         uses: actions/setup-node@v1
diff --git a/.github/workflows/integration.yml b/.github/workflows/integration.yml
index 59f4761d3..5638a30bd 100644
--- a/.github/workflows/integration.yml
+++ b/.github/workflows/integration.yml
@@ -9,7 +9,6 @@ jobs:
 
     strategy:
       matrix:
-        cluster: ['opendistro', 'opensearch']
         node-version: [10.x, 12.x, 14.x, 16.x]
 
     steps:
@@ -22,9 +21,9 @@ jobs:
           sudo sysctl -w fs.file-max=262144
           sudo sysctl -w vm.max_map_count=262144
 
-      - name: Runs ${{ matrix.cluster }} cluster
+      - name: Runs OpenSearch cluster
         run: |
-          make cluster.clean cluster.${{ matrix.cluster }}.build cluster.${{ matrix.cluster }}.start
+          make cluster.clean cluster.opensearch.build cluster.opensearch.start
 
       - name: Use Node.js ${{ matrix.node-version }}
         uses: actions/setup-node@v1
@@ -45,7 +44,6 @@ jobs:
 
     strategy:
       matrix:
-        cluster: ['opendistro', 'opensearch']
         node-version: [10.x, 12.x, 14.x, 16.x]
 
     steps:
@@ -58,10 +56,10 @@ jobs:
           sudo sysctl -w fs.file-max=262144
           sudo sysctl -w vm.max_map_count=262144
 
-      - name: Runs ${{ matrix.cluster }} secure cluster
+      - name: Runs OpenSearch secure cluster
         run: |
           export SECURE_INTEGRATION=true
-          make cluster.clean cluster.${{ matrix.cluster }}.build cluster.${{ matrix.cluster }}.start
+          make cluster.clean cluster.opensearch.build cluster.opensearch.start
 
       - name: Use Node.js ${{ matrix.node-version }}
         uses: actions/setup-node@v1
diff --git a/Makefile b/Makefile
index 9c5984d9d..1ddd73f75 100644
--- a/Makefile
+++ b/Makefile
@@ -1,13 +1,3 @@
-cluster.opendistro.build:
-	docker-compose --project-directory .ci/opendistro build;
-
-cluster.opendistro.start:
-	docker-compose --project-directory .ci/opendistro up -d ;
-	sleep 20;
-
-cluster.opendistro.stop:
-	docker-compose --project-directory .ci/opendistro down ;
-
 cluster.opensearch.build:
 	docker-compose --project-directory .ci/opensearch build;
 
@@ -24,4 +14,4 @@ cluster.clean: ## Remove unused Docker volumes and networks
 	docker network prune --force
 	docker system prune --volumes --force
 
-.PHONY: cluster.opendistro.build cluster.opendistro.start cluster.opendistro.stop cluster.opensearch.build cluster.opensearch.start cluster.opensearch.stop cluster.clean
+.PHONY: cluster.opensearch.build cluster.opensearch.start cluster.opensearch.stop cluster.clean