diff --git a/cmd/jaeger/internal/components.go b/cmd/jaeger/internal/components.go
index 5441fe91b40..31b171e0388 100644
--- a/cmd/jaeger/internal/components.go
+++ b/cmd/jaeger/internal/components.go
@@ -6,12 +6,14 @@ package internal
 import (
 	"github.com/open-telemetry/opentelemetry-collector-contrib/connector/spanmetricsconnector"
 	"github.com/open-telemetry/opentelemetry-collector-contrib/exporter/kafkaexporter"
+	"github.com/open-telemetry/opentelemetry-collector-contrib/exporter/nopexporter"
 	"github.com/open-telemetry/opentelemetry-collector-contrib/exporter/prometheusexporter"
 	"github.com/open-telemetry/opentelemetry-collector-contrib/extension/healthcheckv2extension"
 	"github.com/open-telemetry/opentelemetry-collector-contrib/processor/attributesprocessor"
 	"github.com/open-telemetry/opentelemetry-collector-contrib/processor/tailsamplingprocessor"
 	"github.com/open-telemetry/opentelemetry-collector-contrib/receiver/jaegerreceiver"
 	"github.com/open-telemetry/opentelemetry-collector-contrib/receiver/kafkareceiver"
+	"github.com/open-telemetry/opentelemetry-collector-contrib/receiver/nopreceiver"
 	"github.com/open-telemetry/opentelemetry-collector-contrib/receiver/zipkinreceiver"
 	"go.opentelemetry.io/collector/component"
 	"go.opentelemetry.io/collector/connector"
diff --git a/docs/jaeger-query-v2-setup.md b/docs/jaeger-query-v2-setup.md
new file mode 100644
index 00000000000..1063b7e1321
--- /dev/null
+++ b/docs/jaeger-query-v2-setup.md
@@ -0,0 +1,56 @@
+# Jaeger Query v2 Setup Guide
+
+## Overview
+This guide explains the integration of Jaeger Query v2 into the Jaeger project. It includes details on the updated configuration, CI workflow, and how to use the new setup effectively.
+
+## What Has Changed?
+-  Jaeger Query v2 Support: Integrated into the CI/CD pipeline.
+- Updated `ci-crossdock.yml` : Includes a step for running Jaeger Query v2.
+
+## How to Use the New Configuration
+### 1. Configuration File
+- The configuration file is located at `cmd/config-query.yml`.
+- Key changes include:
+  - Support for in-memory storage.
+  - Prometheus metrics configuration.
+  - UI static files and index file setup.
+
+### 2. Running Jaeger Query v2
+- Use the following command to run Jaeger Query v2:
+  ```bash
+  docker run -d \
+    --name jaeger-query-v2 \
+    --rm \
+    -p 16686:16686 \ # UI port
+    -p 16685:16685 \ # Query service port
+    -v ./cmd/jaeger/config.yaml:/etc/jaeger/config.yaml \
+    jaegertracing/all-in-one:latest \
+    --query.base-path=/jaeger
+  ```
+
+### 3. CI Workflow Integration
+The CI workflow (`ci-crossdock.yml`) has been updated to:
+- Include a step for running Jaeger Query v2 during testing.
+- Ensure tests run against the new configuration.
+
+## Additional Notes
+- For more details, refer to the [`README.md`](/docs/jaeger-query-v2-setup.md) and [`CONTRIBUTING.md`](CONTRIBUTING.md) files as per the Jaeger documentation.
+
+<!-- ## Troubleshooting
+- If you encounter issues with the configuration, verify that the `config-query.yml` file is correctly mounted in the container.
+- Ensure that the required ports (`16686` and `16685`) are not in use by other services. -->
+
+# Troubleshooting Jaeger Query v2
+
+Jaeger Query v2 is not starting?
+- Check that `config-query.yml` is correctly mounted in the container.
+- Ensure required ports (`16686`, `16685`) are available.
+
+No traces appearing in the UI?
+- Verify the **storage backend configuration** in `config-query.yml`.
+- Confirm that your application is sending traces to Jaeger.
+
+CI/CD workflow failing?
+- Run the following command to inspect logs for errors:
+  ```bash
+  docker logs jaeger-query-v2