diff --git a/snippets/clickstack/_schema_otel_metrics_exponential_histogram.mdx b/snippets/clickstack/_schema_otel_metrics_exponential_histogram.mdx
index 170c24b21..379baa80b 100644
--- a/snippets/clickstack/_schema_otel_metrics_exponential_histogram.mdx
+++ b/snippets/clickstack/_schema_otel_metrics_exponential_histogram.mdx
@@ -10,12 +10,12 @@ CREATE TABLE IF NOT EXISTS ${DATABASE}.otel_metrics_exponential_histogram
     `ScopeDroppedAttrCount` UInt32 CODEC(ZSTD(1)),
     `ScopeSchemaUrl` String CODEC(ZSTD(1)),
     `ServiceName` LowCardinality(String) CODEC(ZSTD(1)),
-    `MetricName` String CODEC(ZSTD(1)),
+    `MetricName` LowCardinality(String) CODEC(ZSTD(1)),
     `MetricDescription` String CODEC(ZSTD(1)),
     `MetricUnit` String CODEC(ZSTD(1)),
     `Attributes` Map(LowCardinality(String), String) CODEC(ZSTD(1)),
-    `StartTimeUnix` DateTime64(9) CODEC(Delta(8), ZSTD(1)),
-    `TimeUnix` DateTime64(9) CODEC(Delta(8), ZSTD(1)),
+    `StartTimeUnix` DateTime CODEC(Delta, ZSTD(1)),
+    `TimeUnix` DateTime CODEC(Delta, ZSTD(1)),
     `Count` UInt64 CODEC(Delta(8), ZSTD(1)),
     `Sum` Float64 CODEC(ZSTD(1)),
     `Scale` Int32 CODEC(ZSTD(1)),
@@ -25,7 +25,7 @@ CREATE TABLE IF NOT EXISTS ${DATABASE}.otel_metrics_exponential_histogram
     `NegativeOffset` Int32 CODEC(ZSTD(1)),
     `NegativeBucketCounts` Array(UInt64) CODEC(ZSTD(1)),
     `Exemplars.FilteredAttributes` Array(Map(LowCardinality(String), String)) CODEC(ZSTD(1)),
-    `Exemplars.TimeUnix` Array(DateTime64(9)) CODEC(ZSTD(1)),
+    `Exemplars.TimeUnix` Array(DateTime) CODEC(ZSTD(1)),
     `Exemplars.Value` Array(Float64) CODEC(ZSTD(1)),
     `Exemplars.SpanId` Array(String) CODEC(ZSTD(1)),
     `Exemplars.TraceId` Array(String) CODEC(ZSTD(1)),
@@ -38,11 +38,12 @@ CREATE TABLE IF NOT EXISTS ${DATABASE}.otel_metrics_exponential_histogram
     INDEX idx_scope_attr_key mapKeys(ScopeAttributes) TYPE bloom_filter(0.01) GRANULARITY 1,
     INDEX idx_scope_attr_value mapValues(ScopeAttributes) TYPE bloom_filter(0.01) GRANULARITY 1,
     INDEX idx_attr_key mapKeys(Attributes) TYPE bloom_filter(0.01) GRANULARITY 1,
-    INDEX idx_attr_value mapValues(Attributes) TYPE bloom_filter(0.01) GRANULARITY 1
+    INDEX idx_attr_value mapValues(Attributes) TYPE bloom_filter(0.01) GRANULARITY 1,
+    INDEX idx_time_minmax TimeUnix TYPE minmax GRANULARITY 1
 )
 ENGINE = MergeTree
 PARTITION BY toDate(TimeUnix)
