diff --git a/docs/docs/concepts/apis/api_providers.mdx b/docs/docs/concepts/apis/api_providers.mdx
index 5f0fe2ac7..fd2af3854 100644
--- a/docs/docs/concepts/apis/api_providers.mdx
+++ b/docs/docs/concepts/apis/api_providers.mdx
@@ -9,7 +9,7 @@ sidebar_position: 2
 
 The goal of Llama Stack is to build an ecosystem where users can easily swap out different implementations for the same API. Examples for these include:
 - LLM inference providers (e.g., Fireworks, Together, AWS Bedrock, Groq, Cerebras, SambaNova, vLLM, etc.),
-- Vector databases (e.g., ChromaDB, Weaviate, Qdrant, Milvus, FAISS, PGVector, etc.),
+- Vector databases (e.g., ChromaDB, Weaviate, Qdrant, Milvus, FAISS, PGVector, Elasticsearch, etc.),
 - Safety providers (e.g., Meta's Llama Guard, AWS Bedrock Guardrails, etc.)
 
 Providers come in two flavors:
diff --git a/docs/docs/index.mdx b/docs/docs/index.mdx
index 8c17283f9..41cbd79c6 100644
--- a/docs/docs/index.mdx
+++ b/docs/docs/index.mdx
@@ -54,7 +54,7 @@ Llama Stack consists of a server (with multiple pluggable API providers) and Cli
 Llama Stack provides adapters for popular providers across all API categories:
 
 - **Inference**: Meta Reference, Ollama, Fireworks, Together, NVIDIA, vLLM, AWS Bedrock, OpenAI, Anthropic, and more
-- **Vector Databases**: FAISS, Chroma, Milvus, Postgres, Weaviate, Qdrant, and others
+- **Vector Databases**: FAISS, Chroma, Milvus, Postgres, Weaviate, Qdrant, Elasticsearch and others
 - **Safety**: Llama Guard, Prompt Guard, Code Scanner, AWS Bedrock
 - **Training & Evaluation**: HuggingFace, TorchTune, NVIDIA NEMO
 
diff --git a/docs/docs/providers/index.mdx b/docs/docs/providers/index.mdx
index bfc16b29a..05bb3e700 100644
--- a/docs/docs/providers/index.mdx
+++ b/docs/docs/providers/index.mdx
@@ -9,7 +9,7 @@ sidebar_position: 1
 
 The goal of Llama Stack is to build an ecosystem where users can easily swap out different implementations for the same API. Examples for these include:
 - LLM inference providers (e.g., Meta Reference, Ollama, Fireworks, Together, AWS Bedrock, Groq, Cerebras, SambaNova, vLLM, OpenAI, Anthropic, Gemini, WatsonX, etc.),
-- Vector databases (e.g., FAISS, SQLite-Vec, ChromaDB, Weaviate, Qdrant, Milvus, PGVector, etc.),
+- Vector databases (e.g., FAISS, SQLite-Vec, ChromaDB, Weaviate, Qdrant, Milvus, PGVector, Elasticsearch, etc.),
 - Safety providers (e.g., Meta's Llama Guard, Prompt Guard, Code Scanner, AWS Bedrock Guardrails, etc.),
 - Tool Runtime providers (e.g., RAG Runtime, Brave Search, etc.)
 
diff --git a/docs/sidebars.ts b/docs/sidebars.ts
index 641c2eed3..a0da4c518 100644
--- a/docs/sidebars.ts
+++ b/docs/sidebars.ts
@@ -159,7 +159,8 @@ const sidebars: SidebarsConfig = {
             'providers/vector_io/remote_milvus',
             'providers/vector_io/remote_pgvector',
             'providers/vector_io/remote_qdrant',
-            'providers/vector_io/remote_weaviate'
+            'providers/vector_io/remote_weaviate',
+            'providers/vector_io/remote_elasticsearch'
           ],
         },
         {
diff --git a/pyproject.toml b/pyproject.toml
index 3bd448943..4ffbfd1e8 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -323,6 +323,7 @@ exclude = [
     "^src/llama_stack/providers/remote/vector_io/qdrant/",
     "^src/llama_stack/providers/remote/vector_io/sample/",
     "^src/llama_stack/providers/remote/vector_io/weaviate/",
+    "^src/llama_stack/providers/remote/vector_io/elasticsearch/",
     "^src/llama_stack/providers/utils/bedrock/client\\.py$",
     "^src/llama_stack/providers/utils/bedrock/refreshable_boto_session\\.py$",
     "^src/llama_stack/providers/utils/inference/embedding_mixin\\.py$",
diff --git a/src/llama_stack/distributions/ci-tests/build.yaml b/src/llama_stack/distributions/ci-tests/build.yaml
index f29ac7712..4305cc9b1 100644
--- a/src/llama_stack/distributions/ci-tests/build.yaml
+++ b/src/llama_stack/distributions/ci-tests/build.yaml
@@ -27,6 +27,7 @@ distribution_spec:
     - provider_type: remote::pgvector
     - provider_type: remote::qdrant
     - provider_type: remote::weaviate
+    - provider_type: remote::elasticsearch
     files:
     - provider_type: inline::localfs
     safety:
diff --git a/llama_stack/providers/remote/vector_io/elasticsearch/__init__.py b/src/llama_stack/providers/remote/vector_io/elasticsearch/__init__.py
similarity index 100%
rename from llama_stack/providers/remote/vector_io/elasticsearch/__init__.py
rename to src/llama_stack/providers/remote/vector_io/elasticsearch/__init__.py
diff --git a/llama_stack/providers/remote/vector_io/elasticsearch/config.py b/src/llama_stack/providers/remote/vector_io/elasticsearch/config.py
similarity index 100%
rename from llama_stack/providers/remote/vector_io/elasticsearch/config.py
rename to src/llama_stack/providers/remote/vector_io/elasticsearch/config.py
diff --git a/llama_stack/providers/remote/vector_io/elasticsearch/elasticsearch.py b/src/llama_stack/providers/remote/vector_io/elasticsearch/elasticsearch.py
similarity index 100%
rename from llama_stack/providers/remote/vector_io/elasticsearch/elasticsearch.py
rename to src/llama_stack/providers/remote/vector_io/elasticsearch/elasticsearch.py