diff --git a/manifests/base-application/carts/deployment.yaml b/manifests/base-application/carts/deployment.yaml
index 5b903defa..198b6da53 100644
--- a/manifests/base-application/carts/deployment.yaml
+++ b/manifests/base-application/carts/deployment.yaml
@@ -18,6 +18,7 @@ spec:
         prometheus.io/path: /actuator/prometheus
         prometheus.io/port: "8080"
         prometheus.io/scrape: "true"
+        instrumentation.opentelemetry.io/inject-sdk: other/retail-store
       labels:
         app.kubernetes.io/name: carts
         app.kubernetes.io/instance: carts
@@ -34,6 +35,8 @@ spec:
               value: -XX:MaxRAMPercentage=75.0 -Djava.security.egd=file:/dev/urandom
             - name: SPRING_PROFILES_ACTIVE
               value: dynamodb
+            - name: OTEL_SERVICE_NAME
+              value: carts-service
           envFrom:
             - configMapRef:
                 name: carts
diff --git a/manifests/base-application/catalog/deployment.yaml b/manifests/base-application/catalog/deployment.yaml
index c7c655bcd..77e9bab3c 100644
--- a/manifests/base-application/catalog/deployment.yaml
+++ b/manifests/base-application/catalog/deployment.yaml
@@ -18,6 +18,7 @@ spec:
         prometheus.io/path: /metrics
         prometheus.io/port: "8080"
         prometheus.io/scrape: "true"
+        instrumentation.opentelemetry.io/inject-sdk: other/retail-store
       labels:
         app.kubernetes.io/name: catalog
         app.kubernetes.io/instance: catalog
@@ -40,6 +41,8 @@ spec:
                 secretKeyRef:
                   name: catalog-db
                   key: password
+            - name: OTEL_SERVICE_NAME
+              value: catalog-service
           envFrom:
             - configMapRef:
                 name: catalog
diff --git a/manifests/base-application/checkout/deployment.yaml b/manifests/base-application/checkout/deployment.yaml
index 76f0eb110..6bee4aa96 100644
--- a/manifests/base-application/checkout/deployment.yaml
+++ b/manifests/base-application/checkout/deployment.yaml
@@ -18,6 +18,7 @@ spec:
         prometheus.io/path: /metrics
         prometheus.io/port: "8080"
         prometheus.io/scrape: "true"
+        instrumentation.opentelemetry.io/inject-sdk: other/retail-store
       labels:
         app.kubernetes.io/name: checkout
         app.kubernetes.io/instance: checkout
@@ -29,6 +30,9 @@ spec:
         fsGroup: 1000
       containers:
         - name: checkout
+          env:
+            - name: OTEL_SERVICE_NAME
+              value: checkout-service
           envFrom:
             - configMapRef:
                 name: checkout
diff --git a/manifests/base-application/orders/deployment.yaml b/manifests/base-application/orders/deployment.yaml
index 706e97fcc..fbe8d42fc 100644
--- a/manifests/base-application/orders/deployment.yaml
+++ b/manifests/base-application/orders/deployment.yaml
@@ -18,6 +18,7 @@ spec:
         prometheus.io/path: /actuator/prometheus
         prometheus.io/port: "8080"
         prometheus.io/scrape: "true"
+        instrumentation.opentelemetry.io/inject-sdk: other/retail-store
       labels:
         app.kubernetes.io/name: orders
         app.kubernetes.io/instance: orders
@@ -62,6 +63,8 @@ spec:
                 secretKeyRef:
                   name: orders-db
                   key: password
+            - name: OTEL_SERVICE_NAME
+              value: orders-service
           envFrom:
             - configMapRef:
                 name: orders
diff --git a/manifests/base-application/ui/deployment.yaml b/manifests/base-application/ui/deployment.yaml
index fa8a59ccc..7cf8932b5 100644
--- a/manifests/base-application/ui/deployment.yaml
+++ b/manifests/base-application/ui/deployment.yaml
@@ -18,6 +18,7 @@ spec:
         prometheus.io/path: /actuator/prometheus
         prometheus.io/port: "8080"
         prometheus.io/scrape: "true"
+        instrumentation.opentelemetry.io/inject-sdk: other/retail-store
       labels:
         app.kubernetes.io/name: ui
         app.kubernetes.io/instance: ui
@@ -32,6 +33,8 @@ spec:
           env:
             - name: JAVA_OPTS
               value: -XX:MaxRAMPercentage=75.0 -Djava.security.egd=file:/dev/urandom
+            - name: OTEL_SERVICE_NAME
+              value: ui-service
           envFrom:
             - configMapRef:
                 name: ui