-ORDER BY (ServiceName, MetricName, Attributes, toUnixTimestamp64Nano(TimeUnix))
+ORDER BY (ServiceName, MetricName, toStartOfHour(TimeUnix), cityHash64(Attributes), TimeUnix)
 TTL toDateTime(TimeUnix) + ${TABLES_TTL}
 SETTINGS ttl_only_drop_parts = 1;
 ```
diff --git a/snippets/clickstack/_schema_otel_metrics_gauge.mdx b/snippets/clickstack/_schema_otel_metrics_gauge.mdx
index e1231fd25..90f064258 100644
--- a/snippets/clickstack/_schema_otel_metrics_gauge.mdx
+++ b/snippets/clickstack/_schema_otel_metrics_gauge.mdx
@@ -10,16 +10,16 @@ CREATE TABLE IF NOT EXISTS ${DATABASE}.otel_metrics_gauge
     `ScopeDroppedAttrCount` UInt32 CODEC(ZSTD(1)),
     `ScopeSchemaUrl` String CODEC(ZSTD(1)),
     `ServiceName` LowCardinality(String) CODEC(ZSTD(1)),
-    `MetricName` String CODEC(ZSTD(1)),
+    `MetricName` LowCardinality(String) CODEC(ZSTD(1)),
     `MetricDescription` String CODEC(ZSTD(1)),
     `MetricUnit` String CODEC(ZSTD(1)),
     `Attributes` Map(LowCardinality(String), String) CODEC(ZSTD(1)),
-    `StartTimeUnix` DateTime64(9) CODEC(Delta(8), ZSTD(1)),
-    `TimeUnix` DateTime64(9) CODEC(Delta(8), ZSTD(1)),
+    `StartTimeUnix` DateTime CODEC(Delta, ZSTD(1)),
+    `TimeUnix` DateTime CODEC(Delta, ZSTD(1)),
     `Value` Float64 CODEC(ZSTD(1)),
     `Flags` UInt32 CODEC(ZSTD(1)),
     `Exemplars.FilteredAttributes` Array(Map(LowCardinality(String), String)) CODEC(ZSTD(1)),
-    `Exemplars.TimeUnix` Array(DateTime64(9)) CODEC(ZSTD(1)),
+    `Exemplars.TimeUnix` Array(DateTime) CODEC(ZSTD(1)),
     `Exemplars.Value` Array(Float64) CODEC(ZSTD(1)),
     `Exemplars.SpanId` Array(String) CODEC(ZSTD(1)),
     `Exemplars.TraceId` Array(String) CODEC(ZSTD(1)),
@@ -28,11 +28,12 @@ CREATE TABLE IF NOT EXISTS ${DATABASE}.otel_metrics_gauge
     INDEX idx_scope_attr_key mapKeys(ScopeAttributes) TYPE bloom_filter(0.01) GRANULARITY 1,
     INDEX idx_scope_attr_value mapValues(ScopeAttributes) TYPE bloom_filter(0.01) GRANULARITY 1,
     INDEX idx_attr_key mapKeys(Attributes) TYPE bloom_filter(0.01) GRANULARITY 1,
-    INDEX idx_attr_value mapValues(Attributes) TYPE bloom_filter(0.01) GRANULARITY 1
+    INDEX idx_attr_value mapValues(Attributes) TYPE bloom_filter(0.01) GRANULARITY 1,
+    INDEX idx_time_minmax TimeUnix TYPE minmax GRANULARITY 1
 )
 ENGINE = MergeTree
 PARTITION BY toDate(TimeUnix)
-ORDER BY (ServiceName, MetricName, Attributes, toUnixTimestamp64Nano(TimeUnix))
+ORDER BY (ServiceName, MetricName, toStartOfHour(TimeUnix), cityHash64(Attributes), TimeUnix)
 TTL toDateTime(TimeUnix) + ${TABLES_TTL}
 SETTINGS ttl_only_drop_parts = 1;
 ```
diff --git a/snippets/clickstack/_schema_otel_metrics_histogram.mdx b/snippets/clickstack/_schema_otel_metrics_histogram.mdx
index 29557336d..f2fcbe1f0 100644
--- a/snippets/clickstack/_schema_otel_metrics_histogram.mdx
+++ b/snippets/clickstack/_schema_otel_metrics_histogram.mdx
@@ -10,18 +10,18 @@ CREATE TABLE IF NOT EXISTS ${DATABASE}.otel_metrics_histogram
     `ScopeDroppedAttrCount` UInt32 CODEC(ZSTD(1)),
     `ScopeSchemaUrl` String CODEC(ZSTD(1)),
     `ServiceName` LowCardinality(String) CODEC(ZSTD(1)),
-    `MetricName` String CODEC(ZSTD(1)),
+    `MetricName` LowCardinality(String) CODEC(ZSTD(1)),
     `MetricDescription` String CODEC(ZSTD(1)),
     `MetricUnit` String CODEC(ZSTD(1)),
     `Attributes` Map(LowCardinality(String), String) CODEC(ZSTD(1)),
