diff --git a/docker-compose.yml b/docker-compose.yml
index b94e3dfdd2..e4aaf967df 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,7 +1,7 @@
 # Copyright The OpenTelemetry Authors
 # SPDX-License-Identifier: Apache-2.0
 
-version: '3.9'
+version: "3.9"
 x-default-logging: &logging
   driver: "json-file"
   options:
@@ -175,7 +175,7 @@ services:
     environment:
       - CURRENCY_SERVICE_PORT
       - OTEL_EXPORTER_OTLP_ENDPOINT
-      - OTEL_RESOURCE_ATTRIBUTES=${OTEL_RESOURCE_ATTRIBUTES},service.name=currencyservice   # The C++ SDK does not support OTEL_SERVICE_NAME
+      - OTEL_RESOURCE_ATTRIBUTES=${OTEL_RESOURCE_ATTRIBUTES},service.name=currencyservice # The C++ SDK does not support OTEL_SERVICE_NAME
     depends_on:
       otelcol:
         condition: service_started
@@ -222,8 +222,8 @@ services:
           memory: 175M
     restart: unless-stopped
     ports:
-      - "${FEATURE_FLAG_SERVICE_PORT}:${FEATURE_FLAG_SERVICE_PORT}"     # Feature Flag Service UI
-      - "${FEATURE_FLAG_GRPC_SERVICE_PORT}"                             # Feature Flag Service gRPC API
+      - "${FEATURE_FLAG_SERVICE_PORT}:${FEATURE_FLAG_SERVICE_PORT}" # Feature Flag Service UI
+      - "${FEATURE_FLAG_GRPC_SERVICE_PORT}" # Feature Flag Service gRPC API
     environment:
       - FEATURE_FLAG_SERVICE_PORT
       - FEATURE_FLAG_GRPC_SERVICE_PORT
@@ -232,7 +232,15 @@ services:
       - OTEL_SERVICE_NAME=featureflagservice
       - DATABASE_URL=ecto://ffs:ffs@ffs_postgres:5432/ffs
     healthcheck:
-      test: ["CMD", "curl", "-H", "baggage: synthetic_request=true", "-f", "http://localhost:${FEATURE_FLAG_SERVICE_PORT}"]
+      test:
+        [
+          "CMD",
+          "curl",
+          "-H",
+          "baggage: synthetic_request=true",
+          "-f",
+          "http://localhost:${FEATURE_FLAG_SERVICE_PORT}",
+        ]
     depends_on:
       ffs_postgres:
         condition: service_healthy
@@ -447,7 +455,7 @@ services:
     deploy:
       resources:
         limits:
-          memory: 500M               # This is high to enable supporting the recommendationCache feature flag use case
+          memory: 500M # This is high to enable supporting the recommendationCache feature flag use case
     restart: unless-stopped
     ports:
       - "${RECOMMENDATION_SERVICE_PORT}"
@@ -597,7 +605,6 @@ services:
       - "${REDIS_PORT}"
     logging: *logging
 
-
   # ********************
   # Telemetry Components
   # ********************
@@ -616,8 +623,8 @@ services:
           memory: 300M
     restart: unless-stopped
     ports:
-      - "${JAEGER_SERVICE_PORT}"                    # Jaeger UI
-      - "4317"                                      # OTLP gRPC default port
+      - "${JAEGER_SERVICE_PORT}" # Jaeger UI
+      - "4317" # OTLP gRPC default port
       - "14269:14269"
       - "14268:14268"
       - "14267:14267"
@@ -635,6 +642,33 @@ services:
     depends_on:
       - opensearch
 
+  jaeger-query:
+    image: jaegertracing/jaeger-query:latest
+    container_name: jaeger-query
+    command:
+      - "--metrics-backend=prometheus"
+      - "--es.server-urls=https://opensearch-node1:9200"
+      - "--es.tls.enabled=true"
+    deploy:
+      resources:
+        limits:
+          memory: 300M
+    restart: unless-stopped
+    ports:
+      - 16685
+    environment:
+      - COLLECTOR_OTLP_ENABLED=true
+      - METRICS_STORAGE_TYPE=prometheus
+      - SPAN_STORAGE_TYPE=opensearch
+      - ES_TAGS_AS_FIELDS_ALL=true
+      - ES_USERNAME=admin
+      - ES_PASSWORD=admin
+      - ES_TLS_SKIP_HOST_VERIFY=true
+    depends_on:
+      - opensearch-node1
+      - opensearch-node2
+    logging: *logging
+
   jaeger-agent:
     image: jaegertracing/jaeger-agent:latest
     container_name: jaeger-agent
