diff --git a/.env b/.env
index 8047cb847a..41d77b0b8f 100644
--- a/.env
+++ b/.env
@@ -6,15 +6,15 @@ IMAGE_NAME=ghcr.io/open-telemetry/demo
 DEMO_VERSION=latest
 
 # Dependent images
-COLLECTOR_CONTRIB_IMAGE=otel/opentelemetry-collector-contrib:0.93.0
-GRAFANA_IMAGE=grafana/grafana:10.3.1
-JAEGERTRACING_IMAGE=jaegertracing/all-in-one:1.53
+COLLECTOR_CONTRIB_IMAGE=otel/opentelemetry-collector-contrib:0.96.0
+GRAFANA_IMAGE=grafana/grafana:10.4.0
+JAEGERTRACING_IMAGE=jaegertracing/all-in-one:1.55
 # must also update version field in /src/grafana/provisioning/datasources/opensearch.yml
-OPENSEARCH_IMAGE=opensearchproject/opensearch:2.11.1
-POSTGRES_IMAGE=postgres:16.1
-PROMETHEUS_IMAGE=quay.io/prometheus/prometheus:v2.49.1
+OPENSEARCH_IMAGE=opensearchproject/opensearch:2.12.0
+POSTGRES_IMAGE=postgres:16.2
+PROMETHEUS_IMAGE=quay.io/prometheus/prometheus:v2.50.1
 REDIS_IMAGE=redis:7.2-alpine
-TRACETEST_IMAGE_VERSION=v0.15.8
+TRACETEST_IMAGE_VERSION=v0.16.0
 TRACETEST_IMAGE=kubeshop/tracetest:${TRACETEST_IMAGE_VERSION}
 
 # Demo Platform
diff --git a/.gitignore b/.gitignore
index 1c397217b5..8327d1d2cc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,6 +11,8 @@
 .DS_Store
 \#*\#
 
+docker-compose.override.yml
+
 # Eclipse
 .classpath
 .project
diff --git a/src/currencyservice/src/server.cpp b/src/currencyservice/src/server.cpp
index e824e9ff39..218f2881b6 100644
--- a/src/currencyservice/src/server.cpp
+++ b/src/currencyservice/src/server.cpp
@@ -207,12 +207,12 @@ class CurrencyService final : public oteldemo::CurrencyService::Service
 
       CurrencyCounter(to_code);
 
-      // End the span
       span->AddEvent("Conversion successful, response sent back");
       span->SetStatus(StatusCode::kOk);
 
       logger->Info(std::string(__func__) + " conversion successful");
-
+      
+      // End the span
       span->End();
       return Status::OK;
 
diff --git a/src/grafana/provisioning/datasources/opensearch.yaml b/src/grafana/provisioning/datasources/opensearch.yaml
index a6c085b122..0300bc72d7 100644
--- a/src/grafana/provisioning/datasources/opensearch.yaml
+++ b/src/grafana/provisioning/datasources/opensearch.yaml
@@ -17,4 +17,4 @@ datasources:
       logMessageField: body
       pplEnabled: true
       timeField: observedTimestamp
-      version: 2.11.1
+      version: 2.12.0