-    `StartTimeUnix` DateTime64(9) CODEC(Delta(8), ZSTD(1)),
-    `TimeUnix` DateTime64(9) CODEC(Delta(8), ZSTD(1)),
+    `StartTimeUnix` DateTime CODEC(Delta, ZSTD(1)),
+    `TimeUnix` DateTime CODEC(Delta, ZSTD(1)),
     `Count` UInt64 CODEC(Delta(8), ZSTD(1)),
     `Sum` Float64 CODEC(ZSTD(1)),
     `BucketCounts` Array(UInt64) CODEC(ZSTD(1)),
     `ExplicitBounds` Array(Float64) CODEC(ZSTD(1)),
     `Exemplars.FilteredAttributes` Array(Map(LowCardinality(String), String)) CODEC(ZSTD(1)),
-    `Exemplars.TimeUnix` Array(DateTime64(9)) CODEC(ZSTD(1)),
+    `Exemplars.TimeUnix` Array(DateTime) CODEC(ZSTD(1)),
     `Exemplars.Value` Array(Float64) CODEC(ZSTD(1)),
     `Exemplars.SpanId` Array(String) CODEC(ZSTD(1)),
     `Exemplars.TraceId` Array(String) CODEC(ZSTD(1)),
@@ -34,11 +34,12 @@ CREATE TABLE IF NOT EXISTS ${DATABASE}.otel_metrics_histogram
     INDEX idx_scope_attr_key mapKeys(ScopeAttributes) TYPE bloom_filter(0.01) GRANULARITY 1,
     INDEX idx_scope_attr_value mapValues(ScopeAttributes) TYPE bloom_filter(0.01) GRANULARITY 1,
     INDEX idx_attr_key mapKeys(Attributes) TYPE bloom_filter(0.01) GRANULARITY 1,
-    INDEX idx_attr_value mapValues(Attributes) TYPE bloom_filter(0.01) GRANULARITY 1
+    INDEX idx_attr_value mapValues(Attributes) TYPE bloom_filter(0.01) GRANULARITY 1,
+    INDEX idx_time_minmax TimeUnix TYPE minmax GRANULARITY 1
 )
 ENGINE = MergeTree
 PARTITION BY toDate(TimeUnix)
-ORDER BY (ServiceName, MetricName, Attributes, toUnixTimestamp64Nano(TimeUnix))
+ORDER BY (ServiceName, MetricName, toStartOfHour(TimeUnix), cityHash64(Attributes), TimeUnix)
 TTL toDateTime(TimeUnix) + ${TABLES_TTL}
 SETTINGS ttl_only_drop_parts = 1;
 ```
diff --git a/snippets/clickstack/_schema_otel_metrics_sum.mdx b/snippets/clickstack/_schema_otel_metrics_sum.mdx
index 336804b1e..9574ceff9 100644
--- a/snippets/clickstack/_schema_otel_metrics_sum.mdx
+++ b/snippets/clickstack/_schema_otel_metrics_sum.mdx
@@ -10,16 +10,16 @@ CREATE TABLE IF NOT EXISTS ${DATABASE}.otel_metrics_sum
     `ScopeDroppedAttrCount` UInt32 CODEC(ZSTD(1)),
     `ScopeSchemaUrl` String CODEC(ZSTD(1)),
     `ServiceName` LowCardinality(String) CODEC(ZSTD(1)),
-    `MetricName` String CODEC(ZSTD(1)),
+    `MetricName` LowCardinality(String) CODEC(ZSTD(1)),
     `MetricDescription` String CODEC(ZSTD(1)),
     `MetricUnit` String CODEC(ZSTD(1)),
     `Attributes` Map(LowCardinality(String), String) CODEC(ZSTD(1)),
-    `StartTimeUnix` DateTime64(9) CODEC(Delta(8), ZSTD(1)),
-    `TimeUnix` DateTime64(9) CODEC(Delta(8), ZSTD(1)),
+    `StartTimeUnix` DateTime CODEC(Delta, ZSTD(1)),
+    `TimeUnix` DateTime CODEC(Delta, ZSTD(1)),
     `Value` Float64 CODEC(ZSTD(1)),
     `Flags` UInt32 CODEC(ZSTD(1)),
     `Exemplars.FilteredAttributes` Array(Map(LowCardinality(String), String)) CODEC(ZSTD(1)),
-    `Exemplars.TimeUnix` Array(DateTime64(9)) CODEC(ZSTD(1)),
+    `Exemplars.TimeUnix` Array(DateTime) CODEC(ZSTD(1)),
     `Exemplars.Value` Array(Float64) CODEC(ZSTD(1)),
     `Exemplars.SpanId` Array(String) CODEC(ZSTD(1)),
     `Exemplars.TraceId` Array(String) CODEC(ZSTD(1)),
@@ -30,11 +30,12 @@ CREATE TABLE IF NOT EXISTS ${DATABASE}.otel_metrics_sum
     INDEX idx_scope_attr_key mapKeys(ScopeAttributes) TYPE bloom_filter(0.01) GRANULARITY 1,
     INDEX idx_scope_attr_value mapValues(ScopeAttributes) TYPE bloom_filter(0.01) GRANULARITY 1,
     INDEX idx_attr_key mapKeys(Attributes) TYPE bloom_filter(0.01) GRANULARITY 1,
-    INDEX idx_attr_value mapValues(Attributes) TYPE bloom_filter(0.01) GRANULARITY 1
+    INDEX idx_attr_value mapValues(Attributes) TYPE bloom_filter(0.01) GRANULARITY 1,
+    INDEX idx_time_minmax TimeUnix TYPE minmax GRANULARITY 1
 )
 ENGINE = MergeTree
 PARTITION BY toDate(TimeUnix)
-ORDER BY (ServiceName, MetricName, Attributes, toUnixTimestamp64Nano(TimeUnix))
+ORDER BY (ServiceName, MetricName, toStartOfHour(TimeUnix), cityHash64(Attributes), TimeUnix)
 TTL toDateTime(TimeUnix) + ${TABLES_TTL}
 SETTINGS ttl_only_drop_parts = 1;
 ```
