diff --git a/.env b/.env
index f166c374dc..e464c8da49 100644
--- a/.env
+++ b/.env
@@ -28,11 +28,11 @@ ENV_PLATFORM=local
 # OpenTelemetry Collector
 HOST_FILESYSTEM=/
 DOCKER_SOCK=/var/run/docker.sock
-OTEL_COLLECTOR_HOST=otelcol
+OTEL_COLLECTOR_HOST=otel-collector
 OTEL_COLLECTOR_PORT_GRPC=4317
 OTEL_COLLECTOR_PORT_HTTP=4318
-OTEL_COLLECTOR_CONFIG=./src/otelcollector/otelcol-config.yml
-OTEL_COLLECTOR_CONFIG_EXTRAS=./src/otelcollector/otelcol-config-extras.yml
+OTEL_COLLECTOR_CONFIG=./src/otel-collector/otelcol-config.yml
+OTEL_COLLECTOR_CONFIG_EXTRAS=./src/otel-collector/otelcol-config-extras.yml
 OTEL_EXPORTER_OTLP_ENDPOINT=http://${OTEL_COLLECTOR_HOST}:${OTEL_COLLECTOR_PORT_GRPC}
 PUBLIC_OTEL_EXPORTER_OTLP_TRACES_ENDPOINT=http://localhost:8080/otlp-http/v1/traces
 
@@ -94,7 +94,7 @@ IMAGE_PROVIDER_DOCKERFILE=./src/imageprovider/Dockerfile
 
 # Load Generator
 LOCUST_WEB_PORT=8089
-LOCUST_USERS=10
+LOCUST_USERS=5
 LOCUST_HOST=http://${FRONTEND_PROXY_ADDR}
 LOCUST_WEB_HOST=loadgenerator
 LOCUST_AUTOSTART=true
diff --git a/.github/workflows/label-pr.yml b/.github/workflows/label-pr.yml
index e027769190..73707abf73 100644
--- a/.github/workflows/label-pr.yml
+++ b/.github/workflows/label-pr.yml
@@ -30,7 +30,7 @@ jobs:
               - 'docker-compose*.yml'
               - 'src/flagd/**'
               - 'src/grafana/**'
-              - 'src/otelcollector/**'
+              - 'src/otel-collector/**'
               - 'src/prometheus/**'
 
       - name: "Add Label: docs-update-required"