diff --git a/manifests/modules/observability/kubecost/.workshop/terraform/main.tf b/manifests/modules/observability/kubecost/.workshop/terraform/main.tf
deleted file mode 100644
index ad3963a4a..000000000
--- a/manifests/modules/observability/kubecost/.workshop/terraform/main.tf
+++ /dev/null
@@ -1,52 +0,0 @@
-module "ebs_csi_driver_irsa" {
-  source  = "terraform-aws-modules/iam/aws//modules/iam-role-for-service-accounts-eks"
-  version = "5.44.0"
-
-  role_name_prefix   = "${var.addon_context.eks_cluster_id}-ebs-csi-"
-  policy_name_prefix = "${var.addon_context.eks_cluster_id}-ebs-csi-"
-
-  attach_ebs_csi_policy = true
-
-  oidc_providers = {
-    main = {
-      provider_arn               = var.addon_context.eks_oidc_provider_arn
-      namespace_service_accounts = ["kube-system:ebs-csi-controller-sa"]
-    }
-  }
-
-  tags = var.tags
-}
-
-module "eks_blueprints_addons" {
-  source  = "aws-ia/eks-blueprints-addons/aws"
-  version = "1.16.3"
-
-  cluster_name      = var.addon_context.eks_cluster_id
-  cluster_endpoint  = var.addon_context.aws_eks_cluster_endpoint
-  cluster_version   = var.eks_cluster_version
-  oidc_provider_arn = var.addon_context.eks_oidc_provider_arn
-
-  eks_addons = {
-    aws-ebs-csi-driver = {
-      most_recent              = true
-      service_account_role_arn = module.ebs_csi_driver_irsa.iam_role_arn
-      preserve                 = false
-      configuration_values     = jsonencode({ defaultStorageClass = { enabled = true } })
-    }
-  }
-
-  enable_aws_load_balancer_controller = true
-  aws_load_balancer_controller = {
-    wait        = true
-    role_name   = "${var.addon_context.eks_cluster_id}-alb-controller"
-    policy_name = "${var.addon_context.eks_cluster_id}-alb-controller"
-  }
-}
-
-resource "time_sleep" "wait" {
-  depends_on = [
-    module.eks_blueprints_addons
-  ]
-
-  create_duration = "10s"
-}
diff --git a/manifests/modules/observability/kubecost/.workshop/terraform/outputs.tf b/manifests/modules/observability/kubecost/.workshop/terraform/outputs.tf
deleted file mode 100644
index e2af865b9..000000000
--- a/manifests/modules/observability/kubecost/.workshop/terraform/outputs.tf
+++ /dev/null
@@ -1,6 +0,0 @@
-output "environment_variables" {
-  description = "Environment variables to be added to the IDE shell"
-  value = {
-    KUBECOST_CHART_VERSION = var.kubecost_chart_version
-  }
-}
\ No newline at end of file
diff --git a/manifests/modules/observability/kubecost/values.yaml b/manifests/modules/observability/kubecost/values.yaml
deleted file mode 100644
index 1a9d9d6eb..000000000
--- a/manifests/modules/observability/kubecost/values.yaml
+++ /dev/null
@@ -1,5 +0,0 @@
-service:
-  type: LoadBalancer
-  annotations:
-    service.beta.kubernetes.io/aws-load-balancer-scheme: internet-facing
-    service.beta.kubernetes.io/aws-load-balancer-nlb-target-type: instance
diff --git a/manifests/modules/observability/oss-metrics/.workshop/cleanup.sh b/manifests/modules/observability/oss-metrics/.workshop/cleanup.sh
deleted file mode 100644
index 4d1c1a89c..000000000
--- a/manifests/modules/observability/oss-metrics/.workshop/cleanup.sh
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/bash
-
-set -e
-
-logmessage "Deleting OpenTelemetry collectors..."
-
-delete-all-if-crd-exists opentelemetrycollectors.opentelemetry.io
-
-kubectl delete -n other pod load-generator --ignore-not-found
\ No newline at end of file
diff --git a/manifests/modules/observability/oss-metrics/.workshop/terraform/main.tf b/manifests/modules/observability/oss-metrics/.workshop/terraform/main.tf
deleted file mode 100644
index b8a6acdc2..000000000
--- a/manifests/modules/observability/oss-metrics/.workshop/terraform/main.tf
+++ /dev/null
@@ -1,524 +0,0 @@
-data "aws_partition" "current" {}
-
-module "ebs_csi_driver_irsa" {
-  source  = "terraform-aws-modules/iam/aws//modules/iam-role-for-service-accounts-eks"
-  version = "5.44.0"
-
-  role_name_prefix   = "${var.addon_context.eks_cluster_id}-ebs-csi-"
-  policy_name_prefix = "${var.addon_context.eks_cluster_id}-ebs-csi-"
-
-  attach_ebs_csi_policy = true
-
-  oidc_providers = {
-    main = {
-      provider_arn               = var.addon_context.eks_oidc_provider_arn
-      namespace_service_accounts = ["kube-system:ebs-csi-controller-sa"]
-    }
-  }
-
-  tags = var.tags
-}
-
-module "eks_blueprints_addons" {
-  source  = "aws-ia/eks-blueprints-addons/aws"
-  version = "1.16.3"
-
-  cluster_name      = var.addon_context.eks_cluster_id
-  cluster_endpoint  = var.addon_context.aws_eks_cluster_endpoint
-  cluster_version   = var.eks_cluster_version
-  oidc_provider_arn = var.addon_context.eks_oidc_provider_arn
-
-  eks_addons = {
-    aws-ebs-csi-driver = {
-      most_recent              = true
-      service_account_role_arn = module.ebs_csi_driver_irsa.iam_role_arn
-      preserve                 = false
-      configuration_values     = jsonencode({ defaultStorageClass = { enabled = true } })
-    }
-  }
-
-  enable_aws_load_balancer_controller = true
-  aws_load_balancer_controller = {
-    wait        = true
-    role_name   = "${var.addon_context.eks_cluster_id}-alb-controller"
-    policy_name = "${var.addon_context.eks_cluster_id}-alb-controller"
-  }
-}
-
-resource "time_sleep" "blueprints_addons_sleep" {
-  depends_on = [
-    module.eks_blueprints_addons
-  ]
-
-  create_duration = "15s"
-}
-
-module "cert_manager" {
-  source  = "aws-ia/eks-blueprints-addon/aws"
-  version = "1.1.1"
-
-  depends_on = [
-    time_sleep.blueprints_addons_sleep
-  ]
-
-  name             = "cert-manager"
-  namespace        = "cert-manager"
-  create_namespace = true
-  wait             = true
-  chart            = "cert-manager"
-  chart_version    = "v1.15.1"
-  repository       = "https://charts.jetstack.io"
-
-  set = [
-    {
-      name  = "crds.enabled"
-      value = true
-    }
-  ]
-}
-
-resource "kubernetes_namespace" "opentelemetry_operator" {
-  metadata {
-    name = "opentelemetry-operator-system"
-  }
-}
-
-module "opentelemetry_operator" {
-  source  = "aws-ia/eks-blueprints-addon/aws"
-  version = "1.1.1"
-
-  depends_on = [
-    module.cert_manager
-  ]
-
-  name             = "opentelemetry"
-  namespace        = kubernetes_namespace.opentelemetry_operator.metadata[0].name
-  create_namespace = false
-  wait             = true
-  chart            = "opentelemetry-operator"
-  chart_version    = var.operator_chart_version
-  repository       = "https://open-telemetry.github.io/opentelemetry-helm-charts"
-
-  set = [{
-    name  = "manager.collectorImage.repository"
-    value = "otel/opentelemetry-collector-k8s"
-  }]
-}
-
-resource "aws_prometheus_workspace" "this" {
-  alias = var.addon_context.eks_cluster_id
-
-  tags = var.tags
-}
-
-module "iam_assumable_role_adot" {
-  source  = "terraform-aws-modules/iam/aws//modules/iam-assumable-role-with-oidc"
-  version = "5.44.0"
-
-  create_role  = true
-  role_name    = "${var.addon_context.eks_cluster_id}-adot-collector"
-  provider_url = var.addon_context.eks_oidc_issuer_url
-  role_policy_arns = [
-    "arn:${data.aws_partition.current.partition}:iam::aws:policy/AmazonPrometheusRemoteWriteAccess"
-  ]
-  oidc_fully_qualified_subjects = ["system:serviceaccount:other:adot-collector"]
-
-  tags = var.tags
-}
-
-resource "kubernetes_namespace" "grafana" {
-  metadata {
-    name = "grafana"
-  }
-}
-
-module "eks_blueprints_kubernetes_grafana_addon" {
-  source = "github.com/aws-ia/terraform-aws-eks-blueprints?ref=v4.25.0//modules/kubernetes-addons/grafana"
-
-  depends_on = [
-    time_sleep.blueprints_addons_sleep,
-    kubernetes_config_map.order_service_metrics_dashboard
-  ]
-
-  addon_context = var.addon_context
-
-  irsa_policies = [
-    aws_iam_policy.grafana.arn
-  ]
-
-  helm_config = {
-    create_namespace = false
-    namespace        = kubernetes_namespace.grafana.metadata[0].name
-
-    values = [local.grafana_values]
-  }
-}
-
-resource "kubernetes_config_map" "order_service_metrics_dashboard" {
-  metadata {
-    name      = "order-service-metrics-dashboard"
-    namespace = kubernetes_namespace.grafana.metadata[0].name
-
-    labels = {
-      grafana_dashboard = 1
-    }
-  }
-
-  data = {
-    "order-service-metrics-dashboard.json" = <<EOF
-{
-  "annotations": {
-    "list": [
-      {
-        "builtIn": 1,
-        "datasource": {
-          "type": "grafana",
-          "uid": "-- Grafana --"
-        },
-        "enable": true,
-        "hide": true,
-        "iconColor": "rgba(0, 211, 255, 1)",
-        "name": "Annotations & Alerts",
-        "target": {
-          "limit": 100,
-          "matchAny": false,
-          "tags": [],
-          "type": "dashboard"
-        },
-        "type": "dashboard"
-      }
-    ]
-  },
-  "editable": true,
-  "fiscalYearStartMonth": 0,
-  "graphTooltip": 0,
-  "links": [],
-  "liveNow": false,
-  "panels": [
-    {
-      "datasource": {
-        "type": "prometheus",
-        "uid": "PBFA97CFB590B2093"
-      },
-      "fieldConfig": {
-        "defaults": {
-          "color": {
-            "mode": "palette-classic"
-          },
-          "custom": {
-            "hideFrom": {
-              "legend": false,
-              "tooltip": false,
-              "viz": false
-            }
-          },
-          "mappings": []
-        },
-        "overrides": []
-      },
-      "gridPos": {
-        "h": 9,
-        "w": 9,
-        "x": 0,
-        "y": 0
-      },
-      "id": 2,
-      "options": {
-        "legend": {
-          "displayMode": "list",
-          "placement": "bottom",
-          "showLegend": true
-        },
-        "pieType": "pie",
-        "reduceOptions": {
-          "calcs": [
-            "lastNotNull"
-          ],
-          "fields": "",
-          "values": false
-        },
-        "tooltip": {
-          "mode": "single",
-          "sort": "none"
-        }
-      },
-      "targets": [
-        {
-          "datasource": {
-            "type": "prometheus",
-            "uid": "PBFA97CFB590B2093"
-          },
-          "editorMode": "builder",
-          "expr": "sum by(productId) (watch_orders_total{productId!=\"*\"})",
-          "legendFormat": "__auto",
-          "range": true,
-          "refId": "A"
-        }
-      ],
-      "title": "Orders by Product ",
-      "type": "piechart"
-    },
-    {
-      "datasource": {
-        "type": "prometheus",
-        "uid": "PBFA97CFB590B2093"
-      },
-      "fieldConfig": {
-        "defaults": {
-          "color": {
-            "mode": "thresholds"
-          },
-          "mappings": [],
-          "thresholds": {
-            "mode": "absolute",
-            "steps": [
-              {
-                "color": "green",
-                "value": null
-              }
-            ]
-          }
-        },
-        "overrides": []
-      },
-      "gridPos": {
-        "h": 9,
-        "w": 6,
-        "x": 9,
-        "y": 0
-      },
-      "id": 6,
-      "options": {
-        "colorMode": "value",
-        "graphMode": "none",
-        "justifyMode": "auto",
-        "orientation": "auto",
-        "reduceOptions": {
-          "calcs": [
-            "lastNotNull"
-          ],
-          "fields": "",
-          "values": false
-        },
-        "textMode": "auto"
-      },
-      "pluginVersion": "9.2.2",
-      "targets": [
-        {
-          "datasource": {
-            "type": "prometheus",
-            "uid": "PBFA97CFB590B2093"
-          },
-          "editorMode": "code",
-          "expr": "sum(watch_orders_total{productId=\"*\"}) by (productId)",
-          "legendFormat": "__auto",
-          "range": true,
-          "refId": "A"
-        }
-      ],
-      "title": "Order Count",
-      "type": "stat"
-    },
-    {
-      "datasource": {
-        "type": "prometheus",
-        "uid": "PBFA97CFB590B2093"
-      },
-      "fieldConfig": {
-        "defaults": {
-          "color": {
-            "mode": "palette-classic"
-          },
-          "custom": {
-            "axisCenteredZero": false,
-            "axisColorMode": "text",
-            "axisLabel": "",
-            "axisPlacement": "auto",
-            "barAlignment": 0,
-            "drawStyle": "line",
-            "fillOpacity": 0,
-            "gradientMode": "none",
-            "hideFrom": {
-              "legend": false,
-              "tooltip": false,
-              "viz": false
-            },
-            "lineInterpolation": "linear",
-            "lineWidth": 1,
-            "pointSize": 5,
-            "scaleDistribution": {
-              "type": "linear"
-            },
-            "showPoints": "auto",
-            "spanNulls": false,
-            "stacking": {
-              "group": "A",
-              "mode": "none"
-            },
-            "thresholdsStyle": {
-              "mode": "off"
-            }
-          },
-          "mappings": [],
-          "thresholds": {
-            "mode": "absolute",
-            "steps": [
-              {
-                "color": "green",
-                "value": null
-              },
-              {
-                "color": "red",
-                "value": 80
-              }
-            ]
-          }
-        },
-        "overrides": []
-      },
-      "gridPos": {
-        "h": 8,
-        "w": 15,
-        "x": 0,
-        "y": 9
-      },
-      "id": 4,
-      "options": {
-        "legend": {
-          "calcs": [],
-          "displayMode": "list",
-          "placement": "bottom",
-          "showLegend": true
-        },
-        "tooltip": {
-          "mode": "single",
-          "sort": "none"
-        }
-      },
-      "targets": [
-        {
-          "datasource": {
-            "type": "prometheus",
-            "uid": "PBFA97CFB590B2093"
-          },
-          "editorMode": "code",
-          "expr": "sum by (productId)(rate(watch_orders_total{productId=\"*\"}[2m]))",
-          "legendFormat": "__auto",
-          "range": true,
-          "refId": "A"
-        }
-      ],
-      "title": "Order Rate",
-      "type": "timeseries"
-    }
-  ],
-  "schemaVersion": 37,
-  "style": "dark",
-  "tags": [],
-  "templating": {
-    "list": []
-  },
-  "time": {
-    "from": "now-3h",
-    "to": "now"
-  },
-  "timepicker": {},
-  "timezone": "",
-  "title": "Order Service Metrics",
-  "uid": "r7QHEZEVz",
-  "version": 1,
-  "weekStart": ""
-}
-EOF
-  }
-}
-
-resource "aws_iam_policy" "grafana" {
-  name = "${var.addon_context.eks_cluster_id}-grafana-other"
-
-  policy = jsonencode({
-    Version = "2012-10-17"
-    Statement = [
-      {
-        Action = [
-          "aps:*",
-        ]
-        Effect   = "Allow"
-        Resource = "*"
-      },
-    ]
-  })
-}
-
-locals {
-  grafana_values = <<EOF
-serviceAccount:
-  create: false
-  name: grafana
-
-env:
-  AWS_SDK_LOAD_CONFIG: true
-  GF_AUTH_SIGV4_AUTH_ENABLED: true
-
-ingress:
-  enabled: true
-  hosts: []
-  annotations:
-    alb.ingress.kubernetes.io/scheme: internet-facing
-    alb.ingress.kubernetes.io/target-type: ip
-  ingressClassName: alb
-
-datasources:
-  datasources.yaml:
-    apiVersion: 1
-    datasources:
-    - name: Prometheus
-      type: prometheus
-      url: ${aws_prometheus_workspace.this.prometheus_endpoint}
-      access: proxy
-      jsonData:
-        httpMethod: "POST"
-        sigV4Auth: true
-        sigV4AuthType: "default"
-        sigV4Region: ${var.addon_context.aws_region_name}
-      isDefault: true
-
-dashboardProviders:
-  dashboardproviders.yaml:
-    apiVersion: 1
-    providers:
-    - name: default
-      orgId: 1
-      folder: ""
-      type: file
-      disableDeletion: false
-      editable: false
-      options:
-        path: /var/lib/grafana/dashboards/default
-    - name: orders-service
-      orgId: 1
-      folder: "retail-app-metrics"
-      type: file
-      disableDeletion: false
-      editable: false
-      options:
-        path: /var/lib/grafana/dashboards/orders-service    
-
-dashboardsConfigMaps:
-  orders-service: "order-service-metrics-dashboard"
-
-dashboards:
-  default:
-    kubernetesCluster:
-      gnetId: 3119
-      revision: 2
-      datasource: Prometheus
-
-sidecar:
-  dashboards:
-    enabled: true
-    searchNamespace: ALL
-    label: app.kubernetes.io/component
-    labelValue: grafana
-EOF
-}
diff --git a/manifests/modules/observability/kubecost/.workshop/cleanup.sh b/manifests/modules/observability/oss/kubecost/.workshop/cleanup.sh
similarity index 100%
rename from manifests/modules/observability/kubecost/.workshop/cleanup.sh
rename to manifests/modules/observability/oss/kubecost/.workshop/cleanup.sh
diff --git a/manifests/modules/observability/oss/kubecost/.workshop/terraform/main.tf b/manifests/modules/observability/oss/kubecost/.workshop/terraform/main.tf
new file mode 100644
index 000000000..62e600895
--- /dev/null
+++ b/manifests/modules/observability/oss/kubecost/.workshop/terraform/main.tf
@@ -0,0 +1,97 @@
+module "ebs_csi_driver_irsa" {
+  source  = "terraform-aws-modules/iam/aws//modules/iam-role-for-service-accounts-eks"
+  version = "5.44.0"
+
+  role_name_prefix = "${var.addon_context.eks_cluster_id}-ebs-csi-"
+
+  attach_ebs_csi_policy = true
+
+  oidc_providers = {
+    main = {
+      provider_arn               = var.addon_context.eks_oidc_provider_arn
+      namespace_service_accounts = ["kube-system:ebs-csi-controller-sa"]
+    }
+  }
+
+  tags = var.tags
+}
+
+module "eks_blueprints_addons" {
+  source  = "aws-ia/eks-blueprints-addons/aws"
+  version = "1.16.3"
+
+  cluster_name      = var.addon_context.eks_cluster_id
+  cluster_endpoint  = var.addon_context.aws_eks_cluster_endpoint
+  cluster_version   = var.eks_cluster_version
+  oidc_provider_arn = var.addon_context.eks_oidc_provider_arn
+
+  eks_addons = {
+    aws-ebs-csi-driver = {
+      most_recent              = true
+      service_account_role_arn = module.ebs_csi_driver_irsa.iam_role_arn
+      preserve                 = false
+      configuration_values     = jsonencode({ defaultStorageClass = { enabled = true } })
+    }
+  }
+
+  enable_aws_load_balancer_controller = true
+  aws_load_balancer_controller = {
+    wait = true
+  }
+}
+
+resource "time_sleep" "blueprints_addons_sleep" {
+  depends_on = [
+    module.eks_blueprints_addons
+  ]
+
+  create_duration = "15s"
+}
+
+resource "aws_prometheus_workspace" "this" {
+  alias = var.addon_context.eks_cluster_id
+
+  tags = var.tags
+}
+
+module "kubecost_cost_analyzer_irsa" {
+  source  = "terraform-aws-modules/iam/aws//modules/iam-role-for-service-accounts-eks"
+  version = "5.44.0"
+
+  role_name_prefix = "${var.addon_context.eks_cluster_id}-kubecost-cost-analyzer-"
+
+  role_policy_arns = {
+    policy_1 = "arn:aws:iam::aws:policy/AmazonPrometheusQueryAccess"
+    policy_2 = "arn:aws:iam::aws:policy/AmazonPrometheusRemoteWriteAccess"
+  }
+
+  oidc_providers = {
+    main = {
+      provider_arn               = var.addon_context.eks_oidc_provider_arn
+      namespace_service_accounts = ["kubecost:kubecost-cost-analyzer"]
+    }
+  }
+
+  tags = var.tags
+}
+
+module "kubecost_prometheus_server_irsa" {
+  source  = "terraform-aws-modules/iam/aws//modules/iam-role-for-service-accounts-eks"
+  version = "5.44.0"
+
+  role_name_prefix = "${var.addon_context.eks_cluster_id}-kubecost-prometheus-"
+
+  role_policy_arns = {
+    policy_1 = "arn:aws:iam::aws:policy/AmazonPrometheusQueryAccess"
+    policy_2 = "arn:aws:iam::aws:policy/AmazonPrometheusRemoteWriteAccess"
+  }
+
+  oidc_providers = {
+    main = {
+      provider_arn               = var.addon_context.eks_oidc_provider_arn
+      namespace_service_accounts = ["kubecost:kubecost-prometheus-server"]
+    }
+  }
+
+  tags = var.tags
+}
diff --git a/manifests/modules/observability/oss/kubecost/.workshop/terraform/outputs.tf b/manifests/modules/observability/oss/kubecost/.workshop/terraform/outputs.tf
new file mode 100644
index 000000000..e4b253b83
--- /dev/null
+++ b/manifests/modules/observability/oss/kubecost/.workshop/terraform/outputs.tf
@@ -0,0 +1,9 @@
+output "environment_variables" {
+  description = "Environment variables to be added to the IDE shell"
+  value = {
+    AMP_WORKSPACE_ID             = aws_prometheus_workspace.this.id
+    KUBECOST_CHART_VERSION       = var.kubecost_chart_version
+    KUBECOST_IAM_ROLE            = module.kubecost_cost_analyzer_irsa.iam_role_arn
+    KUBECOST_PROMETHEUS_IAM_ROLE = module.kubecost_prometheus_server_irsa.iam_role_arn
+  }
+}
diff --git a/manifests/modules/observability/kubecost/.workshop/terraform/vars.tf b/manifests/modules/observability/oss/kubecost/.workshop/terraform/vars.tf
similarity index 97%
rename from manifests/modules/observability/kubecost/.workshop/terraform/vars.tf
rename to manifests/modules/observability/oss/kubecost/.workshop/terraform/vars.tf
index 7f6c78621..ef1a7115e 100644
--- a/manifests/modules/observability/kubecost/.workshop/terraform/vars.tf
+++ b/manifests/modules/observability/oss/kubecost/.workshop/terraform/vars.tf
@@ -38,5 +38,5 @@ variable "kubecost_chart_version" {
   description = "The chart version of kubecost to use"
   type        = string
   # renovate-helm: depName=cost-analyzer registryUrl=https://kubecost.github.io/cost-analyzer
-  default = "2.3.5"
-}
\ No newline at end of file
+  default = "1.108.1"
+}
diff --git a/manifests/modules/observability/oss/kubecost/values.template.yaml b/manifests/modules/observability/oss/kubecost/values.template.yaml
new file mode 100644
index 000000000..bea65ee58
--- /dev/null
+++ b/manifests/modules/observability/oss/kubecost/values.template.yaml
@@ -0,0 +1,27 @@
+service:
+  type: LoadBalancer
+  annotations:
+    service.beta.kubernetes.io/aws-load-balancer-scheme: internet-facing
+    service.beta.kubernetes.io/aws-load-balancer-nlb-target-type: ip
+global:
+  amp:
+    enabled: true
+    prometheusServerEndpoint: http://localhost:8005/workspaces/${AMP_WORKSPACE_ID}
+    remoteWriteService: https://aps-workspaces.${AWS_REGION}.amazonaws.com/workspaces/${AMP_WORKSPACE_ID}/api/v1/remote_write
+    sigv4:
+      region: ${AWS_REGION}
+sigV4Proxy:
+  region: ${AWS_REGION}
+  host: aps-workspaces.${AWS_REGION}.amazonaws.com
+serviceAccount:
+  annotations:
+    eks.amazonaws.com/role-arn: ${KUBECOST_IAM_ROLE}
+prometheus:
+  kubeStateMetrics:
+    enabled: true
+  kube-state-metrics:
+    disabled: false
+  serviceAccounts:
+    server:
+      annotations:
+        eks.amazonaws.com/role-arn: ${KUBECOST_PROMETHEUS_IAM_ROLE}
diff --git a/manifests/modules/observability/oss/metrics-logs-traces/.workshop/cleanup.sh b/manifests/modules/observability/oss/metrics-logs-traces/.workshop/cleanup.sh
new file mode 100644
index 000000000..ad079df72
--- /dev/null
+++ b/manifests/modules/observability/oss/metrics-logs-traces/.workshop/cleanup.sh
@@ -0,0 +1,35 @@
+#!/bin/bash
+
+set -e
+
+logmessage "Deleting OpenTelemetry collectors..."
+
+kubectl delete -n other instrumentation retail-store --ignore-not-found
+kubectl delete -n other opentelemetrycollector adot --ignore-not-found
+kubectl delete clusterrolebinding otel-prometheus-role-binding --ignore-not-found
+kubectl delete clusterrole otel-prometheus-role --ignore-not-found
+kubectl delete -n other serviceaccount adot-collector --ignore-not-found
+
+delete-all-if-crd-exists certificaterequests.cert-manager.io
+delete-all-if-crd-exists certificates.cert-manager.io
+delete-all-if-crd-exists challenges.acme.cert-manager.io
+delete-all-if-crd-exists clusterissuers.cert-manager.io
+delete-all-if-crd-exists issuers.cert-manager.io
+delete-all-if-crd-exists orders.acme.cert-manager.io
+delete-all-if-crd-exists grafanaalertrulegroups.grafana.integreatly.org
+delete-all-if-crd-exists grafanacontactpoints.grafana.integreatly.org
+delete-all-if-crd-exists grafanadashboards.grafana.integreatly.org
+delete-all-if-crd-exists grafanadatasources.grafana.integreatly.org
+delete-all-if-crd-exists grafanafolders.grafana.integreatly.org
+delete-all-if-crd-exists grafananotificationpolicies.grafana.integreatly.org
+delete-all-if-crd-exists grafanas.grafana.integreatly.org
+delete-all-if-crd-exists grafanaagents.monitoring.grafana.com
+delete-all-if-crd-exists integrations.monitoring.grafana.com
+delete-all-if-crd-exists logsinstances.monitoring.grafana.com
+delete-all-if-crd-exists metricsinstances.monitoring.grafana.com
+delete-all-if-crd-exists podlogs.monitoring.grafana.com
+delete-all-if-crd-exists podmonitors.monitoring.coreos.com
+delete-all-if-crd-exists probes.monitoring.coreos.com
+delete-all-if-crd-exists servicemonitors.monitoring.coreos.com
+
+kubectl delete -n other pod load-generator --ignore-not-found
\ No newline at end of file
diff --git a/manifests/modules/observability/oss/metrics-logs-traces/.workshop/terraform/main.tf b/manifests/modules/observability/oss/metrics-logs-traces/.workshop/terraform/main.tf
new file mode 100644
index 000000000..8cb8f2be6
--- /dev/null
+++ b/manifests/modules/observability/oss/metrics-logs-traces/.workshop/terraform/main.tf
@@ -0,0 +1,417 @@
+terraform {
+  required_providers {
+    kubectl = {
+      source  = "alekc/kubectl"
+      version = "2.0.4"
+    }
+  }
+}
+
+data "aws_partition" "current" {}
+
+module "ebs_csi_driver_irsa" {
+  source  = "terraform-aws-modules/iam/aws//modules/iam-role-for-service-accounts-eks"
+  version = "5.44.0"
+
+  role_name_prefix = "${var.addon_context.eks_cluster_id}-ebs-csi-"
+
+  attach_ebs_csi_policy = true
+
+  oidc_providers = {
+    main = {
+      provider_arn               = var.addon_context.eks_oidc_provider_arn
+      namespace_service_accounts = ["kube-system:ebs-csi-controller-sa"]
+    }
+  }
+
+  tags = var.tags
+}
+
+module "eks_blueprints_addons" {
+  source  = "aws-ia/eks-blueprints-addons/aws"
+  version = "1.16.3"
+
+  cluster_name      = var.addon_context.eks_cluster_id
+  cluster_endpoint  = var.addon_context.aws_eks_cluster_endpoint
+  cluster_version   = var.eks_cluster_version
+  oidc_provider_arn = var.addon_context.eks_oidc_provider_arn
+
+  eks_addons = {
+    aws-ebs-csi-driver = {
+      most_recent              = true
+      service_account_role_arn = module.ebs_csi_driver_irsa.iam_role_arn
+      preserve                 = false
+      configuration_values     = jsonencode({ defaultStorageClass = { enabled = true } })
+    }
+  }
+
+  enable_aws_load_balancer_controller = true
+  aws_load_balancer_controller = {
+    wait = true
+  }
+}
+
+resource "time_sleep" "blueprints_addons_sleep" {
+  depends_on = [
+    module.eks_blueprints_addons
+  ]
+
+  create_duration = "15s"
+}
+
+module "cert_manager" {
+  source  = "aws-ia/eks-blueprints-addon/aws"
+  version = "1.1.1"
+
+  depends_on = [
+    time_sleep.blueprints_addons_sleep
+  ]
+
+  name             = "cert-manager"
+  namespace        = "cert-manager"
+  create_namespace = true
+  wait             = true
+  chart            = "cert-manager"
+  chart_version    = "v1.15.3"
+  repository       = "https://charts.jetstack.io"
+
+  set = [
+    {
+      name  = "crds.enabled"
+      value = true
+    }
+  ]
+}
+
+module "opentelemetry_operator" {
+  source  = "aws-ia/eks-blueprints-addon/aws"
+  version = "1.1.1"
+
+  depends_on = [
+    module.cert_manager
+  ]
+
+  name             = "opentelemetry-operator"
+  namespace        = "opentelemetry-operator-system"
+  create_namespace = true
+  wait             = true
+  chart            = "opentelemetry-operator"
+  chart_version    = var.opentelemetry_operator_chart_version
+  repository       = "https://open-telemetry.github.io/opentelemetry-helm-charts"
+
+  set = [{
+    name  = "manager.collectorImage.repository"
+    value = "otel/opentelemetry-collector-k8s"
+  }]
+}
+
+module "iam_assumable_role_adot" {
+  source  = "terraform-aws-modules/iam/aws//modules/iam-assumable-role-with-oidc"
+  version = "5.44.0"
+
+  create_role  = true
+  role_name    = "${var.addon_context.eks_cluster_id}-adot-collector"
+  provider_url = var.addon_context.eks_oidc_issuer_url
+  role_policy_arns = [
+    "arn:${data.aws_partition.current.partition}:iam::aws:policy/AmazonPrometheusRemoteWriteAccess"
+  ]
+  oidc_fully_qualified_subjects = ["system:serviceaccount:other:adot-collector"]
+
+  tags = var.tags
+}
+
+resource "aws_prometheus_workspace" "this" {
+  alias = var.addon_context.eks_cluster_id
+
+  tags = var.tags
+}
+
+module "loki" {
+  source  = "aws-ia/eks-blueprints-addon/aws"
+  version = "1.1.1"
+
+  name             = "loki"
+  namespace        = "loki-system"
+  create_namespace = true
+  wait             = true
+  chart            = "loki"
+  chart_version    = var.loki_chart_version
+  repository       = "https://grafana.github.io/helm-charts"
+
+  values = [
+    <<-EOT
+      deploymentMode: SingleBinary
+      loki:
+        auth_enabled: false
+        limits_config:
+          allow_structured_metadata: true
+        commonConfig:
+          replication_factor: 1
+        storage:
+          type: 'filesystem'
+        schemaConfig:
+          configs:
+          - from: "2024-01-01"
+            store: tsdb
+            index:
+              prefix: loki_index_
+              period: 24h
+            object_store: filesystem # we're storing on filesystem so there's no real persistence here.
+            schema: v13
+      singleBinary:
+        replicas: 1
+      read:
+        replicas: 0
+      backend:
+        replicas: 0
+      write:
+        replicas: 0
+      test:
+        enabled: false
+      lokiCanary:
+        enabled: false
+      chunksCache:
+        enabled: false
+      resultsCache:
+        enabled: false
+      gateway:
+        enabled: false
+    EOT
+  ]
+}
+
+module "tempo" {
+  source  = "aws-ia/eks-blueprints-addon/aws"
+  version = "1.1.1"
+
+  name             = "tempo"
+  namespace        = "tempo-system"
+  create_namespace = true
+  wait             = true
+  chart            = "tempo"
+  chart_version    = var.tempo_chart_version
+  repository       = "https://grafana.github.io/helm-charts"
+}
+
+module "grafana_operator" {
+  source  = "aws-ia/eks-blueprints-addon/aws"
+  version = "1.1.1"
+
+  name             = "grafana-operator"
+  namespace        = "grafana-operator-system"
+  create_namespace = true
+  wait             = true
+  chart            = "grafana-operator"
+  chart_version    = var.grafana_operator_chart_version
+  repository       = "oci://ghcr.io/grafana/helm-charts"
+}
+
+resource "kubernetes_namespace" "grafana" {
+  metadata {
+    name = "grafana"
+  }
+}
+
+module "grafana_irsa" {
+  source  = "terraform-aws-modules/iam/aws//modules/iam-role-for-service-accounts-eks"
+  version = "5.44.0"
+
+  role_name_prefix = "${var.addon_context.eks_cluster_id}-grafana-"
+
+  role_policy_arns = {
+    policy = "arn:aws:iam::aws:policy/AmazonPrometheusQueryAccess"
+  }
+
+  oidc_providers = {
+    main = {
+      provider_arn               = var.addon_context.eks_oidc_provider_arn
+      namespace_service_accounts = ["grafana:grafana-sa"]
+    }
+  }
+
+  tags = var.tags
+}
+
+resource "kubectl_manifest" "grafana" {
+  depends_on = [
+    module.grafana_operator,
+    kubernetes_namespace.grafana
+  ]
+
+  yaml_body = <<-YAML
+apiVersion: grafana.integreatly.org/v1beta1
+kind: Grafana
+metadata:
+  name: grafana
+  namespace: grafana
+  labels:
+    dashboards: "grafana"
+spec:
+  config:
+    log:
+      mode: "console"
+    auth:
+      disable_login_form: "false"
+      sigv4_auth_enabled: "true"
+  deployment:
+    spec:
+      template:
+        spec:
+          containers:
+            - name: grafana
+              image: grafana/grafana:latest
+  serviceAccount:
+    metadata:
+      annotations:
+        eks.amazonaws.com/role-arn: ${module.grafana_irsa.iam_role_arn}
+  ingress:
+    metadata:
+      annotations:
+        alb.ingress.kubernetes.io/scheme: internet-facing
+        alb.ingress.kubernetes.io/target-type: ip
+    spec:
+      ingressClassName: alb
+      rules:
+        - http:
+            paths:
+              - backend:
+                  service:
+                    name: grafana-service
+                    port:
+                      number: 3000
+                path: /
+                pathType: Prefix
+  YAML
+}
+
+resource "kubectl_manifest" "grafana_datasource_prometheus" {
+  depends_on = [
+    kubectl_manifest.grafana
+  ]
+
+  yaml_body = <<-YAML
+apiVersion: grafana.integreatly.org/v1beta1
+kind: GrafanaDatasource
+metadata:
+  name: prometheus
+  namespace: grafana
+spec:
+  instanceSelector:
+    matchLabels:
+      dashboards: "grafana"
+  datasource:
+    uid: prometheus
+    name: Prometheus
+    type: prometheus
+    access: proxy
+    url: ${aws_prometheus_workspace.this.prometheus_endpoint}
+    isDefault: true
+    editable: false
+    jsonData:
+        httpMethod: "POST"
+        sigV4AuthType: "default"
+        sigV4Auth: true
+        sigV4Region: ${var.addon_context.aws_region_name}
+  YAML
+}
+
+resource "kubectl_manifest" "grafana_datasource_loki" {
+  depends_on = [
+    kubectl_manifest.grafana
+  ]
+
+  yaml_body = <<-YAML
+apiVersion: grafana.integreatly.org/v1beta1
+kind: GrafanaDatasource
+metadata:
+  name: loki
+  namespace: grafana
+spec:
+  instanceSelector:
+    matchLabels:
+      dashboards: "grafana"
+  datasource:
+    uid: loki
+    name: Loki
+    type: loki
+    access: proxy
+    url: http://loki.loki-system:3100
+    isDefault: false
+    editable: false
+  YAML
+}
+
+resource "kubectl_manifest" "grafana_datasource_tempo" {
+  depends_on = [
+    kubectl_manifest.grafana
+  ]
+
+  yaml_body = <<-YAML
+apiVersion: grafana.integreatly.org/v1beta1
+kind: GrafanaDatasource
+metadata:
+  name: tempo
+  namespace: grafana
+spec:
+  instanceSelector:
+    matchLabels:
+      dashboards: "grafana"
+  datasource:
+    uid: tempo
+    name: Tempo
+    type: tempo
+    access: proxy
+    url: http://tempo.tempo-system:3100
+    isDefault: false
+    editable: false
+  YAML
+}
+
+resource "kubectl_manifest" "grafana_dashboard_kubernetes_cluster" {
+  depends_on = [
+    kubectl_manifest.grafana_datasource_prometheus
+  ]
+
+  yaml_body = <<-YAML
+apiVersion: grafana.integreatly.org/v1beta1
+kind: GrafanaDashboard
+metadata:
+  name: kubernetes-cluster
+  namespace: grafana
+spec:
+  folder: "Grafana"
+  instanceSelector:
+    matchLabels:
+      dashboards: "grafana"
+  grafanaCom:
+    id: 3119
+    revision: 2
+  YAML
+}
+
+resource "kubectl_manifest" "config_map_order_service_metrics_dashboard" {
+  yaml_body = templatefile("${path.module}/templates/order-service-metrics-dashboard.yaml", {})
+}
+
+resource "kubectl_manifest" "grafana_dashboard_order_service_metrics" {
+  depends_on = [
+    kubectl_manifest.grafana_datasource_prometheus,
+    kubectl_manifest.config_map_order_service_metrics_dashboard
+  ]
+
+  yaml_body = <<-YAML
+apiVersion: grafana.integreatly.org/v1beta1
+kind: GrafanaDashboard
+metadata:
+  name: order-service-metrics
+  namespace: grafana
+spec:
+  folder: "Grafana"
+  instanceSelector:
+    matchLabels:
+      dashboards: "grafana"
+  configMapRef:
+    name: order-service-metrics-dashboard
+    key: json
+  YAML
+}
diff --git a/manifests/modules/observability/oss-metrics/.workshop/terraform/outputs.tf b/manifests/modules/observability/oss/metrics-logs-traces/.workshop/terraform/outputs.tf
similarity index 99%
rename from manifests/modules/observability/oss-metrics/.workshop/terraform/outputs.tf
rename to manifests/modules/observability/oss/metrics-logs-traces/.workshop/terraform/outputs.tf
index 250fd3986..59ea732f2 100644
--- a/manifests/modules/observability/oss-metrics/.workshop/terraform/outputs.tf
+++ b/manifests/modules/observability/oss/metrics-logs-traces/.workshop/terraform/outputs.tf
@@ -4,4 +4,4 @@ output "environment_variables" {
     AMP_ENDPOINT  = aws_prometheus_workspace.this.prometheus_endpoint
     ADOT_IAM_ROLE = module.iam_assumable_role_adot.iam_role_arn
   }
