diff --git a/CHANGELOG.md b/CHANGELOG.md
index 977df3a7..06685162 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,9 @@
 * **Overall**
   * [CHANGE] Use with Kubernetes versions prior to 1.26 produce WARNING message
   * [CHANGE] Drop support for OpenShift 4.12; the minimum supported version of OpenShift is now 4.14
+* **Tracing**
+  * [UPGRADE] Upgraded Tempo from 2.7.0 to 2.9.0
+  * [UPGRADE] Upgraded Tempo Helm chart from 1.18.1 to 1.24.1
 
 
 ## Version 1.2.44 (18NOV2025)
diff --git a/component_versions.env b/component_versions.env
index b2cfb5c6..fd15b660 100644
--- a/component_versions.env
+++ b/component_versions.env
@@ -71,5 +71,5 @@ PUSHGATEWAY_FULL_IMAGE="quay.io/prometheus/pushgateway:v1.11.1"
 #Tempo
 TEMPO_CHART_REPO=grafana
 TEMPO_CHART_NAME=tempo
-TEMPO_CHART_VERSION=1.18.1
-TEMPO_FULL_IMAGE="docker.io/grafana/tempo:2.7.0"
+TEMPO_CHART_VERSION=1.24.1
+TEMPO_FULL_IMAGE="docker.io/grafana/tempo:2.9.0"
diff --git a/monitoring/grafana-datasource-tempo.yaml b/monitoring/grafana-datasource-tempo.yaml
index be81cdbb..798d547d 100644
--- a/monitoring/grafana-datasource-tempo.yaml
+++ b/monitoring/grafana-datasource-tempo.yaml
@@ -5,24 +5,26 @@ grafana:
   datasources:
     datasources.yaml:
      apiVersion: 1
+     prune: true
+     deleteDatasources:
+       - name: Tempo
      datasources:
-      - name: Tempo
-        type: tempo
-        url: http://v4m-tempo:3100
-        isDefault: false
-        editable: true
-        jsonData:
-          tracesToLogsV2:
-            datasourceUid: 'ViyaLogs'
-            filterByTraceID: true
-            # spanStartTimeShift: '1h'
-            # spanEndTimeShift: '-1h'
-            # tags: ['job', 'instance', 'pod', 'namespace']
-            # filterBySpanID: false
-            # customQuery: true
-            # query: 'method="${__span.tags.method}"'
-          serviceMap:
-            datasourceUid: prometheus
-          nodeGraph:
-            enabled: true
-        apiVersion: 1
+       - name: Tempo
+         type: tempo
+         url: http://v4m-tempo:3200
+         isDefault: false
+         editable: true
+         jsonData:
+           tracesToLogsV2:
+             datasourceUid: 'ViyaLogs'
+             filterByTraceID: true
+             # spanStartTimeShift: '1h'
+             # spanEndTimeShift: '-1h'
+             # tags: ['job', 'instance', 'pod', 'namespace']
+             # filterBySpanID: false
+             # customQuery: true
+             # query: 'method="${__span.tags.method}"'
+           serviceMap:
+             datasourceUid: prometheus
+           nodeGraph:
+             enabled: true
diff --git a/monitoring/openshift/tempo-values.yaml b/monitoring/openshift/tempo-values.yaml
index 78640073..3cb5bccc 100644
--- a/monitoring/openshift/tempo-values.yaml
+++ b/monitoring/openshift/tempo-values.yaml
@@ -22,7 +22,7 @@ tempo:
   # Refers to https://grafana.com/docs/tempo/latest/configuration/#server
   server:
     # -- HTTP server listen port
-    http_listen_port: 3100
+    http_listen_port: 3200
   storage:
     trace:
       # tempo storage backend
diff --git a/monitoring/tempo_container_image.template b/monitoring/tempo_container_image.template
index 8b64a5af..b5ee9139 100644
--- a/monitoring/tempo_container_image.template
+++ b/monitoring/tempo_container_image.template
@@ -1,5 +1,6 @@
 tempo:
- repository: __IMAGE_REPO_3LEVEL__
+ registry: __IMAGE_REGISTRY__
+ repository: __IMAGE_REPO_2LEVEL__
  tag: __IMAGE_TAG__
  pullPolicy: __IMAGE_PULL_POLICY__
  pullSecrets: __IMAGE_PULL_SECRETS__           
diff --git a/monitoring/values-tempo.yaml b/monitoring/values-tempo.yaml
index 0181da88..73d0c024 100644
--- a/monitoring/values-tempo.yaml
+++ b/monitoring/values-tempo.yaml
@@ -33,7 +33,7 @@ tempo:
   # Refers to https://grafana.com/docs/tempo/latest/configuration/#server
   server:
     # -- HTTP server listen port
-    http_listen_port: 3100
+    http_listen_port: 3200
     grpc_server_max_recv_msg_size: 500000000
     grpc_server_max_send_msg_size: 500000000