diff --git a/CHANGELOG.md b/CHANGELOG.md
index f80a026a6e..783a900075 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -32,6 +32,10 @@ the release.
   ([#1827](https://github.com/open-telemetry/opentelemetry-demo/pull/1827))
 * [cartservice] - Add Exemplars to Cart Service
   ([#1830](https://github.com/open-telemetry/opentelemetry-demo/pull/1830))
+* [grafana] Add Exemplars Dashboard
+  ([#1836](https://github.com/open-telemetry/opentelemetry-demo/pull/1836))
+* [otel-collector] rename otelcol to otel-collector
+  ([#1841](https://github.com/open-telemetry/opentelemetry-demo/pull/1841))
 * [ad] rename adservice to ad
   ([#1827](https://github.com/open-telemetry/opentelemetry-demo/pull/1832))
 
diff --git a/docker-compose-tests.yml b/docker-compose-tests.yml
index df4c9cc5ba..997ba83e18 100644
--- a/docker-compose-tests.yml
+++ b/docker-compose-tests.yml
@@ -107,7 +107,7 @@ services:
     depends_on:
       tracetest-postgres:
         condition: service_healthy
-      otelcol:
+      otel-collector:
         condition: service_started
     healthcheck:
       test: [ "CMD", "wget", "--spider", "localhost:11633" ]
diff --git a/docker-compose-tests_include-override.yml b/docker-compose-tests_include-override.yml
index 1a115b663f..b9c3c837e0 100644
--- a/docker-compose-tests_include-override.yml
+++ b/docker-compose-tests_include-override.yml
@@ -3,7 +3,7 @@
 
 services:
 
-  otelcol:
+  otel-collector:
     command: [ "--config=/etc/otelcol-config.yml", "--config=/etc/otelcol-config-tracetest.yml" ]
     environment:
       - ENVOY_PORT
diff --git a/docker-compose.minimal.yml b/docker-compose.minimal.yml
index 080f02e3c8..cbdfdf8247 100644
--- a/docker-compose.minimal.yml
+++ b/docker-compose.minimal.yml
@@ -45,7 +45,7 @@ services:
       - OTEL_LOGS_EXPORTER=otlp
       - OTEL_SERVICE_NAME=ad
     depends_on:
-      otelcol:
+      otel-collector:
         condition: service_started
     logging: *logging
 
@@ -76,7 +76,7 @@ services:
     depends_on:
       valkey-cart:
         condition: service_started
-      otelcol:
+      otel-collector:
         condition: service_started
     logging: *logging
 
@@ -122,7 +122,7 @@ services:
         condition: service_started
       shippingservice:
         condition: service_started
-      otelcol:
+      otel-collector:
         condition: service_started
     logging: *logging
 
@@ -150,7 +150,7 @@ services:
       - OTEL_EXPORTER_OTLP_ENDPOINT
       - OTEL_RESOURCE_ATTRIBUTES=${OTEL_RESOURCE_ATTRIBUTES},service.name=currencyservice   # The C++ SDK does not support OTEL_SERVICE_NAME
     depends_on:
-      otelcol:
+      otel-collector:
         condition: service_started
     logging: *logging
 
@@ -176,7 +176,7 @@ services:
       - OTEL_RESOURCE_ATTRIBUTES
       - OTEL_SERVICE_NAME=emailservice
     depends_on:
-      otelcol:
+      otel-collector:
         condition: service_started
     logging: *logging
 
@@ -233,7 +233,7 @@ services:
         condition: service_started
       shippingservice:
         condition: service_started
-      otelcol:
+      otel-collector:
         condition: service_started
       imageprovider:
         condition: service_started
@@ -308,7 +308,7 @@ services:
       - OTEL_SERVICE_NAME=imageprovider
       - OTEL_RESOURCE_ATTRIBUTES
     depends_on:
-      otelcol:
+      otel-collector:
         condition: service_started
     logging: *logging
 
@@ -374,7 +374,7 @@ services:
       - OTEL_RESOURCE_ATTRIBUTES
       - OTEL_SERVICE_NAME=paymentservice
     depends_on:
-      otelcol:
+      otel-collector:
         condition: service_started
     logging: *logging
 
@@ -402,7 +402,7 @@ services:
       - OTEL_RESOURCE_ATTRIBUTES
       - OTEL_SERVICE_NAME=productcatalogservice
     depends_on:
-      otelcol:
+      otel-collector:
         condition: service_started
     logging: *logging
 
@@ -430,7 +430,7 @@ services:
       - OTEL_SERVICE_NAME=quoteservice
       - OTEL_PHP_INTERNAL_METRICS_ENABLED=true
     depends_on:
-      otelcol:
+      otel-collector:
         condition: service_started
     logging: *logging
 
@@ -463,7 +463,7 @@ services:
     depends_on:
       productcatalogservice:
         condition: service_started
-      otelcol:
+      otel-collector:
         condition: service_started
     logging: *logging
 
@@ -490,7 +490,7 @@ services:
       - OTEL_RESOURCE_ATTRIBUTES
       - OTEL_SERVICE_NAME=shippingservice
     depends_on:
-      otelcol:
+      otel-collector:
         condition: service_started
     logging: *logging
 
@@ -581,9 +581,9 @@ services:
     logging: *logging
 
   # OpenTelemetry Collector
-  otelcol:
+  otel-collector:
     image: ${COLLECTOR_CONTRIB_IMAGE}
-    container_name: otel-col
+    container_name: otel-collector
     deploy:
       resources:
         limits:
diff --git a/docker-compose.yml b/docker-compose.yml
index 893df4e440..cdc6a7d9bc 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -38,7 +38,7 @@ services:
       - OTEL_RESOURCE_ATTRIBUTES
       - OTEL_SERVICE_NAME=accounting
     depends_on:
-      otelcol:
+      otel-collector:
         condition: service_started
       kafka:
         condition: service_healthy
@@ -72,7 +72,7 @@ services:
       - OTEL_LOGS_EXPORTER=otlp
       - OTEL_SERVICE_NAME=ad
     depends_on:
-      otelcol:
+      otel-collector:
         condition: service_started
       flagd:
         condition: service_started
@@ -106,7 +106,7 @@ services:
     depends_on:
       valkey-cart:
         condition: service_started
-      otelcol:
+      otel-collector:
         condition: service_started
       flagd:
         condition: service_started
@@ -156,7 +156,7 @@ services:
         condition: service_started
       shippingservice:
         condition: service_started
-      otelcol:
+      otel-collector:
         condition: service_started
       kafka:
         condition: service_healthy
@@ -188,7 +188,7 @@ services:
       - OTEL_EXPORTER_OTLP_ENDPOINT
       - OTEL_RESOURCE_ATTRIBUTES=${OTEL_RESOURCE_ATTRIBUTES},service.name=currencyservice   # The C++ SDK does not support OTEL_SERVICE_NAME
     depends_on:
-      otelcol:
+      otel-collector:
         condition: service_started
     logging: *logging
 
@@ -215,7 +215,7 @@ services:
       - OTEL_RESOURCE_ATTRIBUTES
       - OTEL_SERVICE_NAME=emailservice
     depends_on:
-      otelcol:
+      otel-collector:
         condition: service_started
     logging: *logging
 
@@ -246,7 +246,7 @@ services:
       - OTEL_RESOURCE_ATTRIBUTES
       - OTEL_SERVICE_NAME=frauddetectionservice
     depends_on:
-      otelcol:
+      otel-collector:
         condition: service_started
       kafka:
         condition: service_healthy
@@ -305,7 +305,7 @@ services:
         condition: service_started
       shippingservice:
         condition: service_started
-      otelcol:
+      otel-collector:
         condition: service_started
       imageprovider:
         condition: service_started
@@ -384,7 +384,7 @@ services:
       - OTEL_SERVICE_NAME=imageprovider
       - OTEL_RESOURCE_ATTRIBUTES
     depends_on:
-      otelcol:
+      otel-collector:
         condition: service_started
     logging: *logging
 
@@ -451,7 +451,7 @@ services:
       - OTEL_RESOURCE_ATTRIBUTES
       - OTEL_SERVICE_NAME=paymentservice
     depends_on:
-      otelcol:
+      otel-collector:
         condition: service_started
       flagd:
         condition: service_started
@@ -482,7 +482,7 @@ services:
       - OTEL_RESOURCE_ATTRIBUTES
       - OTEL_SERVICE_NAME=productcatalogservice
     depends_on:
-      otelcol:
+      otel-collector:
         condition: service_started
       flagd:
         condition: service_started
@@ -512,7 +512,7 @@ services:
       - OTEL_SERVICE_NAME=quoteservice
       - OTEL_PHP_INTERNAL_METRICS_ENABLED=true
     depends_on:
-      otelcol:
+      otel-collector:
         condition: service_started
     logging: *logging
 
@@ -546,7 +546,7 @@ services:
     depends_on:
       productcatalogservice:
         condition: service_started
-      otelcol:
+      otel-collector:
         condition: service_started
       flagd:
         condition: service_started
@@ -575,7 +575,7 @@ services:
       - OTEL_RESOURCE_ATTRIBUTES
       - OTEL_SERVICE_NAME=shippingservice
     depends_on:
-      otelcol:
+      otel-collector:
         condition: service_started
     logging: *logging
 
@@ -628,7 +628,7 @@ services:
     ports:
       - "${FLAGD_UI_PORT}"
     depends_on:
-      otelcol:
+      otel-collector:
         condition: service_started
       flagd:
         condition: service_started
@@ -689,7 +689,7 @@ services:
     image: ${JAEGERTRACING_IMAGE}
     container_name: jaeger
     command:
-      - "--memory.max-traces=5000"
+      - "--memory.max-traces=25000"
       - "--query.base-path=/jaeger/ui"
       - "--prometheus.server-url=http://${PROMETHEUS_ADDR}"
       - "--prometheus.query.normalize-calls=true"
@@ -697,7 +697,7 @@ services:
     deploy:
       resources:
         limits:
-          memory: 400M
+          memory: 1200M
     restart: unless-stopped
     ports:
       - "${JAEGER_SERVICE_PORT}"         # Jaeger UI
@@ -725,9 +725,9 @@ services:
     logging: *logging
 
   # OpenTelemetry Collector
-  otelcol:
+  otel-collector:
     image: ${COLLECTOR_CONTRIB_IMAGE}
-    container_name: otel-col
+    container_name: otel-collector
     deploy:
       resources:
         limits:
diff --git a/renovate.json5 b/renovate.json5
index 86cb08c437..c7553b65f0 100644
--- a/renovate.json5
+++ b/renovate.json5
@@ -67,8 +67,8 @@
       "groupName": "loadgenerator",
     },
     {
-      "matchFileNames": ["src/otelcollector/**"],
-      "groupName": "otelcollector",
+      "matchFileNames": ["src/otel-collector/**"],
+      "groupName": "otel-collector",
     },
     {
       "matchFileNames": ["src/paymentservice/**"],
diff --git a/src/frontend/pages/_app.tsx b/src/frontend/pages/_app.tsx
index e49b51f7c6..67ee8b18ba 100755
--- a/src/frontend/pages/_app.tsx
+++ b/src/frontend/pages/_app.tsx
@@ -4,7 +4,6 @@
 import '../styles/globals.css';
 import { QueryClient, QueryClientProvider } from '@tanstack/react-query';
 import App, { AppContext, AppProps } from 'next/app';
-import { getCookie } from 'cookies-next';
 import CurrencyProvider from '../providers/Currency.provider';
 import CartProvider from '../providers/Cart.provider';
 import { ThemeProvider } from 'styled-components';
@@ -26,8 +25,7 @@ declare global {
 }
 
 if (typeof window !== 'undefined') {
-  const collector = getCookie('otelCollectorUrl')?.toString() || '';
-  FrontendTracer(collector);
+  FrontendTracer();
   if (window.location) {
     const session = SessionGateway.getSession();
 
diff --git a/src/frontend/utils/telemetry/FrontendTracer.ts b/src/frontend/utils/telemetry/FrontendTracer.ts
index de9e8a30ec..69681970f1 100644
--- a/src/frontend/utils/telemetry/FrontendTracer.ts
+++ b/src/frontend/utils/telemetry/FrontendTracer.ts
@@ -19,7 +19,7 @@ const {
   IS_SYNTHETIC_REQUEST = '',
 } = typeof window !== 'undefined' ? window.ENV : {};
 
-const FrontendTracer = (collectorString: string) => {
+const FrontendTracer = () => {
   let resource = new Resource({
     [SemanticResourceAttributes.SERVICE_NAME]: NEXT_PUBLIC_OTEL_SERVICE_NAME,
   });
@@ -33,7 +33,7 @@ const FrontendTracer = (collectorString: string) => {
   provider.addSpanProcessor(
     new BatchSpanProcessor(
       new OTLPTraceExporter({
-        url: NEXT_PUBLIC_OTEL_EXPORTER_OTLP_TRACES_ENDPOINT || collectorString || 'http://localhost:4318/v1/traces',
+        url: NEXT_PUBLIC_OTEL_EXPORTER_OTLP_TRACES_ENDPOINT || 'http://localhost:4318/v1/traces',
       }),
       {
         scheduledDelayMillis: 500,
diff --git a/src/grafana/provisioning/dashboards/demo/exemplars-dashboard.json b/src/grafana/provisioning/dashboards/demo/exemplars-dashboard.json
new file mode 100644
index 0000000000..9d8ed82061
--- /dev/null
+++ b/src/grafana/provisioning/dashboards/demo/exemplars-dashboard.json
@@ -0,0 +1,435 @@
+{
+  "annotations": {
+    "list": [
+      {
+        "builtIn": 1,
+        "datasource": {
+          "type": "grafana",
+          "uid": "-- Grafana --"
+        },
+        "enable": true,
+        "hide": true,
+        "iconColor": "rgba(0, 211, 255, 1)",
+        "name": "Annotations & Alerts",
+        "type": "dashboard"
+      }
+    ]
+  },
+  "editable": true,
+  "fiscalYearStartMonth": 0,
+  "graphTooltip": 0,
+  "id": 5,
+  "links": [],
+  "panels": [
+    {
+      "collapsed": false,
+      "gridPos": {
+        "h": 1,
+        "w": 24,
+        "x": 0,
+        "y": 0
+      },
+      "id": 4,
+      "panels": [],
+      "title": "GetCart Exemplars",
+      "type": "row"
+    },
+    {
+      "datasource": {
+        "type": "prometheus",
+        "uid": "webstore-metrics"
+      },
+      "fieldConfig": {
+        "defaults": {
+          "color": {
+            "mode": "palette-classic"
+          },
+          "custom": {
+            "axisBorderShow": false,
+            "axisCenteredZero": false,
+            "axisColorMode": "text",
+            "axisLabel": "",
+            "axisPlacement": "auto",
+            "barAlignment": 0,
+            "barWidthFactor": 0.6,
+            "drawStyle": "line",
+            "fillOpacity": 0,
+            "gradientMode": "none",
+            "hideFrom": {
+              "legend": false,
+              "tooltip": false,
+              "viz": false
+            },
+            "insertNulls": 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": 10,
+        "w": 24,
+        "x": 0,
+        "y": 10
+      },
+      "id": 5,
+      "interval": "2m",
+      "options": {
+        "legend": {
+          "calcs": [],
+          "displayMode": "list",
+          "placement": "bottom",
+          "showLegend": true
+        },
+        "tooltip": {
+          "mode": "single",
+          "sort": "none"
+        }
+      },
+      "pluginVersion": "11.3.0",
+      "targets": [
+        {
+          "datasource": {
+            "type": "prometheus",
+            "uid": "webstore-metrics"
+          },
+          "disableTextWrap": false,
+          "editorMode": "builder",
+          "exemplar": true,
+          "expr": "histogram_quantile(0.95, sum by(le) (rate(app_cart_get_cart_latency_bucket[$__rate_interval])))",
+          "fullMetaSearch": false,
+          "includeNullMetadata": false,
+          "legendFormat": "p95 GetCart",
+          "range": true,
+          "refId": "A",
+          "useBackend": false
+        }
+      ],
+      "title": "95th Pct Cart GetCart Latency with Exemplars",
+      "type": "timeseries"
+    },
+    {
+      "datasource": {
+        "type": "prometheus",
+        "uid": "webstore-metrics"
+      },
+      "fieldConfig": {
+        "defaults": {
+          "custom": {
+            "hideFrom": {
+              "legend": false,
+              "tooltip": false,
+              "viz": false
+            },
+            "scaleDistribution": {
+              "type": "linear"
+            }
+          }
+        },
+        "overrides": []
+      },
+      "gridPos": {
+        "h": 9,
+        "w": 24,
+        "x": 0,
+        "y": 1
+      },
+      "id": 2,
+      "interval": "2m",
+      "options": {
+        "calculate": false,
+        "cellGap": 1,
+        "color": {
+          "exponent": 0.5,
+          "fill": "dark-orange",
+          "mode": "scheme",
+          "reverse": false,
+          "scale": "exponential",
+          "scheme": "Spectral",
+          "steps": 64
+        },
+        "exemplars": {
+          "color": "rgba(255,0,255,0.7)"
+        },
+        "filterValues": {
+          "le": 1e-9
+        },
+        "legend": {
+          "show": true
+        },
+        "rowsFrame": {
+          "layout": "auto"
+        },
+        "tooltip": {
+          "mode": "single",
+          "showColorScale": false,
+          "yHistogram": false
+        },
+        "yAxis": {
+          "axisPlacement": "left",
+          "reverse": false
+        }
+      },
+      "pluginVersion": "11.3.0",
+      "targets": [
+        {
+          "disableTextWrap": false,
+          "editorMode": "builder",
+          "exemplar": true,
+          "expr": "sum by(le) (rate(app_cart_get_cart_latency_bucket[$__rate_interval]))",
+          "format": "heatmap",
+          "fullMetaSearch": false,
+          "includeNullMetadata": false,
+          "instant": true,
+          "legendFormat": "{{le}}",
+          "range": true,
+          "refId": "A",
+          "useBackend": false
+        }
+      ],
+      "title": "GetCart Latency Heatmap with Exemplars",
+      "type": "heatmap"
+    },
+    {
+      "collapsed": false,
+      "gridPos": {
+        "h": 1,
+        "w": 24,
+        "x": 0,
+        "y": 20
+      },
+      "id": 3,
+      "panels": [],
+      "title": "AddItem Exemplars",
+      "type": "row"
+    },
+    {
+      "datasource": {
+        "type": "prometheus",
+        "uid": "webstore-metrics"
+      },
+      "fieldConfig": {
+        "defaults": {
+          "custom": {
+            "hideFrom": {
+              "legend": false,
+              "tooltip": false,
+              "viz": false
+            },
+            "scaleDistribution": {
+              "type": "linear"
+            }
+          }
+        },
+        "overrides": []
+      },
+      "gridPos": {
+        "h": 9,
+        "w": 24,
+        "x": 0,
+        "y": 21
+      },
+      "id": 6,
+      "interval": "2m",
+      "options": {
+        "calculate": false,
+        "cellGap": 1,
+        "color": {
+          "exponent": 0.5,
+          "fill": "dark-orange",
+          "mode": "scheme",
+          "reverse": false,
+          "scale": "exponential",
+          "scheme": "Spectral",
+          "steps": 64
+        },
+        "exemplars": {
+          "color": "rgba(255,0,255,0.7)"
+        },
+        "filterValues": {
+          "le": 1e-9
+        },
+        "legend": {
+          "show": true
+        },
+        "rowsFrame": {
+          "layout": "auto"
+        },
+        "tooltip": {
+          "mode": "single",
+          "showColorScale": false,
+          "yHistogram": false
+        },
+        "yAxis": {
+          "axisPlacement": "left",
+          "reverse": false
+        }
+      },
+      "pluginVersion": "11.3.0",
+      "targets": [
+        {
+          "disableTextWrap": false,
+          "editorMode": "builder",
+          "exemplar": true,
+          "expr": "sum by(le) (rate(app_cart_add_item_latency_bucket[$__rate_interval]))",
+          "format": "heatmap",
+          "fullMetaSearch": false,
+          "includeNullMetadata": false,
+          "instant": true,
+          "legendFormat": "{{le}}",
+          "range": true,
+          "refId": "A",
+          "useBackend": false
+        }
+      ],
+      "title": "AddItem Latency Heatmap with Exemplars",
+      "type": "heatmap"
+    },
+    {
+      "datasource": {
+        "type": "prometheus",
+        "uid": "webstore-metrics"
+      },
+      "fieldConfig": {
+        "defaults": {
+          "color": {
+            "mode": "palette-classic"
+          },
+          "custom": {
+            "axisBorderShow": false,
+            "axisCenteredZero": false,
+            "axisColorMode": "text",
+            "axisLabel": "",
+            "axisPlacement": "auto",
+            "barAlignment": 0,
+            "barWidthFactor": 0.6,
+            "drawStyle": "line",
+            "fillOpacity": 0,
+            "gradientMode": "none",
+            "hideFrom": {
+              "legend": false,
+              "tooltip": false,
+              "viz": false
+            },
+            "insertNulls": 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": 10,
+        "w": 24,
+        "x": 0,
+        "y": 30
+      },
+      "id": 1,
+      "interval": "2m",
+      "options": {
+        "legend": {
+          "calcs": [],
+          "displayMode": "list",
+          "placement": "bottom",
+          "showLegend": true
+        },
+        "tooltip": {
+          "mode": "single",
+          "sort": "none"
+        }
+      },
+      "pluginVersion": "11.3.0",
+      "targets": [
+        {
+          "datasource": {
+            "type": "prometheus",
+            "uid": "webstore-metrics"
+          },
+          "disableTextWrap": false,
+          "editorMode": "builder",
+          "exemplar": true,
+          "expr": "histogram_quantile(0.95, sum by(le) (rate(app_cart_add_item_latency_bucket[$__rate_interval])))",
+          "fullMetaSearch": false,
+          "includeNullMetadata": false,
+          "legendFormat": "p95 AddItem",
+          "range": true,
+          "refId": "A",
+          "useBackend": false
+        }
+      ],
+      "title": "95th Pct Cart AddItem Latency with Exemplars",
+      "type": "timeseries"
+    }
+  ],
+  "preload": false,
+  "schemaVersion": 40,
+  "tags": [],
+  "templating": {
+    "list": []
+  },
+  "time": {
+    "from": "now-1h",
+    "to": "now"
+  },
+  "timepicker": {},
+  "timezone": "browser",
+  "title": "Cart Service Exemplars",
+  "uid": "ce6sd46kfkglca",
+  "version": 1,
+  "weekStart": ""
+}
diff --git a/src/grafana/provisioning/dashboards/demo/opentelemetry-collector.json b/src/grafana/provisioning/dashboards/demo/opentelemetry-collector.json
index 1c574262c7..353cb7c32e 100644
--- a/src/grafana/provisioning/dashboards/demo/opentelemetry-collector.json
+++ b/src/grafana/provisioning/dashboards/demo/opentelemetry-collector.json
@@ -25,7 +25,7 @@
   "editable": true,
   "fiscalYearStartMonth": 0,
   "graphTooltip": 1,
-  "id": 4,
+  "id": 3,
   "links": [],
   "panels": [
     {
@@ -3055,13 +3055,13 @@
           "type": "prometheus",
           "uid": "$datasource"
         },
-        "definition": "label_values(otelcol_process_uptime, job)",
+        "definition": "label_values(otelcol_process_uptime_total,job)",
         "includeAll": false,
         "label": "Job",
         "name": "job",
         "options": [],
         "query": {
-          "query": "label_values(otelcol_process_uptime, job)",
+          "query": "label_values(otelcol_process_uptime_total,job)",
           "refId": "StandardVariableQuery"
         },
         "refresh": 1,
@@ -3234,6 +3234,6 @@
   "timezone": "utc",
   "title": "OpenTelemetry Collector",
   "uid": "BKf2sowmj",
-  "version": 10,
+  "version": 1,
   "weekStart": ""
 }
diff --git a/src/otelcollector/otelcol-config-extras.yml b/src/otel-collector/otelcol-config-extras.yml
similarity index 100%
rename from src/otelcollector/otelcol-config-extras.yml
rename to src/otel-collector/otelcol-config-extras.yml
diff --git a/src/otelcollector/otelcol-config.yml b/src/otel-collector/otelcol-config.yml
similarity index 98%
rename from src/otelcollector/otelcol-config.yml
rename to src/otel-collector/otelcol-config.yml
index e58a454cb6..387d1a0d47 100644
--- a/src/otelcollector/otelcol-config.yml
+++ b/src/otel-collector/otelcol-config.yml
@@ -83,7 +83,7 @@ receivers:
   prometheus:
     config:
       scrape_configs:
-        - job_name: 'otelcol'
+        - job_name: 'otel-collector'
           scrape_interval: 10s
           static_configs:
             - targets: ['0.0.0.0:8888']
diff --git a/src/prometheus/prometheus-config.yaml b/src/prometheus/prometheus-config.yaml
index c4404c4840..ecc0d1090c 100644
--- a/src/prometheus/prometheus-config.yaml
+++ b/src/prometheus/prometheus-config.yaml
@@ -11,4 +11,4 @@ scrape_configs:
 - job_name: otel-collector
   static_configs:
   - targets:
-    - 'otelcol:8888'
+    - 'otel-collector:8888'
diff --git a/test/tracetesting/tracetest-config.yaml b/test/tracetesting/tracetest-config.yaml
index 8cd23c94c4..7f2490368f 100644
--- a/test/tracetesting/tracetest-config.yaml
+++ b/test/tracetesting/tracetest-config.yaml
@@ -17,7 +17,7 @@ telemetry:
       exporter:
         type: collector
         collector:
-          endpoint: otelcol:4317
+          endpoint: otel-collector:4317
 
 server:
   telemetry: