diff --git a/mta-single-tenant.yaml b/mta-single-tenant.yaml
index e7252ba0..5fc7eb2d 100644
--- a/mta-single-tenant.yaml
+++ b/mta-single-tenant.yaml
@@ -5,9 +5,9 @@ description: "Bookshop CAP Java Project with UI"
 parameters:
   enable-parallel-deployments: true
 modules:
-# --------------------- SERVER MODULE ------------------------
+  # --------------------- SERVER MODULE ------------------------
   - name: bookshop-srv
-# ------------------------------------------------------------
+    # ------------------------------------------------------------
     type: java
     path: srv
     parameters:
@@ -19,9 +19,21 @@ modules:
       readiness-health-check-type: http
       readiness-health-check-http-endpoint: /actuator/health/readiness
     properties:
-        SPRING_PROFILES_ACTIVE: cloud,sandbox
-        JBP_CONFIG_COMPONENTS: "jres: ['com.sap.xs.java.buildpack.jre.SAPMachineJRE']"
-        JBP_CONFIG_SAP_MACHINE_JRE: '{ version: 21.+ }'
+      SPRING_PROFILES_ACTIVE: cloud,sandbox
+      JBP_CONFIG_COMPONENTS: "jres: ['com.sap.xs.java.buildpack.jre.SAPMachineJRE']"
+      JBP_CONFIG_SAP_MACHINE_JRE: '{ version: 21.+ }'
+      JBP_CONFIG_JAVA_OPTS:
+        from_environment: false
+        java_opts: >
+          -javaagent:META-INF/.sap_java_buildpack/otel_agent/opentelemetry-javaagent.jar
+          -Dotel.javaagent.extensions=META-INF/.sap_java_buildpack/otel_agent_extension/otel-agent-ext-java.jar
+          -Dotel.javaagent.extension.sap.cf.binding.dynatrace.metrics.token-name=metrics_token
+      OTEL_METRICS_EXPORTER: dynatrace, cloud-logging
+      OTEL_TRACES_EXPORTER: cloud-logging
+      OTEL_LOGS_EXPORTER: none
+    #         -javaagent:META-INF/.sap_java_buildpack/otel_agent/opentelemetry-javaagent.jar
+    #         -Dotel.javaagent.extensions=BOOT-INF/lib/cf-java-logging-support-opentelemetry-agent-extension-3.8.5.jar
+    #         -Dotel.javaagent.debug=true
     build-parameters:
       builder: custom
       commands:
@@ -30,14 +42,15 @@ modules:
     requires:
       - name: bookshop-hdi-container
       - name: bookshop-uaa
-      - name: cf-logging
+      - name: bookshop-cloud-logging
+      - name: dynatrace
     provides:
       - name: srv-api
         properties:
           srv-url: '${default-url}'
-# --------------------- DB MODULE ---------------------------
+  # --------------------- DB MODULE ---------------------------
   - name: bookshop-db
-# -----------------------------------------------------------
+    # -----------------------------------------------------------
     type: hdb
     path: db
     parameters:
@@ -50,30 +63,30 @@ modules:
         - name: bookshop-srv
     requires:
       - name: bookshop-hdi-container
-# --------------------- APPROUTER MODULE ---------------------
+  # --------------------- APPROUTER MODULE ---------------------
   - name: bookshop-app
-# ------------------------------------------------------------
+    # ------------------------------------------------------------
     type: approuter.nodejs
     path: app
     parameters:
       memory: 256M
       disk-quota: 512M
     requires:
-    - name: srv-api
-      group: destinations
-      properties:
-        name: backend
-        url: ~{srv-url}
-        forwardAuthToken: true
-        strictSSL: true
-    - name: bookshop-uaa
+      - name: srv-api
+        group: destinations
+        properties:
+          name: backend
+          url: ~{srv-url}
+          forwardAuthToken: true
+          strictSSL: true
+      - name: bookshop-uaa
     provides:
       - name: app-api
         properties:
           app-url: '${default-url}'
 # --------------------- RESOURCES ---------------------
 resources:
-# -----------------------------------------------------
+  # -----------------------------------------------------
   - name: bookshop-uaa
     type: org.cloudfoundry.managed-service
     parameters:
@@ -84,7 +97,7 @@ resources:
         xsappname: bookshop-${org}-${space}
         oauth2-configuration:
           redirect-uris:
-          - ~{app-api/app-url}/**
+            - ~{app-api/app-url}/**
     requires:
       - name: app-api
   - name: bookshop-hdi-container
@@ -92,8 +105,7 @@ resources:
     parameters:
       service: hana
       service-plan: hdi-shared
-  - name: cf-logging
-    type: org.cloudfoundry.managed-service
-    parameters:
-      service: application-logs
-      service-plan: lite
+  - name: bookshop-cloud-logging
+    type: org.cloudfoundry.existing-service
+  - name: dynatrace
+    type: org.cloudfoundry.existing-service
diff --git a/pom.xml b/pom.xml
index 0c3717c8..821fc2bd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -37,6 +37,15 @@
 
 	<dependencyManagement>
 		<dependencies>
+			<!-- add the following dependency to test with a custom OpenTelemetry API version -->
+			<!--dependency>
+				<groupId>io.opentelemetry</groupId>
+				<artifactId>opentelemetry-bom</artifactId>
+				<version>1.51.0</version>
+				<type>pom</type>
+				<scope>import</scope>
+			</dependency-->
+
 			<!-- CDS SERVICES -->
 			<dependency>
 				<groupId>com.sap.cds</groupId>
diff --git a/srv/pom.xml b/srv/pom.xml
index df053511..f9a5398d 100644
--- a/srv/pom.xml
+++ b/srv/pom.xml
@@ -81,7 +81,20 @@
 			<artifactId>connectivity-apache-httpclient4</artifactId>
 		</dependency>
 
+		<dependency>
+			<groupId>org.springframework.security</groupId>
+			<artifactId>spring-security-oauth2-resource-server</artifactId>
+		</dependency>
+
 		<!-- OTHER DEPENDENCIES -->
+
+		<!-- add the following dependency to test with a custom OpenTelemetry API version -->
+		<!--dependency>
+			<groupId>io.opentelemetry</groupId>
+			<artifactId>opentelemetry-api</artifactId>
+			<version>1.51.0</version>
+		</dependency-->
+
 		<dependency>
 			<groupId>com.h2database</groupId>
 			<artifactId>h2</artifactId>
@@ -100,6 +113,12 @@
 			<version>${cf-java-logging-support.version}</version>
 		</dependency>
 
+		<dependency>
+			<groupId>com.sap.hcp.cf.logging</groupId>
+			<artifactId>cf-java-logging-support-opentelemetry-agent-extension</artifactId>
+			<version>${cf-java-logging-support.version}</version>
+		</dependency>
+
 		<dependency>
 			<groupId>com.sap.hcp.cf.logging</groupId>
 			<artifactId>cf-java-logging-support-logback</artifactId>