diff --git a/snippets/clickstack/_schema_otel_metrics_summary.mdx b/snippets/clickstack/_schema_otel_metrics_summary.mdx
index 39cf32991..96807dc85 100644
--- a/snippets/clickstack/_schema_otel_metrics_summary.mdx
+++ b/snippets/clickstack/_schema_otel_metrics_summary.mdx
@@ -10,12 +10,12 @@ CREATE TABLE IF NOT EXISTS ${DATABASE}.otel_metrics_summary
     `ScopeDroppedAttrCount` UInt32 CODEC(ZSTD(1)),
     `ScopeSchemaUrl` String CODEC(ZSTD(1)),
     `ServiceName` LowCardinality(String) CODEC(ZSTD(1)),
-    `MetricName` String CODEC(ZSTD(1)),
+    `MetricName` LowCardinality(String) CODEC(ZSTD(1)),
     `MetricDescription` String CODEC(ZSTD(1)),
     `MetricUnit` String CODEC(ZSTD(1)),
     `Attributes` Map(LowCardinality(String), String) CODEC(ZSTD(1)),
-    `StartTimeUnix` DateTime64(9) CODEC(Delta(8), ZSTD(1)),
-    `TimeUnix` DateTime64(9) CODEC(Delta(8), ZSTD(1)),
+    `StartTimeUnix` DateTime CODEC(Delta, ZSTD(1)),
+    `TimeUnix` DateTime CODEC(Delta, ZSTD(1)),
     `Count` UInt64 CODEC(Delta(8), ZSTD(1)),
     `Sum` Float64 CODEC(ZSTD(1)),
     `ValueAtQuantiles.Quantile` Array(Float64) CODEC(ZSTD(1)),
@@ -26,11 +26,12 @@ CREATE TABLE IF NOT EXISTS ${DATABASE}.otel_metrics_summary
     INDEX idx_scope_attr_key mapKeys(ScopeAttributes) TYPE bloom_filter(0.01) GRANULARITY 1,
     INDEX idx_scope_attr_value mapValues(ScopeAttributes) TYPE bloom_filter(0.01) GRANULARITY 1,
     INDEX idx_attr_key mapKeys(Attributes) TYPE bloom_filter(0.01) GRANULARITY 1,
-    INDEX idx_attr_value mapValues(Attributes) TYPE bloom_filter(0.01) GRANULARITY 1
+    INDEX idx_attr_value mapValues(Attributes) TYPE bloom_filter(0.01) GRANULARITY 1,
+    INDEX idx_time_minmax TimeUnix TYPE minmax GRANULARITY 1
 )
 ENGINE = MergeTree
 PARTITION BY toDate(TimeUnix)
-ORDER BY (ServiceName, MetricName, Attributes, toUnixTimestamp64Nano(TimeUnix))
+ORDER BY (ServiceName, MetricName, toStartOfHour(TimeUnix), cityHash64(Attributes), TimeUnix)
 TTL toDateTime(TimeUnix) + ${TABLES_TTL}
 SETTINGS ttl_only_drop_parts = 1;
 ```