diff --git a/docker-compose/docker-compose.yaml b/docker-compose/docker-compose.yaml
index 408a346cf5..beb5cdd008 100644
--- a/docker-compose/docker-compose.yaml
+++ b/docker-compose/docker-compose.yaml
@@ -39,7 +39,7 @@ services:
       PROMSCALE_WEB_TELEMETRY_PATH: /metrics-text
       PROMSCALE_DB_URI: postgres://postgres:password@db:5432/postgres?sslmode=allow
       PROMSCALE_TRACING_OTLP_SERVER_ADDRESS: ":9202"
-      PROMSCALE_TELEMETRY_TRACE_JAEGER_ENDPOINT: "http://otel-collector:14268/api/traces"
+      PROMSCALE_TELEMETRY_TRACE_OTEL_ENDPOINT: "otel-collector:4317"
       PROMSCALE_TELEMETRY_TRACE_SAMPLING_RATIO: "0.1"
       PROMSCALE_METRICS_RULES_CONFIG_FILE: /prometheus.yml
 
diff --git a/docker-compose/otel-collector-config.yml b/docker-compose/otel-collector-config.yml
index a06b9c856e..e47fe3631e 100644
--- a/docker-compose/otel-collector-config.yml
+++ b/docker-compose/otel-collector-config.yml
@@ -1,8 +1,8 @@
 receivers:
-  jaeger:
+  otlp:
     protocols:
-      thrift_http:
-        endpoint: "0.0.0.0:14268"
+      grpc:
+      http:
 
 exporters:
   logging:
@@ -21,7 +21,7 @@ service:
 
   pipelines:
     traces:
-      receivers: [jaeger]
+      receivers: [otlp]
       exporters: [otlp, logging]
       processors: [batch]
 
diff --git a/docker-compose/promscale-demo/docker-compose.yaml b/docker-compose/promscale-demo/docker-compose.yaml
new file mode 100644
index 0000000000..f7e30f1ced
--- /dev/null
+++ b/docker-compose/promscale-demo/docker-compose.yaml
@@ -0,0 +1,152 @@
+version: '3.0'
+
+services:
+  timescaledb:
+    image: timescale/timescaledb-ha:pg14-latest
+    ports:
+      - 5432:5432/tcp
+    volumes:
+      - timescaledb-data:/var/lib/postgresql/data
+    environment:
+      POSTGRES_PASSWORD: password
+      POSTGRES_USER: postgres
+      POSTGRES_DB: otel_demo
+      POSTGRES_HOST_AUTH_METHOD: trust
+
+  prometheus:
+    image: prom/prometheus:latest
+    depends_on:
+     - promscale
+    ports:
+      - 9090:9090/tcp
+    volumes:
+      - ${PWD}/../prometheus.yml:/etc/prometheus/prometheus.yml
+
+  alertmanager:
+    image: prom/alertmanager:latest
+    ports:
+      - 9093:9093/tcp
+
+  promscale:
+    image: timescale/promscale:latest
+    ports:
+      - 9201:9201/tcp
+      - 9202:9202/tcp
+    restart: on-failure
+    depends_on:
+      - timescaledb
+    volumes:
+      - ${PWD}/../promscale_prometheus.yml:/prometheus.yml
+      - ${PWD}/../rules.yml:/rules.yml
+      - ${PWD}/../alerts.yml:/alerts.yml
+    environment:
+      PROMSCALE_WEB_TELEMETRY_PATH: /metrics-text
+      PROMSCALE_DB_URI: postgres://postgres:password@timescaledb:5432/otel_demo?sslmode=allow
+      PROMSCALE_TELEMETRY_TRACE_OTEL_ENDPOINT: "collector:4317"
+      PROMSCALE_TELEMETRY_TRACE_SAMPLING_RATIO: "0.1"
+      PROMSCALE_METRICS_RULES_CONFIG_FILE: /prometheus.yml
+      TOBS_PROMSCALE_QUICK_START: "true"
+
+  collector:
+    image: "otel/opentelemetry-collector:0.50.0"
+    command: [ "--config=/etc/otel-collector-config.yml" ]
+    depends_on:
+      - promscale
+    ports:
+      - 14268:14268/tcp # jaeger http
+      - 4317:4317/tcp
+      - 4318:4318/tcp
+    volumes:
+      - ${PWD}/../otel-collector-config.yml:/etc/otel-collector-config.yml
+
+  jaeger:
+    image: jaegertracing/jaeger-query:1.35.0
+    environment:
+      SPAN_STORAGE_TYPE: grpc-plugin
+    command: [
+      "--grpc-storage.server=promscale:9202",
+    ]
+    ports:
+      - "16686:16686"
+
+  grafana:
+    image: vineeth97/promscale-demo-grafana
+    volumes:
+      - grafana-data:/var/lib/grafana
+    ports:
+      - 3000:3000/tcp
+    restart: on-failure
+    depends_on:
+      - timescaledb
+      - jaeger
+
+  node_exporter:
+    image: quay.io/prometheus/node-exporter
+    ports:
+      - "9100:9100"
+
+  upper:
+    image: timescale/promscale-demo-upper
+    restart: on-failure
+    depends_on:
+      - collector
+    ports:
+      - 5054:5000/tcp
+    environment:
+      - OTEL_EXPORTER_OTLP_ENDPOINT=collector:4317
+
+  lower:
+    image: timescale/promscale-demo-lower
+    restart: on-failure
+    depends_on:
+      - collector
+    ports:
+      - 5053:5000/tcp
+    environment:
+      - OTEL_EXPORTER_OTLP_ENDPOINT=http://collector:4318
+
+  special:
+    image: timescale/promscale-demo-special
+    restart: on-failure
+    depends_on:
+      - collector
+    ports:
+      - 5052:5000/tcp
+    environment:
+      - OTEL_EXPORTER_OTLP_ENDPOINT=collector:4317
+  
+  digit:
+    image: timescale/promscale-demo-digit
+    restart: on-failure
+    depends_on:
+      - collector
+    ports:
+      - 5051:5000/tcp
+    environment:
+      - OTEL_EXPORTER_OTLP_ENDPOINT=collector:4317
+
+  generator:
+    image: timescale/promscale-demo-generator
+    restart: on-failure
+    depends_on:
+      - upper
+      - lower
+      - special
+      - digit
+    ports:
+      - 5050:5000/tcp
+    environment:
+      - OTEL_EXPORTER_OTLP_ENDPOINT=collector:4317
+
+  load:
+    image: timescale/promscale-demo-load
+    restart: on-failure
+    depends_on:
+      - generator
+    deploy:
+      mode: replicated
+      replicas: 3
+
+volumes:
+  timescaledb-data:
+  grafana-data:
\ No newline at end of file