-}
\ No newline at end of file
+}
diff --git a/manifests/modules/observability/oss/metrics-logs-traces/.workshop/terraform/templates/order-service-metrics-dashboard.yaml b/manifests/modules/observability/oss/metrics-logs-traces/.workshop/terraform/templates/order-service-metrics-dashboard.yaml
new file mode 100644
index 000000000..8a414db4f
--- /dev/null
+++ b/manifests/modules/observability/oss/metrics-logs-traces/.workshop/terraform/templates/order-service-metrics-dashboard.yaml
@@ -0,0 +1,270 @@
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: order-service-metrics-dashboard
+  namespace: grafana
+data:
+  json: |-
+    {
+      "annotations": {
+        "list": [
+          {
+            "builtIn": 1,
+            "datasource": {
+              "type": "grafana",
+              "uid": "-- Grafana --"
+            },
+            "enable": true,
+            "hide": true,
+            "iconColor": "rgba(0, 211, 255, 1)",
+            "name": "Annotations & Alerts",
+            "target": {
+              "limit": 100,
+              "matchAny": false,
+              "tags": [],
+              "type": "dashboard"
+            },
+            "type": "dashboard"
+          }
+        ]
+      },
+      "editable": true,
+      "fiscalYearStartMonth": 0,
+      "graphTooltip": 0,
+      "links": [],
+      "liveNow": false,
+      "panels": [
+        {
+          "datasource": {
+            "type": "prometheus",
+            "uid": "prometheus"
+          },
+          "fieldConfig": {
+            "defaults": {
+              "color": {
+                "mode": "palette-classic"
+              },
+              "custom": {
+                "hideFrom": {
+                  "legend": false,
+                  "tooltip": false,
+                  "viz": false
+                }
+              },
+              "mappings": []
+            },
+            "overrides": []
+          },
+          "gridPos": {
+            "h": 9,
+            "w": 9,
+            "x": 0,
+            "y": 0
+          },
+          "id": 2,
+          "options": {
+            "legend": {
+              "displayMode": "list",
+              "placement": "bottom",
+              "showLegend": true
+            },
+            "pieType": "pie",
+            "reduceOptions": {
+              "calcs": [
+                "lastNotNull"
+              ],
+              "fields": "",
+              "values": false
+            },
+            "tooltip": {
+              "mode": "single",
+              "sort": "none"
+            }
+          },
+          "targets": [
+            {
+              "datasource": {
+                "type": "prometheus",
+                "uid": "prometheus"
+              },
+              "editorMode": "builder",
+              "expr": "sum by(productId) (watch_orders_total{productId!=\"*\"})",
+              "legendFormat": "__auto",
+              "range": true,
+              "refId": "A"
+            }
+          ],
+          "title": "Orders by Product ",
+          "type": "piechart"
+        },
+        {
+          "datasource": {
+            "type": "prometheus",
+            "uid": "prometheus"
+          },
+          "fieldConfig": {
+            "defaults": {
+              "color": {
+                "mode": "thresholds"
+              },
+              "mappings": [],
+              "thresholds": {
+                "mode": "absolute",
+                "steps": [
+                  {
+                    "color": "green",
+                    "value": null
+                  }
+                ]
+              }
+            },
+            "overrides": []
+          },
+          "gridPos": {
+            "h": 9,
+            "w": 6,
+            "x": 9,
+            "y": 0
+          },
+          "id": 6,
+          "options": {
+            "colorMode": "value",
+            "graphMode": "none",
+            "justifyMode": "auto",
+            "orientation": "auto",
+            "reduceOptions": {
+              "calcs": [
+                "lastNotNull"
+              ],
+              "fields": "",
+              "values": false
+            },
+            "textMode": "auto"
+          },
+          "pluginVersion": "9.2.2",
+          "targets": [
+            {
+              "datasource": {
+                "type": "prometheus",
+                "uid": "prometheus"
+              },
+              "editorMode": "code",
+              "expr": "sum(watch_orders_total{productId=\"*\"}) by (productId)",
+              "legendFormat": "__auto",
+              "range": true,
+              "refId": "A"
+            }
+          ],
+          "title": "Order Count",
+          "type": "stat"
+        },
+        {
+          "datasource": {
+            "type": "prometheus",
+            "uid": "prometheus"
+          },
+          "fieldConfig": {
+            "defaults": {
+              "color": {
+                "mode": "palette-classic"
+              },
+              "custom": {
+                "axisCenteredZero": false,
+                "axisColorMode": "text",
+                "axisLabel": "",
+                "axisPlacement": "auto",
+                "barAlignment": 0,
+                "drawStyle": "line",
+                "fillOpacity": 0,
+                "gradientMode": "none",
+                "hideFrom": {
+                  "legend": false,
+                  "tooltip": false,
+                  "viz": false
+                },
+                "lineInterpolation": "linear",
+                "lineWidth": 1,
+                "pointSize": 5,
+                "scaleDistribution": {
+                  "type": "linear"
+                },
+                "showPoints": "auto",
+                "spanNulls": false,
+                "stacking": {
+                  "group": "A",
+                  "mode": "none"
+                },
+                "thresholdsStyle": {
+                  "mode": "off"
+                }
+              },
+              "mappings": [],
+              "thresholds": {
+                "mode": "absolute",
+                "steps": [
+                  {
+                    "color": "green",
+                    "value": null
+                  },
+                  {
+                    "color": "red",
+                    "value": 80
+                  }
+                ]
+              }
+            },
+            "overrides": []
+          },
+          "gridPos": {
+            "h": 8,
+            "w": 15,
+            "x": 0,
+            "y": 9
+          },
+          "id": 4,
+          "options": {
+            "legend": {
+              "calcs": [],
+              "displayMode": "list",
+              "placement": "bottom",
+              "showLegend": true
+            },
+            "tooltip": {
+              "mode": "single",
+              "sort": "none"
+            }
+          },
+          "targets": [
+            {
+              "datasource": {
+                "type": "prometheus",
+                "uid": "prometheus"
+              },
+              "editorMode": "code",
+              "expr": "sum by (productId)(rate(watch_orders_total{productId=\"*\"}[2m]))",
+              "legendFormat": "__auto",
+              "range": true,
+              "refId": "A"
+            }
+          ],
+          "title": "Order Rate",
+          "type": "timeseries"
+        }
+      ],
+      "schemaVersion": 37,
+      "style": "dark",
+      "tags": [],
+      "templating": {
+        "list": []
+      },
+      "time": {
+        "from": "now-3h",
+        "to": "now"
+      },
+      "timepicker": {},
+      "timezone": "",
+      "title": "Order Service Metrics",
+      "uid": "r7QHEZEVz",
+      "version": 1,
+      "weekStart": ""
+    }
diff --git a/manifests/modules/observability/oss-metrics/.workshop/terraform/vars.tf b/manifests/modules/observability/oss/metrics-logs-traces/.workshop/terraform/vars.tf
similarity index 60%
rename from manifests/modules/observability/oss-metrics/.workshop/terraform/vars.tf
rename to manifests/modules/observability/oss/metrics-logs-traces/.workshop/terraform/vars.tf
index 880b9bc0f..7c46aceb7 100644
--- a/manifests/modules/observability/oss-metrics/.workshop/terraform/vars.tf
+++ b/manifests/modules/observability/oss/metrics-logs-traces/.workshop/terraform/vars.tf
@@ -34,9 +34,30 @@ variable "resources_precreated" {
   type        = bool
 }
 