@@ -678,18 +712,24 @@ services:
         limits:
           memory: 125M
     restart: unless-stopped
-    command: [ "--config=/etc/otelcol-config.yml", "--config=/etc/otelcol-config-extras.yml" ]
+    command:
+      [
+        "--config=/etc/otelcol-config.yml",
+        "--config=/etc/otelcol-observability.yml",
+        "--config=/etc/otelcol-config-extras.yml",
+      ]
     volumes:
       - ./src/otelcollector/otelcol-config.yml:/etc/otelcol-config.yml
       - ./src/otelcollector/otelcol-config-extras.yml:/etc/otelcol-config-extras.yml
     ports:
-      - "4317"            # OTLP over gRPC receiver
-      - "4318:4318"       # OTLP over HTTP receiver
-      - "13133:13133"     # health check port
-      - "9464"            # Prometheus exporter
-      - "8888"            # metrics endpoint
+      - "4317" # OTLP over gRPC receiver
+      - "4318:4318" # OTLP over HTTP receiver
+      - "13133:13133" # health check port
+      - "9464" # Prometheus exporter
+      - "8888" # metrics endpoint
     depends_on:
       - jaeger-agent
+      - jaeger-query
       - data-prepper
     logging: *logging
     environment:
@@ -909,7 +949,7 @@ services:
       otelcol:
         condition: service_started
     healthcheck:
-      test: [ "CMD", "wget", "--spider", "localhost:11633" ]
+      test: ["CMD", "wget", "--spider", "localhost:11633"]
       interval: 1s
       timeout: 3s
       retries: 60
diff --git a/src/adservice/build.gradle b/src/adservice/build.gradle
index dfc4058911..77740864c9 100644
--- a/src/adservice/build.gradle
+++ b/src/adservice/build.gradle
@@ -16,6 +16,7 @@ description = 'Ad Service'
 group = "adservice"
 version = "0.1.0-SNAPSHOT"
 
+
 def opentelemetryVersion = "1.28.0"
 def opentelemetryInstrumentationAlphaVersion = "1.28.0-alpha"
 def grpcVersion = "1.56.1"
diff --git a/src/frauddetectionservice/build.gradle.kts b/src/frauddetectionservice/build.gradle.kts
index 86c569e7f0..5ae589ebc2 100644
--- a/src/frauddetectionservice/build.gradle.kts
+++ b/src/frauddetectionservice/build.gradle.kts
@@ -15,9 +15,8 @@ group = "io.opentelemetry"
 version = "1.0"
 
 
-val grpcVersion = "1.56.1"
-val protobufVersion = "3.23.4"
-
+val grpcVersion = "1.57.0"
+val protobufVersion = "3.16.1"
 
 repositories {
     mavenCentral()
diff --git a/src/loadgenerator/requirements.txt b/src/loadgenerator/requirements.txt
index b585f1a75d..7814c79258 100644
--- a/src/loadgenerator/requirements.txt
+++ b/src/loadgenerator/requirements.txt
@@ -1,14 +1,14 @@
 backoff==2.2.1
 brotli==1.0.9
-certifi==2022.12.7
+certifi==2023.7.22
 charset-normalizer==3.1.0
 click==8.1.6
 configargparse==1.5.5
 deprecated==1.2.14
 flask==2.3.3
 flask-basicauth==0.2.0
-flask-cors==4.0.0
-gevent==23.7.0
+flask-cors==3.0.10
+gevent==23.9.0
 geventhttpclient==2.0.9
 googleapis-common-protos==1.59.1
 greenlet==2.0.2
diff --git a/test/tracetesting/tracetest-provision.yaml b/test/tracetesting/tracetest-provision.yaml
index 27f4ff8b95..d6fe7fce16 100644
--- a/test/tracetesting/tracetest-provision.yaml
+++ b/test/tracetesting/tracetest-provision.yaml
@@ -26,7 +26,7 @@ spec:
   name: Jaeger
   type: jaeger
   jaeger:
-    endpoint: jaeger:16685
+    endpoint: jaeger-query:16685
     tls:
       insecure: true
 ---