diff --git a/charts/vcluster/templates/jaeger.yaml b/charts/vcluster/templates/jaeger.yaml
deleted file mode 100644
index 2e5febf1..00000000
--- a/charts/vcluster/templates/jaeger.yaml
+++ /dev/null
@@ -1,14 +0,0 @@
-apiVersion: jaegertracing.io/v1
-kind: Jaeger
-metadata:
-  name: jaeger
-  namespace: {{ .Release.Namespace }}
-spec:
-  strategy: allInOne
-  ingress:
-    enabled: false
-  allInOne:
-    image: jaegertracing/all-in-one:1.22
-    options:
-      query:
-        base-path: /jaeger
diff --git a/charts/vcluster/templates/rbac.yaml b/charts/vcluster/templates/rbac.yaml
index 473eaa29..ba90fa92 100644
--- a/charts/vcluster/templates/rbac.yaml
+++ b/charts/vcluster/templates/rbac.yaml
@@ -11,16 +11,3 @@ subjects:
 - kind: ServiceAccount
   namespace: {{ $fullname }}
   name: {{ $fullname }}
----
-apiVersion: rbac.authorization.k8s.io/v1
-kind: ClusterRoleBinding
-metadata:
-  name: vcluster-jaegers
-roleRef:
-  apiGroup: rbac.authorization.k8s.io
-  kind: ClusterRole
-  name: vcluster-jaegers
-subjects:
-- kind: ServiceAccount
-  namespace: {{ $fullname }}
-  name: {{ $fullname }}
diff --git a/charts/vcluster/templates/vcluster.yaml b/charts/vcluster/templates/vcluster.yaml
index 5906ad58..ae6d02e1 100644
--- a/charts/vcluster/templates/vcluster.yaml
+++ b/charts/vcluster/templates/vcluster.yaml
@@ -69,8 +69,10 @@ spec:
               to: "rabbitmq/{{ .Values.environment }}-rabbitmq"
             - from: "{{ .Release.Namespace }}/staging-archmeister-rw"
               to: "atlantis/staging-archmeister-rw"
-            - from: "{{ .Release.Namespace }}/jaeger-collector"
-              to: "atlantis/jaeger-collector"
+            - from: "idp/{{ .Values.environment }}-openfga"
+              to: "idp/{{ .Values.environment }}-openfga"
+            - from: "otel/opentelemetry-collector"
+              to: "otel/opentelemetry-collector"
             - from: "idp/{{ .Values.environment }}-cerbos"
               to: "idp/{{ .Values.environment }}-cerbos"
           sync:
@@ -94,9 +96,6 @@ spec:
                   - apiGroups: [ "cilium.io" ]
                     resources: [ "ciliumnetworkpolicies" ]
                     verbs: [ "get", "list", "watch", "create", "patch" ]
-                  # - apiGroups: [ "jaegertracing.io" ]
-                  #   resources: [ "jaegers" ]
-                  #   verbs: [ "get", "list", "watch", "create", "patch" ]
               config: |-
                 version: v1beta1
                 import:
@@ -110,15 +109,11 @@ spec:
                 #   apiVersion: dapr.io/v1alpha1
                 # - kind: Subscription
                 #   apiVersion: dapr.io/v1alpha1
-                # - kind: Jaeger
-                #   apiVersion: jaegertracing.io/v1
                 # - kind: CiliumNetworkPolicy
                 #   apiVersion: cilium.io/v2
                 export:
                 - kind: CiliumNetworkPolicy
                   apiVersion: cilium.io/v2
-                # - kind: Jaeger
-                #   apiVersion: jaegertracing.io/v1
           init:
             manifests: |-
               ---
diff --git a/resources/atlantis/manifests/base/allow-atlantis-services.yaml b/resources/atlantis/manifests/base/allow-atlantis-services.yaml
index 93c72923..3571a194 100644
--- a/resources/atlantis/manifests/base/allow-atlantis-services.yaml
+++ b/resources/atlantis/manifests/base/allow-atlantis-services.yaml
@@ -16,6 +16,6 @@ spec:
         k8s:io.kubernetes.pod.namespace: rabbitmq
   - toEndpoints:
     - matchLabels:
-        k8s:io.kubernetes.pod.namespace: jaeger
+        k8s:io.kubernetes.pod.namespace: otel
   endpointSelector:
     matchLabels: {}
diff --git a/resources/atlantis/manifests/base/dapr-tracing.yaml b/resources/atlantis/manifests/base/dapr-tracing.yaml
index 4a3d8c1d..7ded938d 100644
--- a/resources/atlantis/manifests/base/dapr-tracing.yaml
+++ b/resources/atlantis/manifests/base/dapr-tracing.yaml
@@ -7,5 +7,5 @@ spec:
   tracing:
     samplingRate: "1"
     zipkin:
-      endpointAddress: "http://jaeger-collector:9411/api/v2/spans"
+      endpointAddress: " http://opentelemetry-collector.otel.svc:9411/api/v2/spans"
 
diff --git a/resources/oceanbox-cluster/vcluster-rabc.yaml b/resources/oceanbox-cluster/vcluster-rabc.yaml
index 849266cc..3c3ccef3 100644
--- a/resources/oceanbox-cluster/vcluster-rabc.yaml
+++ b/resources/oceanbox-cluster/vcluster-rabc.yaml
@@ -9,15 +9,3 @@ rules:
   - ciliumnetworkpolicies
   verbs:
   - '*'
----
-apiVersion: rbac.authorization.k8s.io/v1
-kind: ClusterRole
-metadata:
-  name: vcluster-jaegers
-rules:
-- apiGroups:
-  - jaegertracing.io
-  resources:
-  - jaegers
-  verbs:
-  - '*'
diff --git a/vcluster/scripts/update-argo-cluster-connection-token.sh b/vcluster/scripts/update-argo-cluster-connection-token.sh
index 338e94ac..326ce614 100755
--- a/vcluster/scripts/update-argo-cluster-connection-token.sh
+++ b/vcluster/scripts/update-argo-cluster-connection-token.sh
@@ -6,7 +6,7 @@ if [ ! $# -ge 1 ]; then
     exit 1
 fi
 
-if [ ! -d chart ]; then
+if [ ! -f create-vcluster.sh ]; then
     echo "error: must be run from toplevel directory"
     exit 1
 fi