-variable "operator_chart_version" {
+variable "opentelemetry_operator_chart_version" {
   description = "The chart version of opentelemetry-operator to use"
   type        = string
   # renovate-helm: depName=opentelemetry-operator registryUrl=https://open-telemetry.github.io/opentelemetry-helm-charts
-  default = "0.68.1"
+  default = "0.68.0"
+}
+
+variable "loki_chart_version" {
+  description = "The chart version of loki to use"
+  type        = string
+  # renovate-helm: depName=loki registryUrl=https://grafana.github.io/helm-charts
+  default = "6.10.0"
+}
+
+variable "tempo_chart_version" {
+  description = "The chart version of tempo to use"
+  type        = string
+  # renovate-helm: depName=tempo registryUrl=https://grafana.github.io/helm-charts
+  default = "1.10.3"
+}
+
+variable "grafana_operator_chart_version" {
+  description = "The chart version of grafana-operator to use"
+  type        = string
+  # renovate-helm: depName=grafana-operator registryUrl=oci://ghcr.io/grafana/helm-charts
+  default = "v5.12.0"
 }
diff --git a/manifests/modules/observability/oss-metrics/adot/clusterrole.yaml b/manifests/modules/observability/oss/metrics-logs-traces/adot/clusterrole.yaml
similarity index 100%
rename from manifests/modules/observability/oss-metrics/adot/clusterrole.yaml
rename to manifests/modules/observability/oss/metrics-logs-traces/adot/clusterrole.yaml
diff --git a/manifests/modules/observability/oss-metrics/adot/clusterrolebinding.yaml b/manifests/modules/observability/oss/metrics-logs-traces/adot/clusterrolebinding.yaml
similarity index 100%
rename from manifests/modules/observability/oss-metrics/adot/clusterrolebinding.yaml
rename to manifests/modules/observability/oss/metrics-logs-traces/adot/clusterrolebinding.yaml
diff --git a/manifests/modules/observability/oss/metrics-logs-traces/adot/instrumentation.yaml b/manifests/modules/observability/oss/metrics-logs-traces/adot/instrumentation.yaml
new file mode 100644
index 000000000..27f879e81
--- /dev/null
+++ b/manifests/modules/observability/oss/metrics-logs-traces/adot/instrumentation.yaml
@@ -0,0 +1,16 @@
+apiVersion: opentelemetry.io/v1alpha1
+kind: Instrumentation
+metadata:
+  name: retail-store
+spec:
+  exporter:
+    endpoint: http://adot-collector.other:4317
+  propagators:
+    - tracecontext
+    - baggage
+  sampler:
+    type: parentbased_traceidratio
+    argument: "1"
+  env:
+    - name: OTEL_JAVAAGENT_ENABLED
+      value: "true"
diff --git a/manifests/modules/observability/oss-metrics/adot/kustomization.yaml b/manifests/modules/observability/oss/metrics-logs-traces/adot/kustomization.yaml
similarity index 88%
rename from manifests/modules/observability/oss-metrics/adot/kustomization.yaml
rename to manifests/modules/observability/oss/metrics-logs-traces/adot/kustomization.yaml
index c6ae77912..fa068317c 100644
--- a/manifests/modules/observability/oss-metrics/adot/kustomization.yaml
+++ b/manifests/modules/observability/oss/metrics-logs-traces/adot/kustomization.yaml
@@ -4,5 +4,6 @@ namespace: other
 resources:
   - clusterrole.yaml
   - clusterrolebinding.yaml
+  - instrumentation.yaml
   - serviceaccount.yaml
   - opentelemetrycollector.yaml
diff --git a/manifests/modules/observability/oss-metrics/adot/opentelemetrycollector.yaml b/manifests/modules/observability/oss/metrics-logs-traces/adot/opentelemetrycollector.yaml
similarity index 53%
rename from manifests/modules/observability/oss-metrics/adot/opentelemetrycollector.yaml
rename to manifests/modules/observability/oss/metrics-logs-traces/adot/opentelemetrycollector.yaml
index fc79d761b..8db14aa62 100644
--- a/manifests/modules/observability/oss-metrics/adot/opentelemetrycollector.yaml
+++ b/manifests/modules/observability/oss/metrics-logs-traces/adot/opentelemetrycollector.yaml
@@ -5,7 +5,7 @@ metadata:
   namespace: other
 spec:
   image: public.ecr.aws/aws-observability/aws-otel-collector:v0.40.0
-  mode: deployment
+  mode: daemonset
   serviceAccount: adot-collector
   config:
     receivers:
@@ -94,13 +94,104 @@ spec:
                 - source_labels: [__meta_kubernetes_pod_phase]
                   regex: Pending|Succeeded|Failed|Completed
                   action: drop
+      filelog:
+        include:
+          - /var/log/pods/*/*/*.log
+        exclude:
+          - /var/log/pods/*-system_*/*/*.log
+          - /var/log/pods/cert-manager_*/*/*.log
+          - /var/log/pods/grafana_*/*/*.log
+          - /var/log/pods/other_*/*/*.log
+        start_at: beginning
+        include_file_path: true
+        include_file_name: false
+        operators:
+          # Find out which format is used by kubernetes
+          - type: router
+            id: get-format
+            routes:
+              - output: parser-docker
+                expr: 'body matches "^\\{"'
+              - output: parser-crio
+                expr: 'body matches "^[^ Z]+ "'
+              - output: parser-containerd
+                expr: 'body matches "^[^ Z]+Z"'
+          # Parse CRI-O format
+          - type: regex_parser
+            id: parser-crio
+            regex:
+              "^(?P<time>[^ Z]+) (?P<stream>stdout|stderr) (?P<logtag>[^ ]*)
+              ?(?P<log>.*)$"
+            output: extract_metadata_from_filepath
+            timestamp:
+              parse_from: attributes.time
+              layout_type: gotime
+              layout: "2006-01-02T15:04:05.999999999Z07:00"
+          # Parse CRI-Containerd format
+          - type: regex_parser
+            id: parser-containerd
+            regex:
+              "^(?P<time>[^ ^Z]+Z) (?P<stream>stdout|stderr) (?P<logtag>[^ ]*)
+              ?(?P<log>.*)$"
+            output: extract_metadata_from_filepath
+            timestamp:
+              parse_from: attributes.time
+              layout: "%Y-%m-%dT%H:%M:%S.%LZ"
+          # Parse Docker format
+          - type: json_parser
+            id: parser-docker
+            output: extract_metadata_from_filepath
+            timestamp:
+              parse_from: attributes.time
+              layout: "%Y-%m-%dT%H:%M:%S.%LZ"
+          - type: move
+            from: attributes.log
+            to: body
+          # Extract metadata from file path
+          - type: regex_parser
+            id: extract_metadata_from_filepath
+            regex: '^.*\/(?P<namespace>[^_]+)_(?P<pod_name>[^_]+)_(?P<uid>[a-f0-9\-]{36})\/(?P<container_name>[^\._]+)\/(?P<restart_count>\d+)\.log$'
+            parse_from: attributes["log.file.path"]
+            cache:
+              size: 128 # default maximum amount of Pods per Node is 110
+          # Rename attributes
+          - type: move
+            from: attributes.stream
+            to: attributes["log.iostream"]
+          - type: move
+            from: attributes.container_name
+            to: resource["k8s.container.name"]
+          - type: move
+            from: attributes.namespace
+            to: resource["k8s.namespace.name"]
+          - type: move
+            from: attributes.pod_name
+            to: resource["k8s.pod.name"]
+          - type: move
+            from: attributes.restart_count
+            to: resource["k8s.container.restart_count"]
+          - type: move
+            from: attributes.uid
+            to: resource["k8s.pod.uid"]
+      otlp:
+        protocols:
+          grpc: {}
+          http: {}
+    processors:
+      batch: {}
     exporters:
+      logging:
+        loglevel: info
       prometheusremotewrite:
         endpoint: ${AMP_ENDPOINT}api/v1/remote_write
         auth:
           authenticator: sigv4auth
-      logging:
-        loglevel: info
+      otlphttp/loki:
+        endpoint: http://loki.loki-system:3100/otlp
+      otlp/tempo:
+        endpoint: http://tempo.tempo-system:4317
+        tls:
+          insecure: true
     extensions:
       sigv4auth:
         region: ${AWS_REGION}
@@ -115,5 +206,24 @@ spec:
       pipelines:
         metrics:
           receivers: [prometheus]
-          processors: []
+          processors: [batch]
           exporters: [logging, prometheusremotewrite]
+        logs:
+          receivers: [filelog]
+          processors: [batch]
+          exporters: [logging, otlphttp/loki]
+        traces:
+          receivers: [otlp]
+          processors: [batch]
+          exporters: [logging, otlp/tempo]
+  securityContext:
+    runAsGroup: 0
+    runAsUser: 0
+  volumeMounts:
+    - mountPath: /var/log/pods
+      name: var-log-pods
+      readOnly: true
+  volumes:
+    - hostPath:
+        path: /var/log/pods
+      name: var-log-pods
diff --git a/manifests/modules/observability/oss-metrics/adot/serviceaccount.yaml b/manifests/modules/observability/oss/metrics-logs-traces/adot/serviceaccount.yaml
similarity index 100%
rename from manifests/modules/observability/oss-metrics/adot/serviceaccount.yaml
rename to manifests/modules/observability/oss/metrics-logs-traces/adot/serviceaccount.yaml
diff --git a/website/docs/observability/index.md b/website/docs/observability/index.md
index 314c64acc..61a5d4c7c 100644
--- a/website/docs/observability/index.md
+++ b/website/docs/observability/index.md
@@ -11,7 +11,7 @@ In this chapter, we'll cover how you can use AWS observability solutions integra
 - Kubernetes Resources in the EKS console view
 - Control Plane and Pod Logs utilizing Fluentbit
 - Monitoring Metrics with CloudWatch Container Insights
-- Monitoring EKS Metrics with AMP and ADOT.
+- Implementing observability with open source solutions like ADOT, AMP, Loki and Tempo
 
 Watch a video walk-through of the observability module with one of the module maintainers, Nirmal Mehta (AWS) here:
 
diff --git a/website/docs/observability/kubecost/amp.md b/website/docs/observability/kubecost/amp.md
deleted file mode 100644
index 540289dd5..000000000
--- a/website/docs/observability/kubecost/amp.md
+++ /dev/null
@@ -1,14 +0,0 @@
----
-title: "Kubecost and Amazon Managed Service for Prometheus"
-sidebar_position: 30
----
-
-Currently Kubecost is using a self hosted Prometheus instance within our Kubernetes cluster. You can update the Kubecost deployment configuration to use Amazon Managed Service for Prometheus (AMP) instead.
-
-AMP is a Prometheus-compatible monitoring and alerting service that makes it easy to monitor containerized applications and infrastructure at scale. You can use the open-source Prometheus query language to monitor and alert for the performance of containerized workloads without having to worry about scaling the underlying monitoring infrastructure. The service automatically scales the ingestion, storage, alerting, and querying of operational metrics as workloads grow or shrink. Furthermore, it’s integrated with AWS security services to enable fast and secure access to data. This lets you concentrate on your workloads instead of having to manage your monitoring stack.
-
-Below is an image of how Kubecost integrates with AMP. Kubecost uses a Signature Version 4 (SigV4) proxy to query AMP. SigV4 is the process to add authentication information to AWS API requests sent by HTTP. For security, most requests to AWS must be signed with an access key. The access key consists of an access key ID and secret access key, which are commonly referred to as your security credentials. When an AWS service receives the request, it performs the same steps that you did to calculate the signature you sent in your request. AWS then compares its calculated signature to the one you sent with the request. If the signatures match, the request is processed. If the signatures don't match, the request is denied.
-
-![Architecture Diagram of Kubecost AMP Integration](./assets/AWS-AMP-integ-architecture.webp)
-
-To get started integrating Kubecost with AMP, check out [this following blog post](https://aws.amazon.com/blogs/mt/integrating-kubecost-with-amazon-managed-service-for-prometheus/).
diff --git a/website/docs/observability/kubecost/assets/AWS-AMP-integ-architecture.webp b/website/docs/observability/kubecost/assets/AWS-AMP-integ-architecture.webp
deleted file mode 100644
index bcf18c121..000000000
Binary files a/website/docs/observability/kubecost/assets/AWS-AMP-integ-architecture.webp and /dev/null differ
diff --git a/website/docs/observability/kubecost/assets/aggregate-by-deployment.webp b/website/docs/observability/kubecost/assets/aggregate-by-deployment.webp
deleted file mode 100644
index b5c1ce5fe..000000000
Binary files a/website/docs/observability/kubecost/assets/aggregate-by-deployment.webp and /dev/null differ
diff --git a/website/docs/observability/kubecost/assets/cloud9.webp b/website/docs/observability/kubecost/assets/cloud9.webp
deleted file mode 100644
index 36b6dcd00..000000000
Binary files a/website/docs/observability/kubecost/assets/cloud9.webp and /dev/null differ
diff --git a/website/docs/observability/kubecost/assets/controllers.webp b/website/docs/observability/kubecost/assets/controllers.webp
deleted file mode 100644
index d4f8b06b8..000000000
Binary files a/website/docs/observability/kubecost/assets/controllers.webp and /dev/null differ
diff --git a/website/docs/observability/kubecost/assets/costallocation-filter.webp b/website/docs/observability/kubecost/assets/costallocation-filter.webp
deleted file mode 100644
index d12d191de..000000000
Binary files a/website/docs/observability/kubecost/assets/costallocation-filter.webp and /dev/null differ
diff --git a/website/docs/observability/kubecost/assets/costallocation-label.webp b/website/docs/observability/kubecost/assets/costallocation-label.webp
deleted file mode 100644
index 07b9d52e0..000000000
Binary files a/website/docs/observability/kubecost/assets/costallocation-label.webp and /dev/null differ
diff --git a/website/docs/observability/kubecost/assets/costallocation.webp b/website/docs/observability/kubecost/assets/costallocation.webp
deleted file mode 100644
index 3a642e826..000000000
Binary files a/website/docs/observability/kubecost/assets/costallocation.webp and /dev/null differ
diff --git a/website/docs/observability/kubecost/assets/namespace.webp b/website/docs/observability/kubecost/assets/namespace.webp
deleted file mode 100644
index 4a731e226..000000000
Binary files a/website/docs/observability/kubecost/assets/namespace.webp and /dev/null differ
diff --git a/website/docs/observability/kubecost/assets/orders.webp b/website/docs/observability/kubecost/assets/orders.webp
deleted file mode 100644
index 4c0d78c2a..000000000
Binary files a/website/docs/observability/kubecost/assets/orders.webp and /dev/null differ
diff --git a/website/docs/observability/kubecost/assets/overview.webp b/website/docs/observability/kubecost/assets/overview.webp
deleted file mode 100644
index b47867f82..000000000
Binary files a/website/docs/observability/kubecost/assets/overview.webp and /dev/null differ
diff --git a/website/docs/observability/kubecost/assets/team.webp b/website/docs/observability/kubecost/assets/team.webp
deleted file mode 100644
index f84a30205..000000000
Binary files a/website/docs/observability/kubecost/assets/team.webp and /dev/null differ
diff --git a/website/docs/observability/open-source-metrics/adot.md b/website/docs/observability/open-source-metrics/adot.md
deleted file mode 100644
index 918ef0f37..000000000
--- a/website/docs/observability/open-source-metrics/adot.md
+++ /dev/null
@@ -1,85 +0,0 @@
----
-title: "Scraping metrics using AWS Distro for OpenTelemetry"
-sidebar_position: 10
----
-
-In this lab we'll be storing metrics in an Amazon Managed Service for Prometheus workspace which is already created for you. You should be able to see it in the console:
-
-<ConsoleButton url="https://console.aws.amazon.com/prometheus/home#/workspaces" service="aps" label="Open APS console"/>
-
-To view the workspace, click on the **All Workspaces** tab on the left control panel. Select the workspace that starts with **eks-workshop** and you can view several tabs under the workspace such as rules management, alert manager etc.
-
-To gather the metrics from the Amazon EKS Cluster, we'll deploy a `OpenTelemetryCollector` custom resource. The ADOT operator running on the EKS cluster detects the presence of or changes of the this resource and for any such changes, the operator performs the following actions:
-
-- Verifies that all the required connections for these creation, update, or deletion requests to the Kubernetes API server are available.
-- Deploys ADOT collector instances in the way the user expressed in the `OpenTelemetryCollector` resource configuration.
-
-Now, let's create resources to allow the ADOT collector the permissions it needed. We'll start with the ClusterRole that gives the collector permissions to access the Kubernetes API:
-
-```file
-manifests/modules/observability/oss-metrics/adot/clusterrole.yaml
-```
-
-We'll use the managed IAM policy `AmazonPrometheusRemoteWriteAccess` to provide the collector with the IAM permissions it needs via IAM Roles for Service Accounts:
-
-```bash
-$ aws iam list-attached-role-policies \
-  --role-name $EKS_CLUSTER_NAME-adot-collector | jq .
-{
-  "AttachedPolicies": [
-    {
-      "PolicyName": "AmazonPrometheusRemoteWriteAccess",
-      "PolicyArn": "arn:aws:iam::aws:policy/AmazonPrometheusRemoteWriteAccess"
-    }
-  ]
-}
-```
-
-This IAM role will be added to the ServiceAccount for the collector:
-
-```file
-manifests/modules/observability/oss-metrics/adot/serviceaccount.yaml
-```
-
-Create the resources:
-
-```bash hook=deploy-adot
-$ kubectl kustomize ~/environment/eks-workshop/modules/observability/oss-metrics/adot \
-  | envsubst | kubectl apply -f-
-$ kubectl rollout status -n other deployment/adot-collector --timeout=120s
-```
-
-The specification for the collector is too long to show here, but you can view it like so:
-
-```bash
-$ kubectl -n other get opentelemetrycollector adot -o yaml
-```
-
-Let's break this down in to sections to get a better understanding of what has been deployed. This is the OpenTelemetry collector configuration:
-
-```bash
-$ kubectl -n other get opentelemetrycollector adot -o jsonpath='{.spec.config}' | yq
-```
-
-This is configuring an OpenTelemetry pipeline with the following structure:
-
-- Receivers
-  - [Prometheus receiver](https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/main/receiver/prometheusreceiver/README.md) designed to scrape metrics from targets that expose a Prometheus endpoint
-- Processors
-  - None in this pipeline
-- Exporters
-  - [Prometheus remote write exporter](https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/main/exporter/prometheusremotewriteexporter) which sends metrics to a Prometheus remote write endpoint like AMP
-
-This collector is also configured to run as a Deployment with one collector agent running:
-
-```bash
-$ kubectl -n other get opentelemetrycollector adot -o jsonpath='{.spec.mode}{"\n"}'
-```
-
-We can confirm that by inspecting the ADOT collector Pods that are running:
-
-```bash
-$ kubectl get pods -n other
-NAME                              READY   STATUS    RESTARTS   AGE
-adot-collector-6f6b8867f6-lpjb7   1/1     Running   2          11d
-```
diff --git a/website/docs/observability/open-source-metrics/assets/amg12.webp b/website/docs/observability/open-source-metrics/assets/amg12.webp
deleted file mode 100644
index 8aaed7ace..000000000
Binary files a/website/docs/observability/open-source-metrics/assets/amg12.webp and /dev/null differ
diff --git a/website/docs/observability/open-source-metrics/assets/amgws.webp b/website/docs/observability/open-source-metrics/assets/amgws.webp
deleted file mode 100644
index f93fdf6ba..000000000
Binary files a/website/docs/observability/open-source-metrics/assets/amgws.webp and /dev/null differ
diff --git a/website/docs/observability/open-source-metrics/assets/dashboard.webp b/website/docs/observability/open-source-metrics/assets/dashboard.webp
deleted file mode 100644
index adced04ba..000000000
Binary files a/website/docs/observability/open-source-metrics/assets/dashboard.webp and /dev/null differ
diff --git a/website/docs/observability/open-source-metrics/assets/datasource.webp b/website/docs/observability/open-source-metrics/assets/datasource.webp
deleted file mode 100644
index b09a8d562..000000000
Binary files a/website/docs/observability/open-source-metrics/assets/datasource.webp and /dev/null differ
diff --git a/website/docs/observability/open-source-metrics/assets/editPanel.webp b/website/docs/observability/open-source-metrics/assets/editPanel.webp
deleted file mode 100644
index 4fe24f45b..000000000
Binary files a/website/docs/observability/open-source-metrics/assets/editPanel.webp and /dev/null differ
diff --git a/website/docs/observability/open-source-metrics/assets/grafana-login.webp b/website/docs/observability/open-source-metrics/assets/grafana-login.webp
deleted file mode 100644
index d36361521..000000000
Binary files a/website/docs/observability/open-source-metrics/assets/grafana-login.webp and /dev/null differ
diff --git a/website/docs/observability/open-source-metrics/assets/order-service-metrics-dashboard.webp b/website/docs/observability/open-source-metrics/assets/order-service-metrics-dashboard.webp
deleted file mode 100644
index 9ddf28869..000000000
Binary files a/website/docs/observability/open-source-metrics/assets/order-service-metrics-dashboard.webp and /dev/null differ
diff --git a/website/docs/observability/open-source-metrics/assets/promqlQuery.webp b/website/docs/observability/open-source-metrics/assets/promqlQuery.webp
deleted file mode 100644
index 940b14775..000000000
Binary files a/website/docs/observability/open-source-metrics/assets/promqlQuery.webp and /dev/null differ
diff --git a/website/docs/observability/open-source-metrics/assets/query.webp b/website/docs/observability/open-source-metrics/assets/query.webp
deleted file mode 100644
index 3c994001a..000000000
Binary files a/website/docs/observability/open-source-metrics/assets/query.webp and /dev/null differ
diff --git a/website/docs/observability/open-source-metrics/assets/retailMetrics.webp b/website/docs/observability/open-source-metrics/assets/retailMetrics.webp
deleted file mode 100644
index 072d050dc..000000000
Binary files a/website/docs/observability/open-source-metrics/assets/retailMetrics.webp and /dev/null differ
diff --git a/website/docs/observability/open-source-metrics/assets/totalOrderPrice.webp b/website/docs/observability/open-source-metrics/assets/totalOrderPrice.webp
deleted file mode 100644
index a89294f83..000000000
Binary files a/website/docs/observability/open-source-metrics/assets/totalOrderPrice.webp and /dev/null differ
diff --git a/website/docs/observability/open-source-metrics/assets/totalOrders.webp b/website/docs/observability/open-source-metrics/assets/totalOrders.webp
deleted file mode 100644
index 3c79bca25..000000000
Binary files a/website/docs/observability/open-source-metrics/assets/totalOrders.webp and /dev/null differ
diff --git a/website/docs/observability/open-source-metrics/assets/totalusage.webp b/website/docs/observability/open-source-metrics/assets/totalusage.webp
deleted file mode 100644
index 8e296e60f..000000000
Binary files a/website/docs/observability/open-source-metrics/assets/totalusage.webp and /dev/null differ
diff --git a/website/docs/observability/open-source-metrics/assets/watchCount.webp b/website/docs/observability/open-source-metrics/assets/watchCount.webp
deleted file mode 100644
index 5f3322d1d..000000000
Binary files a/website/docs/observability/open-source-metrics/assets/watchCount.webp and /dev/null differ
diff --git a/website/docs/observability/open-source-metrics/tests/hook-install.sh b/website/docs/observability/open-source-metrics/tests/hook-install.sh
deleted file mode 100644
index a4b429d85..000000000
--- a/website/docs/observability/open-source-metrics/tests/hook-install.sh
+++ /dev/null
@@ -1,11 +0,0 @@
-set -Eeuo pipefail
-
-before() {
-  echo "noop"
-}
-
-after() {
-  kubectl wait --for condition=established --timeout=120s crd opentelemetrycollectors.opentelemetry.io
-}
-
-"$@"
diff --git a/website/docs/observability/oss/_category_.json b/website/docs/observability/oss/_category_.json
new file mode 100644
index 000000000..0d4475828
--- /dev/null
+++ b/website/docs/observability/oss/_category_.json
@@ -0,0 +1,3 @@
+{
+  "collapsed": false
+}
diff --git a/website/docs/observability/oss/index.md b/website/docs/observability/oss/index.md
new file mode 100644
index 000000000..932854c19
--- /dev/null
+++ b/website/docs/observability/oss/index.md
@@ -0,0 +1,8 @@
+---
+title: "Observability with open source solutions"
+sidebar_position: 40
+---
+
+In the 1st lab, we'll collect the metrics, logs, and traces from the application using [AWS Distro for OpenTelemetry](https://aws-otel.github.io/), store the metrics in [Amazon Managed Service for Prometheus](https://aws.amazon.com/prometheus), logs in [Loki](https://grafana.com/oss/loki), traces in [Tempo](https://grafana.com/oss/tempo) and visualize using [Amazon Managed Grafana](https://aws.amazon.com/grafana).
+
+In the 2nd lab, we'll take a look at how to use [Kubecost](https://www.kubecost.com) to collect and store the data in [Amazon Managed Service for Prometheus](https://aws.amazon.com/prometheus) and then walkthrough some of its features that provide the cost visibility and insights for the workloads running inside the EKS cluster.
diff --git a/website/docs/observability/oss/kubecost/assets/allocation-deployment.webp b/website/docs/observability/oss/kubecost/assets/allocation-deployment.webp
new file mode 100644
index 000000000..084daf31a
Binary files /dev/null and b/website/docs/observability/oss/kubecost/assets/allocation-deployment.webp differ
diff --git a/website/docs/observability/oss/kubecost/assets/allocation-filter.webp b/website/docs/observability/oss/kubecost/assets/allocation-filter.webp
new file mode 100644
index 000000000..b61188794
Binary files /dev/null and b/website/docs/observability/oss/kubecost/assets/allocation-filter.webp differ
diff --git a/website/docs/observability/oss/kubecost/assets/allocation-label.webp b/website/docs/observability/oss/kubecost/assets/allocation-label.webp
new file mode 100644
index 000000000..4cae4d1dc
Binary files /dev/null and b/website/docs/observability/oss/kubecost/assets/allocation-label.webp differ
diff --git a/website/docs/observability/oss/kubecost/assets/allocation-orders-deployment.webp b/website/docs/observability/oss/kubecost/assets/allocation-orders-deployment.webp
new file mode 100644
index 000000000..d0ff3251c
Binary files /dev/null and b/website/docs/observability/oss/kubecost/assets/allocation-orders-deployment.webp differ
diff --git a/website/docs/observability/oss/kubecost/assets/allocation-orders-namespace.webp b/website/docs/observability/oss/kubecost/assets/allocation-orders-namespace.webp
new file mode 100644
index 000000000..a0369f293
Binary files /dev/null and b/website/docs/observability/oss/kubecost/assets/allocation-orders-namespace.webp differ
diff --git a/website/docs/observability/oss/kubecost/assets/allocation-orders-resources.webp b/website/docs/observability/oss/kubecost/assets/allocation-orders-resources.webp
new file mode 100644
index 000000000..d40132350
Binary files /dev/null and b/website/docs/observability/oss/kubecost/assets/allocation-orders-resources.webp differ
diff --git a/website/docs/observability/oss/kubecost/assets/allocation-team.webp b/website/docs/observability/oss/kubecost/assets/allocation-team.webp
new file mode 100644
index 000000000..0fcb4d9ed
Binary files /dev/null and b/website/docs/observability/oss/kubecost/assets/allocation-team.webp differ
diff --git a/website/docs/observability/oss/kubecost/assets/allocation.webp b/website/docs/observability/oss/kubecost/assets/allocation.webp
new file mode 100644
index 000000000..68e607349
Binary files /dev/null and b/website/docs/observability/oss/kubecost/assets/allocation.webp differ
diff --git a/website/docs/observability/oss/kubecost/assets/amp-architecture.webp b/website/docs/observability/oss/kubecost/assets/amp-architecture.webp
new file mode 100644
index 000000000..087d7d5a5
Binary files /dev/null and b/website/docs/observability/oss/kubecost/assets/amp-architecture.webp differ
diff --git a/website/docs/observability/oss/kubecost/assets/overview.webp b/website/docs/observability/oss/kubecost/assets/overview.webp
new file mode 100644
index 000000000..e0ee272eb
Binary files /dev/null and b/website/docs/observability/oss/kubecost/assets/overview.webp differ
diff --git a/website/docs/observability/kubecost/costallocation.md b/website/docs/observability/oss/kubecost/cost-allocation.md
similarity index 60%
rename from website/docs/observability/kubecost/costallocation.md
rename to website/docs/observability/oss/kubecost/cost-allocation.md
index 6324a1603..e3d121e89 100644
--- a/website/docs/observability/kubecost/costallocation.md
+++ b/website/docs/observability/oss/kubecost/cost-allocation.md
@@ -7,9 +7,7 @@ Now, we'll take a look at Cost Allocation. Click on <b>Cost Allocation</b>.
 
 You should see the following Dashboard:
 
-<Browser url='http://k8s-kubecost-kubecost-e83ecf8fc1-fc26f5c92767520f.elb.us-west-2.amazonaws.com:9090/allocations'>
-<img src={require('./assets/costallocation.webp').default}/>
-</Browser>
+![Kubecost cost allocation](./assets/allocation.webp)
 
 We can use this screen to dive further into the cost allocation of our cluster. We can look at various cost dimensions:
 
@@ -22,48 +20,36 @@ The application we installed in the Introduction section created several of thes
 
 To do this click on the setting button next to <b>Aggregate by</b> at the top right.
 
-<Browser url='http://k8s-kubecost-kubecost-e83ecf8fc1-fc26f5c92767520f.elb.us-west-2.amazonaws.com:9090/allocations'>
-<img src={require('./assets/costallocation-filter.webp').default}/>
-</Browser>
+![Kubecost cost allocation - filter](./assets/allocation-filter.webp)
 
-Then under <b>Filters</b> select <b>label</b> from the drop-down menu, enter the value `app.kubernetes.io/created-by: eks-workshop`, and click the plus symbol.
+Then under <b>Filters</b> select <b>Label (key + value)</b> from the drop-down menu, enter the value `app.kubernetes.io/created-by` for Label and `eks-workshop` for Filter Value(s), and click the plus symbol.
 
-<Browser url='http://k8s-kubecost-kubecost-e83ecf8fc1-fc26f5c92767520f.elb.us-west-2.amazonaws.com:9090/allocations'>
-<img src={require('./assets/costallocation-label.webp').default}/>
-</Browser>
+![Kubecost cost allocation - label](./assets/allocation-label.webp)
 
 This filters down the namespaces to only show our workloads that have the label `app.kubernetes.io/create-by: eks-workshop`. This label is included on all the components of the application we launched in the Introduction section.
 
 Now click on <b>Aggregate by</b> and choose <b>Deployment</b>. This will aggregate the costs by deployment instead of by namespace. See below.
 
-<Browser url='http://k8s-kubecost-kubecost-e83ecf8fc1-fc26f5c92767520f.elb.us-west-2.amazonaws.com:9090/allocations'>
-<img src={require('./assets/aggregate-by-deployment.webp').default}/>
-</Browser>
+![Kubecost cost allocation - deployment](./assets/allocation-deployment.webp)
 
 We see that there are different deployments associated with our application. We can dig deeper. Let's look at a single namespace. Set <b>Aggregate by</b> back to <b>Namespace</b>, remove the filter, and click on one of the namespaces in the table. We've chosen the orders namespace.
 
-<Browser url='http://k8s-kubecost-kubecost-e83ecf8fc1-fc26f5c92767520f.elb.us-west-2.amazonaws.com:9090/allocations'>
-<img src={require('./assets/namespace.webp').default}/>
-</Browser>
+![Kubecost cost allocation - orders namespace](./assets/allocation-orders-namespace.webp)
 
 In this view we can see all the costs associated with the Kubernetes resources running in this namespace. This can be a useful view if you have a multi-tenant cluster and have a namespace per customer.
 
 We can also look at the different resources running in this namespace and see their associated costs.
 
-![Orders Namespace Resources](assets/orders.webp)
+![Kubecost cost allocation - orders resources](./assets/allocation-orders-resources.webp)
 
 Click on one of the entries under <b>Controllers</b>. We've clicked on the orders deployment.
 
-<Browser url='http://k8s-kubecost-kubecost-e83ecf8fc1-fc26f5c92767520f.elb.us-west-2.amazonaws.com:9090/allocations'>
-<img src={require('./assets/controllers.webp').default}/>
-</Browser>
+![Kubecost cost allocation - orders deployment](./assets/allocation-orders-deployment.webp)
 
 This view shows us more detail of the specific "controller", in this case a deployment. We can start to use this information to understand what optimizations we can make. Such as tuning resource requests and limits to limit the amount of CPU and memory that is allocated to each pod in our EKS cluster.
 
-Until now we've looked at a broad overview of cost allocations or a deep dive into single resource. What if we want to group dig into cost allocation by team? Consider the following scenario: each team at a company is responsible for their operating costs within a cluster. For example, we have a team that is responsible for all the databases in our cluster and they want to dig into their operating costs. This can be accomplished by giving each database a custom label associated to that team. In our cluster we've done this by given all the database resources the label `app.kubernetes.io/team: database`. Using this label, we can filter on all resources across the different namespaces that belong to this team.
+Until now we've looked at a broad overview of cost allocations or a deep dive into single resource. What if we want to group dig into cost allocation by team? Consider the following scenario: each team at a company is responsible for their operating costs within a cluster. For example, we have a team that is responsible for all the databases in our cluster and they want to dig into their operating costs. This can be accomplished by giving each database a custom label associated to that team. In our cluster we've done this by given all the database resources the label key `app.kubernetes.io/team` and value `database`. Using this label, we can filter on all resources across the different namespaces that belong to this team.
 
-<Browser url='http://k8s-kubecost-kubecost-e83ecf8fc1-fc26f5c92767520f.elb.us-west-2.amazonaws.com:9090/allocations'>
-<img src={require('./assets/team.webp').default}/>
-</Browser>
+![Kubecost cost allocation - team](./assets/allocation-team.webp)
 
 There are many other features available with Kubecost as well, like Savings, Health, Reports and Alerts. Feel free to play around with various links.
diff --git a/website/docs/observability/kubecost/index.md b/website/docs/observability/oss/kubecost/index.md
similarity index 56%
rename from website/docs/observability/kubecost/index.md
rename to website/docs/observability/oss/kubecost/index.md
index 89a3e4e73..23c9da4de 100644
--- a/website/docs/observability/kubecost/index.md
+++ b/website/docs/observability/oss/kubecost/index.md
@@ -1,6 +1,6 @@
 ---
 title: "Cost visibility with Kubecost"
-sidebar_position: 60
+sidebar_position: 20
 sidebar_custom_props: { "module": true }
 description: "Gain cost visibility and insights for teams using Amazon Elastic Kubernetes Service with Kubecost."
 ---
@@ -11,15 +11,15 @@ description: "Gain cost visibility and insights for teams using Amazon Elastic K
 Prepare your environment for this section:
 
 ```bash timeout=300 wait=30
-$ prepare-environment observability/kubecost
+$ prepare-environment observability/oss/kubecost
 ```
 
 This will make the following changes to your lab environment:
 
-- Install the AWS Load Balancer controller in the Amazon EKS cluster
-- Install the EKS managed addon for the EBS CSI driver
+- Create an IAM role for the Kubecost to access Amazon Managed Prometheus
+- Provision an Amazon Managed Service for Prometheus (AMP) workspace
 
-You can view the Terraform that applies these changes [here](https://github.com/VAR::MANIFESTS_OWNER/VAR::MANIFESTS_REPOSITORY/tree/VAR::MANIFESTS_REF/manifests/modules/observability/kubecost/.workshop/terraform).
+You can view the Terraform that applies these changes [here](https://github.com/VAR::MANIFESTS_OWNER/VAR::MANIFESTS_REPOSITORY/tree/VAR::MANIFESTS_REF/manifests/modules/observability/oss/kubecost/.workshop/terraform).
 
 :::
 
@@ -29,13 +29,9 @@ While you can track Kubernetes control plane and EC2 costs using AWS Cost and Us
 
 This is the exact challenge that Kubecost is dedicated to tackling. Founded in 2019, Kubecost launched to provide customers with visibility into spend and resource efficiency in Kubernetes environments, and today helps thousands of teams address this challenge. Kubecost is built on OpenCost, which was recently accepted as a Cloud Native Computing Foundation (CNCF) Sandbox project, and is actively supported by AWS.
 
-In this chapter, we'll take a look at how to use Kubecost to measure the cost allocation of various components at namespace level, deployment level and pod level. We'll also see the resource efficiency to check whether the deployments are over provisioned or under provisioned, health of the system, etc.
+In this lab, we'll take a look at how to use Kubecost to measure the cost allocation of various components at namespace level, deployment level and pod level. We'll also see the resource efficiency to check whether the deployments are over provisioned or under provisioned, health of the system, etc.
 
 :::tip
-After completing this module checkout how to use Kubecost and [Amazon Managed Service for Prometheus](https://docs.aws.amazon.com/prometheus/latest/userguide/what-is-Amazon-Managed-Service-Prometheus.html) to extend cost visibility beyond a single EKS cluster with [Multi-Cluster Cost Monitoring](https://aws.amazon.com/blogs/containers/multi-cluster-cost-monitoring-using-kubecost-with-amazon-eks-and-amazon-managed-service-for-prometheus/). Learn how to [secure access to Kubecost dashboard using Amazon Cognito](https://aws.amazon.com/blogs/containers/securing-kubecost-access-with-amazon-cognito/).
+After completing this lab, checkout how to use Kubecost and [Amazon Managed Service for Prometheus](https://docs.aws.amazon.com/prometheus/latest/userguide/what-is-Amazon-Managed-Service-Prometheus.html) to extend cost visibility beyond a single EKS cluster with [Multi-Cluster Cost Monitoring](https://aws.amazon.com/blogs/containers/multi-cluster-cost-monitoring-using-kubecost-with-amazon-eks-and-amazon-managed-service-for-prometheus/).
 
 :::
-
-:::info
-If you are using the CDK Observability Accelerator then check out the [Kubecost Addon](https://aws-quickstart.github.io/cdk-eks-blueprints/addons/kubecost/). The addon greatly simplifies the process of setting up Kubecost and AMP for your EKS clusters.
-:::
diff --git a/website/docs/observability/kubecost/introduction.md b/website/docs/observability/oss/kubecost/installation.md
similarity index 56%
rename from website/docs/observability/kubecost/introduction.md
rename to website/docs/observability/oss/kubecost/installation.md
index 461156073..873e0e1b7 100644
--- a/website/docs/observability/kubecost/introduction.md
+++ b/website/docs/observability/oss/kubecost/installation.md
@@ -1,22 +1,30 @@
 ---
-title: "Introduction"
+title: "Installation"
 sidebar_position: 10
 ---
 
-The first thing we'll do is install Kubecost in our cluster. As part of the lab preparation an the AWS Load Balancer Controller and EBS CSI driver were pre-installed to provide ingress and storage to Kubecost.
+AMP is a Prometheus-compatible monitoring and alerting service that makes it easy to monitor containerized applications and infrastructure at scale. You can use the open-source Prometheus query language to monitor and alert for the performance of containerized workloads without having to worry about scaling the underlying monitoring infrastructure. The service automatically scales the ingestion, storage, alerting, and querying of operational metrics as workloads grow or shrink. Furthermore, it’s integrated with AWS security services to enable fast and secure access to data. This lets you concentrate on your workloads instead of having to manage your monitoring stack.
+
+Below is an image of how Kubecost integrates with AMP. Kubecost uses a Signature Version 4 (SigV4) proxy to query AMP. SigV4 is the process to add authentication information to AWS API requests sent by HTTP. For security, most requests to AWS must be signed with an access key. The access key consists of an access key ID and secret access key, which are commonly referred to as your security credentials. When an AWS service receives the request, it performs the same steps that you did to calculate the signature you sent in your request. AWS then compares its calculated signature to the one you sent with the request. If the signatures match, the request is processed. If the signatures don't match, the request is denied.
+
+![Architecture Diagram of Kubecost AMP Integration](./assets/amp-architecture.webp)
+
+The first thing we'll do is install Kubecost in our cluster. As part of the lab preparation an the AWS Load Balancer Controller and EBS CSI driver were pre-installed to provide ingress and storage to Kubecost. AMP workspace was also provision.
 
 All that we have left to do is install Kubecost as a Helm chart:
 
-```bash timeout=300
+```bash timeout=300 wait=30 hook=install
 $ aws ecr-public get-login-password \
   --region us-east-1 | helm registry login \
   --username AWS \
   --password-stdin public.ecr.aws
+$ envsubst < ~/environment/eks-workshop/modules/observability/oss/kubecost/values.template.yaml \
+  > ~/environment/eks-workshop/modules/observability/oss/kubecost/values.yaml
 $ helm upgrade --install kubecost oci://public.ecr.aws/kubecost/cost-analyzer \
   --version "${KUBECOST_CHART_VERSION}" \
   --namespace "kubecost" --create-namespace \
   --values https://raw.githubusercontent.com/kubecost/cost-analyzer-helm-chart/v${KUBECOST_CHART_VERSION}/cost-analyzer/values-eks-cost-monitoring.yaml \
-  --values ~/environment/eks-workshop/modules/observability/kubecost/values.yaml \
+  --values ~/environment/eks-workshop/modules/observability/oss/kubecost/values.yaml \
   --wait
 NAME: kubecost
 LAST DEPLOYED: Thu Jun 13 17:48:55 2024
@@ -69,6 +77,4 @@ Accept-Ranges: bytes
 
 Open the URL in your browser to access Kubecost:
 
-<Browser url='http://k8s-kubecost-kubecost-e83ecf8fc1-fc26f5c92767520f.elb.us-west-2.amazonaws.com:9090'>
-<img src={require('./assets/overview.webp').default}/>
-</Browser>
+![Kubecost overview](./assets/overview.webp)
diff --git a/website/docs/observability/oss/kubecost/tests/hook-install.sh b/website/docs/observability/oss/kubecost/tests/hook-install.sh
new file mode 100644
index 000000000..1d6bd6c21
--- /dev/null
+++ b/website/docs/observability/oss/kubecost/tests/hook-install.sh
@@ -0,0 +1,12 @@
+set -Eeuo pipefail
+
+before() {
+  echo "noop"
+}
+
+after() {
+  kubectl wait --for condition=available --timeout=120s -n kubecost deployment kubecost-cost-analyzer
+  kubectl wait --for condition=available --timeout=120s -n kubecost deployment kubecost-prometheus-server
+}
+
+"$@"
diff --git a/website/docs/observability/kubecost/tests/hook-suite.sh b/website/docs/observability/oss/kubecost/tests/hook-suite.sh
similarity index 100%
rename from website/docs/observability/kubecost/tests/hook-suite.sh
rename to website/docs/observability/oss/kubecost/tests/hook-suite.sh
diff --git a/website/docs/observability/open-source-metrics/accessing-grafana.md b/website/docs/observability/oss/metrics-logs-traces/accessing-grafana.md
similarity index 53%
rename from website/docs/observability/open-source-metrics/accessing-grafana.md
rename to website/docs/observability/oss/metrics-logs-traces/accessing-grafana.md
index a435d70cf..03d0feb8d 100644
--- a/website/docs/observability/open-source-metrics/accessing-grafana.md
+++ b/website/docs/observability/oss/metrics-logs-traces/accessing-grafana.md
@@ -6,7 +6,7 @@ sidebar_position: 30
 An instance of Grafana has been pre-installed in your EKS cluster. To access it you first need to retrieve the URL:
 
 ```bash hook=check-grafana
-$ kubectl get ingress -n grafana grafana -o=jsonpath='{.status.loadBalancer.ingress[0].hostname}{"\n"}'
+$ kubectl get ingress -n grafana grafana-ingress -o=jsonpath='{.status.loadBalancer.ingress[0].hostname}{"\n"}'
 k8s-grafana-grafana-123497e39be-2107151316.us-west-2.elb.amazonaws.com
 ```
 
@@ -17,10 +17,10 @@ Opening this URL in a browser will bring up a login screen.
 To retrieve the credentials for the user query the secret created by the Grafana helm chart:
 
 ```bash
-$ kubectl get -n grafana secrets/grafana -o=jsonpath='{.data.admin-user}' | base64 -d; printf "\n"
-$ kubectl get -n grafana secrets/grafana -o=jsonpath='{.data.admin-password}' | base64 -d; printf "\n"
+$ kubectl get -n grafana secrets/grafana-admin-credentials -o=jsonpath='{.data.GF_SECURITY_ADMIN_USER}' | base64 -d; printf "\n"
+$ kubectl get -n grafana secrets/grafana-admin-credentials -o=jsonpath='{.data.GF_SECURITY_ADMIN_PASSWORD}' | base64 -d; printf "\n"
 ```
 
-After logging into the Grafana console, let's take a look at the datasources section. You should see the Amazon Managed Service for Prometheus workspace configured as a datasource already.
+After logging into the Grafana console, let's take a look at the datasources section. You should see the Amazon Managed Service for Prometheus workspace, Loki and Tempo configured as a datasource already.
 
-![Amazon Managed Service for Prometheus Datasource](./assets/datasource.webp)
+![Amazon Managed Service for Prometheus Datasource](./assets/grafana-datasource.webp)
diff --git a/website/docs/observability/oss/metrics-logs-traces/adot.md b/website/docs/observability/oss/metrics-logs-traces/adot.md
new file mode 100644
index 000000000..e2948d8e5
--- /dev/null
+++ b/website/docs/observability/oss/metrics-logs-traces/adot.md
@@ -0,0 +1,118 @@
+---
+title: "Collecting metrics, logs and traces using ADOT"
+sidebar_position: 10
+---
+
+In this lab we'll be storing metrics in an Amazon Managed Service for Prometheus workspace which is already created for you. You should be able to see it in the console:
+
+<ConsoleButton url="https://console.aws.amazon.com/prometheus/home#/workspaces" service="aps" label="Open APS console"/>
+
+To view the workspace, click on the **All Workspaces** tab on the left control panel. Select the workspace that starts with **eks-workshop** and you can view several tabs under the workspace such as rules management, alert manager etc.
+
+Loki and Tempo were also deployed on the EKS cluster, we can check and confirm that they are running:
+
+```bash
+$ kubectl -n loki-system get pod
+NAME         READY       STATUS       RESTARTS      AGE
+loki-0       1/1         Running      0             5d21h
+$ kubectl -n tempo-system get pod
+NAME         READY       STATUS       RESTARTS      AGE
+tempo-0      1/1         Running      0             6d2h
+```
+
+To gather the metrics, logs and traces from the Amazon EKS Cluster, we'll deploy a `OpenTelemetryCollector` custom resource. The ADOT operator running on the EKS cluster detects the presence of or changes of the this resource and for any such changes, the operator performs the following actions:
+
+- Verifies that all the required connections for these creation, update, or deletion requests to the Kubernetes API server are available.
+- Deploys ADOT collector instances in the way the user expressed in the `OpenTelemetryCollector` resource configuration.
+
+Now, let's create resources to allow the ADOT collector the permissions it needed. We'll start with the ClusterRole that gives the collector permissions to access the Kubernetes API:
+
+```file
+manifests/modules/observability/oss/metrics-logs-traces/adot/clusterrole.yaml
+```
+
+We'll use the managed IAM policy `AmazonPrometheusRemoteWriteAccess` to provide the collector with the IAM permissions it needs via IAM Roles for Service Accounts:
+
+```bash
+$ aws iam list-attached-role-policies \
+  --role-name $EKS_CLUSTER_NAME-adot-collector | jq .
+{
+  "AttachedPolicies": [
+    {
+      "PolicyName": "AmazonPrometheusRemoteWriteAccess",
+      "PolicyArn": "arn:aws:iam::aws:policy/AmazonPrometheusRemoteWriteAccess"
+    }
+  ]
+}
+```
+
+This IAM role will be added to the ServiceAccount for the collector:
+
+```file
+manifests/modules/observability/oss/metrics-logs-traces/adot/serviceaccount.yaml
+```
+
+Create the resources:
+
+```bash hook=deploy-adot
+$ kubectl kustomize ~/environment/eks-workshop/modules/observability/oss/metrics-logs-traces/adot \
+  | envsubst | kubectl apply -f-
+$ kubectl rollout status -n other daemonset/adot-collector --timeout=120s
+```
+
+The specification for the collector is too long to show here, but you can view it like so:
+
+```bash
+$ kubectl -n other get opentelemetrycollector adot -o yaml
+```
+
+Let's break this down in to sections to get a better understanding of what has been deployed. This is the OpenTelemetry collector configuration:
+
+```bash
+$ kubectl -n other get opentelemetrycollector adot -o yaml | yq '.spec.config'
+```
+
+This is configuring an OpenTelemetry pipeline with the following structure:
+
+- Receivers
+  - [Prometheus receiver](https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/main/receiver/prometheusreceiver) designed to scrape metrics from targets that expose a Prometheus endpoint
+  - [Filelog receiver](https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/main/receiver/filelogreceiver) which tails and parses container logs from files on worker nodes
+  - [OTLP Receiver](https://github.com/open-telemetry/opentelemetry-collector/tree/main/receiver/otlpreceiver) which receives data via HTTP or gRPC using OTLP format
+- Processors
+  - [Batch processor](https://github.com/open-telemetry/opentelemetry-collector/blob/main/processor/batchprocessor) which helps better compress the data and reduce the number of outgoing connections required to transmit the data
+- Exporters
+  - [Prometheus remote write exporter](https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/main/exporter/prometheusremotewriteexporter) which sends metrics to a Prometheus remote write endpoint like AMP
+  - [OTLP HTTP exporter](https://github.com/open-telemetry/opentelemetry-collector/blob/main/exporter/otlphttpexporter) and [OTLP gRPC exporter](https://github.com/open-telemetry/opentelemetry-collector/blob/main/exporter/otlpexporter) which exports logs and traces via HTTP and gRPC using OTLP format
+
+This collector is also configured to run as a DaemonSet with one collector agent running on each worker node:
+
+```bash
+$ kubectl -n other get opentelemetrycollector adot -o jsonpath='{.spec.mode}{"\n"}'
+```
+
+We can confirm that by inspecting the ADOT collector Pods that are running:
+
+```bash
+$ kubectl get pods -n other
+NAME                      READY      STATUS       RESTARTS      AGE
+adot-collector-58mwb      1/1        Running      0             3d21h
+adot-collector-czjg4      1/1        Running      0             3d21h
+adot-collector-sjj8h      1/1        Running      0             3d21h
+```
+
+Since we want to use the `Instrumentation` custom resources (which were deployed after the applications) to [inject OpenTelemetry SDK environment variables](https://github.com/open-telemetry/opentelemetry-operator?tab=readme-ov-file#inject-opentelemetry-sdk-environment-variables-only), we will need redeploy the applications:
+
+```bash
+$ kubectl -n assets rollout restart deployment assets && \
+  kubectl -n carts rollout restart deployment carts && \
+  kubectl -n catalog rollout restart deployment catalog && \
+  kubectl -n checkout rollout restart deployment checkout && \
+  kubectl -n orders rollout restart deployment orders && \
+  kubectl -n ui rollout restart deployment ui
+deployment.apps/assets restarted
+deployment.apps/carts restarted
+deployment.apps/catalog restarted
+deployment.apps/checkout restarted
+deployment.apps/orders restarted
+deployment.apps/ui restarted
+```
diff --git a/website/docs/observability/open-source-metrics/amp-ws.md b/website/docs/observability/oss/metrics-logs-traces/amp-ws.md
similarity index 100%
rename from website/docs/observability/open-source-metrics/amp-ws.md
rename to website/docs/observability/oss/metrics-logs-traces/amp-ws.md
diff --git a/website/docs/observability/oss/metrics-logs-traces/application-logs.md b/website/docs/observability/oss/metrics-logs-traces/application-logs.md
new file mode 100644
index 000000000..51773b0aa
--- /dev/null
+++ b/website/docs/observability/oss/metrics-logs-traces/application-logs.md
@@ -0,0 +1,91 @@
+---
+title: "Application logs"
+sidebar_position: 60
+---
+
+In this section we'll look at collecting and exploring the logs from our workloads. OpenTelemetry supports several log collection methods, including the filelog receiver which can be configured to collect the logs from the container runtime log directories. Because the OpenTelemetry collector pods need to have the direct access to these log files on each worker node, we need to deploy them with the DaemonSet mode.
+
+The receiver can be configured to include/exclude the logs from the specific namespaces, parse the logs from the different container runtimes and manipulate the metadata of each log entry and etc:
+
+```bash
+$ kubectl -n other get opentelemetrycollector adot -o yaml \
+  | yq '.spec.config.receivers.filelog'
+exclude:
+  - /var/log/pods/*-system_*/*/*.log
+  - /var/log/pods/cert-manager_*/*/*.log
+  - /var/log/pods/grafana_*/*/*.log
+  - /var/log/pods/other_*/*/*.log
+include:
+  - /var/log/pods/*/*/*.log
+include_file_name: false
+include_file_path: true
+operators:
+  - id: get-format
+    routes:
+      - expr: body matches "^\\{"
+        output: parser-docker
+      - expr: body matches "^[^ Z]+ "
+        output: parser-crio
+      - expr: body matches "^[^ Z]+Z"
+        output: parser-containerd
+    type: router
+  - id: parser-crio
+    output: extract_metadata_from_filepath
+    regex: ^(?P<time>[^ Z]+) (?P<stream>stdout|stderr) (?P<logtag>[^ ]*) ?(?P<log>.*)$
+    timestamp:
+      layout: 2006-01-02T15:04:05.999999999Z07:00
+      layout_type: gotime
+      parse_from: attributes.time
+    type: regex_parser
+  - id: parser-containerd
+    output: extract_metadata_from_filepath
+    regex: ^(?P<time>[^ ^Z]+Z) (?P<stream>stdout|stderr) (?P<logtag>[^ ]*) ?(?P<log>.*)$
+    timestamp:
+      layout: '%Y-%m-%dT%H:%M:%S.%LZ'
+      parse_from: attributes.time
+    type: regex_parser
+  - id: parser-docker
+    output: extract_metadata_from_filepath
+    timestamp:
+      layout: '%Y-%m-%dT%H:%M:%S.%LZ'
+      parse_from: attributes.time
+    type: json_parser
+  - from: attributes.log
+    to: body
+    type: move
+  - cache:
+      size: 128
+    id: extract_metadata_from_filepath
+    parse_from: attributes["log.file.path"]
+    regex: ^.*\/(?P<namespace>[^_]+)_(?P<pod_name>[^_]+)_(?P<uid>[a-f0-9\-]{36})\/(?P<container_name>[^\._]+)\/(?P<restart_count>\d+)\.log$
+    type: regex_parser
+  - from: attributes.stream
+    to: attributes["log.iostream"]
+    type: move
+  - from: attributes.container_name
+    to: resource["k8s.container.name"]
+    type: move
+  - from: attributes.namespace
+    to: resource["k8s.namespace.name"]
+    type: move
+  - from: attributes.pod_name
+    to: resource["k8s.pod.name"]
+    type: move
+  - from: attributes.restart_count
+    to: resource["k8s.container.restart_count"]
+    type: move
+  - from: attributes.uid
+    to: resource["k8s.pod.uid"]
+    type: move
+start_at: beginning
+```
+
+The log entries are then batched and shipped to Loki by using OTLP HTTP exporter.
+
+To visualize them on Grafana, go to the Explore page and then select Loki as the datasource. Since the log data on Loki is indexed by using labels (inserted as OpenTelemetry resource fields by the filelog receiver in this case), at least one label filter must be used on the query e.g. `k8s_container_name = catalog`.
+
+![Loki Logs](./assets/logs-explore.webp)
+
+We can also use more than one label filter and/or additional log line filter expressions like string contain or RegEx.
+
+See [Log queries](https://grafana.com/docs/loki/latest/query/log_queries/) and [Ingesting logs to Loki using OpenTelemetry Collector](https://grafana.com/docs/loki/latest/send-data/otel/) docs on Loki website to learn more.
diff --git a/website/docs/observability/open-source-metrics/application-metrics.md b/website/docs/observability/oss/metrics-logs-traces/application-metrics.md
similarity index 88%
rename from website/docs/observability/open-source-metrics/application-metrics.md
rename to website/docs/observability/oss/metrics-logs-traces/application-metrics.md
index 4b7d7ed2a..76ca51889 100644
--- a/website/docs/observability/open-source-metrics/application-metrics.md
+++ b/website/docs/observability/oss/metrics-logs-traces/application-metrics.md
@@ -1,5 +1,5 @@
 ---
-title: "Application Metrics"
+title: "Application metrics"
 sidebar_position: 50
 ---
 
@@ -47,8 +47,8 @@ nodejs_heap_size_total_bytes 48668672
 In this lab we'll leverage ADOT to ingest the metrics for all the components and explore a dashboard to show the number of orders that have been placed. Let's take a look at the OpenTelemetry configuration used to scrape metrics from the application pods, specifically this section:
 
 ```bash
-$ kubectl -n other get opentelemetrycollector adot -o jsonpath='{.spec.config}' \
-  | yq '.receivers.prometheus.config.scrape_configs[2]'
+$ kubectl -n other get opentelemetrycollector adot -o yaml \
+  | yq '.spec.config.receivers.prometheus.config.scrape_configs[2]'
 job_name: 'kubernetes-pods'
 honor_labels: true
 kubernetes_sd_configs:
@@ -135,21 +135,17 @@ spec:
 EOF
 ```
 
-Open the Grafana as we did in the previous section:
+Open the Grafana dashboard page as we did in the previous section and click on the dashboard **Order Service Metrics** to review the panels within the dashboard:
 
-![Grafana dashboard](./assets/order-service-metrics-dashboard.webp)
-
-Go to the dashboard page and click on the dashboard **Order Service Metrics** to review the panels within the dashboard:
-
-![Business Metrics](./assets/retailMetrics.webp)
+![Business Metrics](./assets/metrics-dashboard.webp)
 
 We can see how the dashboard was configured to query AMP by hovering over the title of the "Orders by Product" panel and clicking the "Edit" button:
 
-![Edit Panel](./assets/editPanel.webp)
+![Edit Panel](./assets/metrics-edit.webp)
 
 The PromQL query used to create this panel is displayed at the bottom of the page:
 
-![PromQL query](./assets/promqlQuery.webp)
+![PromQL query](./assets/metrics-query.webp)
 
 In this case we are using the query:
 
@@ -164,9 +160,3 @@ Which is doing the following:
 - Sum these metrics and group them by `productId`
 
 You can similarly explore the other panels to understand how they have been created.
-
-Once you're satisfied with observing the metrics, you can stop the load generator using the below command.
-
-```bash timeout=180 test=false
-$ kubectl delete pod load-generator -n other
-```
diff --git a/website/docs/observability/oss/metrics-logs-traces/application-traces.md b/website/docs/observability/oss/metrics-logs-traces/application-traces.md
new file mode 100644
index 000000000..9f32e7630
--- /dev/null
+++ b/website/docs/observability/oss/metrics-logs-traces/application-traces.md
@@ -0,0 +1,30 @@
+---
+title: "Application traces"
+sidebar_position: 70
+---
+
+In this section we'll look at collecting and exploring the traces from our workloads. The applications were already instrumented by using OpenTelemetry SDKs and OpenTelemetry collector was configured with the OTLP receiver and exporter to ingest, batch and ship the trace data to Tempo.
+
+To visualize them on Grafana, go to the Explore page and then select Tempo as the datasource and then,
+
+- Select `Search` for the Query type
+- Filter `Service Name = ui-service`
+- Filter `Span Name = GET /home`
+
+Then, click on a link for a specific trace on the result table to populate the trace details panel.
+
+You should see the result similar to the capture below. For this example trace, we can see that,
+
+- The total round trip time for this request was 9.63ms
+- UI service made 3 parallel requests (2 requests to catalog service and 1 request to carts service)
+- Catalog and carts services spent a significant amount of time on querying the data from MySQL and DynamoDB databases
+
+![Tempo Traces](./assets/traces-explore.webp)
+
+See [Language APIs & SDKs](https://opentelemetry.io/docs/languages/) doc on OpenTelemetry website to learn more about code instrumentation support for the popular programming languages.
+
+Once you're satisfied with observing the metrics, logs and traces, you can stop the load generator using the below command.
+
+```bash timeout=180 test=false
+$ kubectl delete pod load-generator -n other
+```
diff --git a/website/docs/observability/oss/metrics-logs-traces/assets/cluster-total-usage.webp b/website/docs/observability/oss/metrics-logs-traces/assets/cluster-total-usage.webp
new file mode 100644
index 000000000..16e53531a
Binary files /dev/null and b/website/docs/observability/oss/metrics-logs-traces/assets/cluster-total-usage.webp differ
diff --git a/website/docs/observability/oss/metrics-logs-traces/assets/grafana-dashboard.webp b/website/docs/observability/oss/metrics-logs-traces/assets/grafana-dashboard.webp
new file mode 100644
index 000000000..6c9672e67
Binary files /dev/null and b/website/docs/observability/oss/metrics-logs-traces/assets/grafana-dashboard.webp differ
diff --git a/website/docs/observability/oss/metrics-logs-traces/assets/grafana-datasource.webp b/website/docs/observability/oss/metrics-logs-traces/assets/grafana-datasource.webp
new file mode 100644
index 000000000..b5d1dd9ab
Binary files /dev/null and b/website/docs/observability/oss/metrics-logs-traces/assets/grafana-datasource.webp differ
diff --git a/website/docs/observability/oss/metrics-logs-traces/assets/grafana-login.webp b/website/docs/observability/oss/metrics-logs-traces/assets/grafana-login.webp
new file mode 100644
index 000000000..00ec1baec
Binary files /dev/null and b/website/docs/observability/oss/metrics-logs-traces/assets/grafana-login.webp differ
diff --git a/website/docs/observability/oss/metrics-logs-traces/assets/logs-explore.webp b/website/docs/observability/oss/metrics-logs-traces/assets/logs-explore.webp
new file mode 100644
index 000000000..69809b76c
Binary files /dev/null and b/website/docs/observability/oss/metrics-logs-traces/assets/logs-explore.webp differ
diff --git a/website/docs/observability/oss/metrics-logs-traces/assets/metrics-dashboard.webp b/website/docs/observability/oss/metrics-logs-traces/assets/metrics-dashboard.webp
new file mode 100644
index 000000000..0c080e9f5
Binary files /dev/null and b/website/docs/observability/oss/metrics-logs-traces/assets/metrics-dashboard.webp differ
diff --git a/website/docs/observability/oss/metrics-logs-traces/assets/metrics-edit.webp b/website/docs/observability/oss/metrics-logs-traces/assets/metrics-edit.webp
new file mode 100644
index 000000000..46766c61f
Binary files /dev/null and b/website/docs/observability/oss/metrics-logs-traces/assets/metrics-edit.webp differ
diff --git a/website/docs/observability/oss/metrics-logs-traces/assets/metrics-query.webp b/website/docs/observability/oss/metrics-logs-traces/assets/metrics-query.webp
new file mode 100644
index 000000000..08b56b168
Binary files /dev/null and b/website/docs/observability/oss/metrics-logs-traces/assets/metrics-query.webp differ
diff --git a/website/docs/observability/oss/metrics-logs-traces/assets/traces-explore.webp b/website/docs/observability/oss/metrics-logs-traces/assets/traces-explore.webp
new file mode 100644
index 000000000..5259dd6ab
Binary files /dev/null and b/website/docs/observability/oss/metrics-logs-traces/assets/traces-explore.webp differ
diff --git a/website/docs/observability/open-source-metrics/index.md b/website/docs/observability/oss/metrics-logs-traces/index.md
similarity index 62%
rename from website/docs/observability/open-source-metrics/index.md
rename to website/docs/observability/oss/metrics-logs-traces/index.md
index 55605ecfc..664d05fef 100644
--- a/website/docs/observability/open-source-metrics/index.md
+++ b/website/docs/observability/oss/metrics-logs-traces/index.md
@@ -1,8 +1,9 @@
 ---
-title: "EKS open source observability"
-sidebar_position: 40
+title: "Metrics, logs and traces"
+sidebar_position: 10
 sidebar_custom_props: { "module": true }
-description: "Leverage open source observability solutions like Prometheus and Grafana with Amazon Elastic Kubernetes Service."
+description: "Leverage open source observability solutions like Prometheus, Loki, Tempo, OpenTelemetry and Grafana with Amazon Elastic Kubernetes Service."
+# cSpell:ignore Zipkin
 ---
 
 ::required-time
@@ -11,24 +12,23 @@ description: "Leverage open source observability solutions like Prometheus and G
 Prepare your environment for this section:
 
 ```bash timeout=600 wait=60 hook=install
-$ prepare-environment observability/oss-metrics
+$ prepare-environment observability/oss/metrics-logs-traces
 ```
 
 This will make the following changes to your lab environment:
 
-- Install the OpenTelemetry operator
+- Install the OpenTelemetry operator, Grafana operator, Loki and Tempo
 - Create an IAM role for the ADOT collector to access Amazon Managed Prometheus
+- Provision an Amazon Managed Service for Prometheus (AMP) workspace
 
-You can view the Terraform that applies these changes [here](https://github.com/VAR::MANIFESTS_OWNER/VAR::MANIFESTS_REPOSITORY/tree/VAR::MANIFESTS_REF/manifests/modules/observability/oss-metrics/.workshop/terraform).
+You can view the Terraform that applies these changes [here](https://github.com/VAR::MANIFESTS_OWNER/VAR::MANIFESTS_REPOSITORY/tree/VAR::MANIFESTS_REF/manifests/modules/observability/oss/metrics-logs-traces/.workshop/terraform).
 
 :::
 
-In this lab, we'll collect the metrics from the application using [AWS Distro for OpenTelemetry](https://aws-otel.github.io/), store the metrics in Amazon Managed Service for Prometheus and visualize using Amazon Managed Grafana.
-
 AWS Distro for OpenTelemetry is a secure, production-ready, AWS-supported distribution of the [OpenTelemetry project](https://opentelemetry.io/) . Part of the Cloud Native Computing Foundation, OpenTelemetry provides open source APIs, libraries, and agents to collect distributed traces and metrics for application monitoring. With AWS Distro for OpenTelemetry, you can instrument your applications just once to send correlated metrics and traces to multiple AWS and Partner monitoring solutions. Use auto-instrumentation agents to collect traces without changing your code. AWS Distro for OpenTelemetry also collects metadata from your AWS resources and managed services, so you can correlate application performance data with underlying infrastructure data, reducing the mean time to problem resolution. Use AWS Distro for OpenTelemetry to instrument your applications running on Amazon Elastic Compute Cloud (EC2), Amazon Elastic Container Service (ECS), and Amazon Elastic Kubernetes Service (EKS) on EC2, AWS Fargate, and AWS Lambda, as well as on-premises.
 
 Amazon Managed Service for Prometheus is a monitoring service for metrics compatible with the open source Prometheus project, making it easier for you to securely monitor container environments. Amazon Managed Service for Prometheus is a solution for monitoring containers based on the popular Cloud Native Computing Foundation (CNCF) Prometheus project. Amazon Managed Service for Prometheus reduces the heavy lifting required to get started with monitoring applications across Amazon Elastic Kubernetes Service and Amazon Elastic Container Service, as well as self-managed Kubernetes clusters.
 
-:::info
-If you are using the CDK Observability Accelerator then check out the collection of Open Source Observability Patterns covering a wide range of use cases including [ADOT collector](https://aws-observability.github.io/cdk-aws-observability-accelerator/patterns/existing-eks-observability-accelerators/existing-eks-adotmetrics-collection-observability/), [GPU Monitoring with Nvidia DCGM](https://aws-observability.github.io/cdk-aws-observability-accelerator/patterns/single-new-eks-observability-accelerators/single-new-eks-gpu-opensource-observability/) and many more.
-:::
+Loki is an open source log aggregation system developed by Grafana Labs and publicly available since 2018. It is designed to efficiently collect, aggregate, and visualize logs from various sources. Unlike traditional log management systems, Loki does not index the content of the logs. Instead, it uses a set of labels to index metadata associated with each log stream, making it highly scalable and cost-effective.
+
+Tempo is an open source, high-scale distributed tracing backend developed by Grafana Labs and publicly available since 2020. It is designed to be cost-efficient and easy to use, requiring only object storage to operate. Tempo integrates seamlessly with other open source observability tools like Prometheus and Loki, as well as open source tracing protocols such as Jaeger, Zipkin, and OpenTelemetry.
diff --git a/website/docs/observability/open-source-metrics/kubernetes-dashboards.md b/website/docs/observability/oss/metrics-logs-traces/kubernetes-dashboards.md
similarity index 78%
rename from website/docs/observability/open-source-metrics/kubernetes-dashboards.md
rename to website/docs/observability/oss/metrics-logs-traces/kubernetes-dashboards.md
index 02e0109a9..1e2b81e40 100644
--- a/website/docs/observability/open-source-metrics/kubernetes-dashboards.md
+++ b/website/docs/observability/oss/metrics-logs-traces/kubernetes-dashboards.md
@@ -5,10 +5,10 @@ sidebar_position: 40
 
 Let's head over to the dashboard section and visualize the EKS cluster metrics collected by AWS Distro for Opentelemetry.
 
-![Grafana dashboard](./assets/dashboard.webp)
+![Grafana dashboard](./assets/grafana-dashboard.webp)
 
 Click the dashboard **Kubernetes Cluster Monitoring** and let's review a panel within the dashboard.
 
 The Total Usage panel shows the overall cluster utilization in terms of CPU, Memory and Filesystem usage
 
-![Total Usage](./assets/totalusage.webp)
+![Total Usage](./assets/cluster-total-usage.webp)
diff --git a/website/docs/observability/open-source-metrics/tests/hook-check-grafana.sh b/website/docs/observability/oss/metrics-logs-traces/tests/hook-check-grafana.sh
similarity index 78%
rename from website/docs/observability/open-source-metrics/tests/hook-check-grafana.sh
rename to website/docs/observability/oss/metrics-logs-traces/tests/hook-check-grafana.sh
index f5cb962d7..fc79d35ea 100644
--- a/website/docs/observability/open-source-metrics/tests/hook-check-grafana.sh
+++ b/website/docs/observability/oss/metrics-logs-traces/tests/hook-check-grafana.sh
@@ -5,7 +5,7 @@ before() {
 }
 
 after() {
-  grafana_endpoint=$(kubectl get ingress -n grafana grafana -o=jsonpath='{.status.loadBalancer.ingress[0].hostname}')
+  grafana_endpoint=$(kubectl get ingress -n grafana grafana-ingress -o=jsonpath='{.status.loadBalancer.ingress[0].hostname}')
   export grafana_url="${grafana_endpoint}/healthz"
 
   EXIT_CODE=0
diff --git a/website/docs/observability/open-source-metrics/tests/hook-deploy-adot.sh b/website/docs/observability/oss/metrics-logs-traces/tests/hook-deploy-adot.sh
similarity index 100%
rename from website/docs/observability/open-source-metrics/tests/hook-deploy-adot.sh
rename to website/docs/observability/oss/metrics-logs-traces/tests/hook-deploy-adot.sh
diff --git a/website/docs/observability/oss/metrics-logs-traces/tests/hook-install.sh b/website/docs/observability/oss/metrics-logs-traces/tests/hook-install.sh
new file mode 100644
index 000000000..659d393f5
--- /dev/null
+++ b/website/docs/observability/oss/metrics-logs-traces/tests/hook-install.sh
@@ -0,0 +1,17 @@
+set -Eeuo pipefail
+
+before() {
+  echo "noop"
+}
+
+after() {
+  kubectl wait --for condition=established --timeout=120s crd opentelemetrycollectors.opentelemetry.io
+  kubectl wait --for condition=available --timeout=120s -n opentelemetry-operator-system deployment opentelemetry-operator
+  kubectl wait --for condition=established --timeout=120s crd grafanas.grafana.integreatly.org
+  kubectl wait --for condition=available --timeout=120s -n grafana-operator-system deployment grafana-operator
+  kubectl wait --for condition=available --timeout=120s -n grafana deployment grafana-deployment
+  kubectl wait --for condition=ready --timeout=120s -n loki-system pod loki-0
+  kubectl wait --for condition=ready --timeout=120s -n tempo-system pod tempo-0
+}
+
+"$@"
diff --git a/website/docs/observability/open-source-metrics/tests/hook-suite.sh b/website/docs/observability/oss/metrics-logs-traces/tests/hook-suite.sh
similarity index 100%
rename from website/docs/observability/open-source-metrics/tests/hook-suite.sh
rename to website/docs/observability/oss/metrics-logs-traces/tests/hook-suite.sh
diff --git a/website/test-durations.json b/website/test-durations.json
index ebbbc9f31..8736141c3 100644
--- a/website/test-durations.json
+++ b/website/test-durations.json
@@ -117,24 +117,28 @@
   "/observability/container-insights/index.md": 282125,
   "/observability/container-insights/visualize-application-metrics-cloudwatch.md": 3191,
   "/observability/index.md": 1,
-  "/observability/kubecost/index.md": 215109,
-  "/observability/kubecost/introduction.md": 172233,
   "/observability/logging/cluster-logging/enable-eks-logging.md": 62816,
   "/observability/logging/cluster-logging/index.md": 110867,
   "/observability/logging/index.md": 1,
   "/observability/logging/pod-logging/fluent-bit-cloudwatch.md": 4616,
   "/observability/logging/pod-logging/fluentbit-setup.md": 1499,
   "/observability/logging/pod-logging/index.md": 131891,
-  "/observability/open-source-metrics/accessing-grafana.md": 1988,
-  "/observability/open-source-metrics/adot.md": 146099,
-  "/observability/open-source-metrics/amp-ws.md": 248,
-  "/observability/open-source-metrics/application-metrics.md": 2458,
-  "/observability/open-source-metrics/index.md": 363770,
   "/observability/opensearch/access-opensearch.md": 2362,
   "/observability/opensearch/control-plane-logs.md": 63752,
   "/observability/opensearch/events.md": 49754,
   "/observability/opensearch/index.md": 145975,
   "/observability/opensearch/pod-logs.md": 64764,
+  "/observability/oss/kubecost/index.md": 294258,
+  "/observability/oss/kubecost/installation.md": 318238,
+  "/observability/oss/kubecost/cost-allocation.md": 1,
+  "/observability/oss/metrics-logs-traces/index.md": 552586,
+  "/observability/oss/metrics-logs-traces/adot.md": 106986,
+  "/observability/oss/metrics-logs-traces/amp-ws.md": 4565,
+  "/observability/oss/metrics-logs-traces/accessing-grafana.md": 0,
+  "/observability/oss/metrics-logs-traces/kubernetes-dashboards.md": 1,
+  "/observability/oss/metrics-logs-traces/application-metrics.md": 1,
+  "/observability/oss/metrics-logs-traces/application-logs.md": 1,
+  "/observability/oss/metrics-logs-traces/application-traces.md": 1,
   "/observability/resource-view/authentication/index.md": 0,
   "/observability/resource-view/authorization/index.md": 1,
   "/observability/resource-view/cluster-view/index.md": 0,