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 481dc0ad4..000000000
--- a/.ci/opendistro/docker-compose.yml
+++ /dev/null
@@ -1,17 +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/main.yml b/.github/workflows/main.yml
index 89c189fda..17533473f 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -120,39 +120,3 @@ jobs:
           rake bundle:install
       - name: opensearch
         run: cd opensearch && bundle exec rake test_security:all
-
-  test-opendistro:
-    name: test-opendistro
-    runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        ruby: [ 2.5, 2.6, 2.7, '3.0', 3.1, jruby-9.3 ]
-    steps:
-      - uses: actions/checkout@v2
-      - name: Increase system limits
-        run: |
-          sudo swapoff -a
-          sudo sysctl -w vm.swappiness=1
-          sudo sysctl -w fs.file-max=262144
-          sudo sysctl -w vm.max_map_count=262144
-      - name: Launch Opendistro cluster
-        run: |
-          make cluster.clean cluster.opendistro.build cluster.opendistro.start
-      - uses: ruby/setup-ruby@v1
-        with:
-          ruby-version: ${{ matrix.ruby }}
-      - name: Build and test with Rake
-        run: |
-          sudo apt-get update
-          sudo apt-get install libcurl4-openssl-dev
-          ruby -v
-          rake bundle:clean
-          rake bundle:install
-      - name: opensearch-ruby
-        run: cd opensearch && bundle exec rake test:all
-      - name: opensearch-transport
-        run: cd opensearch-transport && bundle exec rake test:all
-      - name: opensearch-api
-        run: cd opensearch-api && bundle exec rake test:spec
-      - name: opensearch-dsl
-        run: cd opensearch-dsl && bundle exec rake test:all
diff --git a/Makefile b/Makefile
index bfbc7373b..696ca907d 100644
--- a/Makefile
+++ b/Makefile
@@ -1,15 +1,5 @@
 SHELL := /bin/bash
 
-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.clean: ## Remove unused Docker volumes and networks
 	@printf "\033[2m→ Cleaning up Docker assets...\033[0m\n"
 	docker volume prune --force
@@ -29,11 +19,6 @@ workflow: ## Run all github workflow commands here sequentially
 	make test-unit race=true
 # Benchmarks Test
 	make test-bench
-# Integration Test
-### OpenDistro
-	make cluster.clean cluster.opendistro.build cluster.opendistro.start
-	make test-integ race=true
-	make cluster.opendistro.stop
 
 ##@ Other
 #------------------------------------------------------------------------------
@@ -42,4 +27,4 @@ help:  ## Display help
 #------------- <https://suva.sh/posts/well-documented-makefiles> --------------
 
 .DEFAULT_GOAL := help
-.PHONY: help backport cluster cluster.opendistro.build cluster.opendistro.start cluster.opendistro.stop cluster.clean coverage  godoc lint release test test-bench test-integ test-unit
+.PHONY: help backport cluster cluster.clean coverage  godoc lint release test test-bench test-integ test-unit