diff --git a/.github/workflows/automerge.yml b/.github/workflows/automerge.yml
deleted file mode 100644
index 655ac9b7..00000000
--- a/.github/workflows/automerge.yml
+++ /dev/null
@@ -1,32 +0,0 @@
-# based on https://github.com/pascalgn/automerge-action/tree/v0.13.0#usage
-name: Automerge
-on:
-  pull_request:
-    types:
-      - labeled
-      - unlabeled
-      - synchronize
-      - opened
-      - edited
-      - ready_for_review
-      - reopened
-      - unlocked
-  pull_request_review:
-    types:
-      - submitted
-  check_suite:
-    types:
-      - completed
-
-jobs:
-  automerge:
-    runs-on: ubuntu-latest
-    steps:
-      - name: automerge
-        uses: pascalgn/automerge-action@01fb84a9d077930bf9d16d1f7fa3fe2ffe45aabe # renovate: tag=v0.14.2
-        env:
-          # Allows this merge to trigger other actions
-          GITHUB_TOKEN: "${{ secrets.DISPATCH_PERSONAL_ACCESS_TOKEN }}"
-          MERGE_METHOD: squash
-          MERGE_RETRIES: 60
-          MERGE_LABELS: automerge # Set by renovate bot or users
diff --git a/components/clusters/old-base/kustomization.yaml b/components/clusters/old-base/kustomization.yaml
index 004f5c9d..e466aedb 100644
--- a/components/clusters/old-base/kustomization.yaml
+++ b/components/clusters/old-base/kustomization.yaml
@@ -2,6 +2,7 @@ apiVersion: kustomize.config.k8s.io/v1alpha1
 kind: Component
 components:
   - ../../monitoring
+  - ../../monitoring/otel
   - ../../monitoring/cadvisor
   - ../../monitoring/rbacs
   - ../../enable/service-discovery
diff --git a/components/monitoring/otel/kustomization.yaml b/components/monitoring/otel/kustomization.yaml
new file mode 100644
index 00000000..812d40a2
--- /dev/null
+++ b/components/monitoring/otel/kustomization.yaml
@@ -0,0 +1,4 @@
+apiVersion: kustomize.config.k8s.io/v1alpha1
+kind: Component
+resources:
+  - ../../../base/monitoring/otel-collector
diff --git a/instances/template/kustomization.template.yaml b/instances/template/kustomization.template.yaml
index 9e774532..3753e465 100644
--- a/instances/template/kustomization.template.yaml
+++ b/instances/template/kustomization.template.yaml
@@ -89,6 +89,8 @@ components:
   #---------------------------------------------------------------------------------------
   - ../../components/monitoring # -- Add default resources for Sourcegraph monitoring services
   # - ../../components/monitoring/cadvisor # -- Add resources for cAdvisor (requires privileges)
+  # - ../../components/monitoring/otel # -- Add resources for otel
+  # - ../../components/monitoring/tracing # -- Add resources for otel with Jaeger as tracing backend
   # - ../../components/monitoring/privileged # -- Run monitoring stack with privileged and root access
   # - ../../components/remove/daemonset # -- Remove all services with daemonsets: node-exporter & otel
   # - ../../components/remove/otel-collector # -- Remove otel-collector and otel-agent