diff --git a/crates/analytics/docs/clickhouse/scripts/api_events.sql b/crates/analytics/docs/clickhouse/scripts/api_events.sql
index e466fc56cb6e..36ad10db9532 100644
--- a/crates/analytics/docs/clickhouse/scripts/api_events.sql
+++ b/crates/analytics/docs/clickhouse/scripts/api_events.sql
@@ -23,17 +23,16 @@ CREATE TABLE api_events_queue (
     `ip_addr` String,
     `hs_latency` Nullable(UInt128),
     `http_method` LowCardinality(String),
-    `url_path` String,
+    `url_path` Nullable(String),
     `dispute_id` Nullable(String)
 ) ENGINE = Kafka SETTINGS kafka_broker_list = 'kafka0:29092',
 kafka_topic_list = 'hyperswitch-api-log-events',
-kafka_group_name = 'hyper-c1',
+kafka_group_name = 'hyper',
 kafka_format = 'JSONEachRow',
 kafka_handle_error_mode = 'stream';
 
-
-CREATE TABLE api_events_dist (
-    `merchant_id` String,
+CREATE TABLE api_events (
+    `merchant_id` LowCardinality(String),
     `payment_id` Nullable(String),
     `refund_id` Nullable(String),
     `payment_method_id` Nullable(String),
@@ -51,27 +50,85 @@ CREATE TABLE api_events_dist (
     `error` Nullable(String),
     `authentication_data` Nullable(String),
     `status_code` UInt32,
-    `created_at_timestamp` DateTime64(3),
+    `created_at` DateTime64(3),
+    `inserted_at` DateTime DEFAULT now() CODEC(T64, LZ4),
     `latency` UInt128,
     `user_agent` String,
     `ip_addr` String,
     `hs_latency` Nullable(UInt128),
     `http_method` LowCardinality(String),
-    `url_path` String,
+    `url_path` Nullable(String),
     `dispute_id` Nullable(String),
+    `masked_response` Nullable(String),
     INDEX flowIndex flow_type TYPE bloom_filter GRANULARITY 1,
     INDEX apiIndex api_flow TYPE bloom_filter GRANULARITY 1,
     INDEX statusIndex status_code TYPE bloom_filter GRANULARITY 1
+) ENGINE = MergeTree PARTITION BY toStartOfDay(created_at)
+ORDER BY
+    (
+        created_at,
+        merchant_id,
+        flow_type,
+        status_code,
+        api_flow
+    ) TTL inserted_at + toIntervalMonth(18) SETTINGS index_granularity = 8192;
+
+CREATE TABLE api_events_audit (
+    `merchant_id` LowCardinality(String),
+    `payment_id` String,
+    `refund_id` Nullable(String),
+    `payment_method_id` Nullable(String),
+    `payment_method` Nullable(String),
+    `payment_method_type` Nullable(String),
+    `customer_id` Nullable(String),
+    `user_id` Nullable(String),
+    `connector` Nullable(String),
+    `request_id` String,
+    `flow_type` LowCardinality(String),
+    `api_flow` LowCardinality(String),
+    `api_auth_type` LowCardinality(String),
+    `request` String,
+    `response` Nullable(String),
+    `error` Nullable(String),
+    `authentication_data` Nullable(String),
+    `status_code` UInt32,
+    `created_at` DateTime64(3),
+    `inserted_at` DateTime DEFAULT now() CODEC(T64, LZ4),
+    `latency` UInt128,
+    `user_agent` String,
+    `ip_addr` String,
+    `hs_latency` Nullable(UInt128),
+    `http_method` LowCardinality(Nullable(String)),
+    `url_path` Nullable(String),
+    `dispute_id` Nullable(String),
+    `masked_response` Nullable(String)
+) ENGINE = MergeTree PARTITION BY merchant_id
+ORDER BY
+    (merchant_id, payment_id) TTL inserted_at + toIntervalMonth(18) SETTINGS index_granularity = 8192;
+
+CREATE MATERIALIZED VIEW api_events_parse_errors (
+    `topic` String,
+    `partition` Int64,
+    `offset` Int64,
+    `raw` String,
+    `error` String
 ) ENGINE = MergeTree
-PARTITION BY toStartOfDay(created_at)
 ORDER BY
-	(created_at, merchant_id, flow_type, status_code, api_flow)
-TTL created_at + toIntervalMonth(6)
-;
+    (topic, partition, offset) SETTINGS index_granularity = 8192 AS
+SELECT
+    _topic AS topic,
+    _partition AS partition,
+    _offset AS offset,
+    _raw_message AS raw,
+    _error AS error
+FROM
+    api_events_queue
+WHERE
+    length(_error) > 0;
 
-CREATE MATERIALIZED VIEW api_events_mv TO api_events_dist (
+CREATE MATERIALIZED VIEW api_events_audit_mv TO api_events_audit (
     `merchant_id` String,
-    `payment_id` Nullable(String),
+    `payment_id` String,
     `refund_id` Nullable(String),
     `payment_method_id` Nullable(String),
     `payment_method` Nullable(String),
@@ -88,14 +145,16 @@ CREATE MATERIALIZED VIEW api_events_mv TO api_events_dist (
     `error` Nullable(String),
     `authentication_data` Nullable(String),
     `status_code` UInt32,
-    `created_at_timestamp` DateTime64(3),
+    `created_at` DateTime64(3),
+    `inserted_at` DateTime DEFAULT now() CODEC(T64, LZ4),
     `latency` UInt128,
     `user_agent` String,
     `ip_addr` String,
     `hs_latency` Nullable(UInt128),
-    `http_method` LowCardinality(String),
-    `url_path` String,
-    `dispute_id` Nullable(String)
+    `http_method` LowCardinality(Nullable(String)),
+    `url_path` Nullable(String),
+    `dispute_id` Nullable(String),
+    `masked_response` Nullable(String)
 ) AS
 SELECT
     merchant_id,
@@ -116,37 +175,82 @@ SELECT
     error,
     authentication_data,
     status_code,
-    created_at_timestamp,
-    now() as inserted_at,
+    created_at_timestamp AS created_at,
+    now() AS inserted_at,
     latency,
     user_agent,
     ip_addr,
     hs_latency,
     http_method,
     url_path,
-    dispute_id
+    dispute_id,
+    response AS masked_response
 FROM
     api_events_queue
-where length(_error) = 0;
-
+WHERE
+    (length(_error) = 0)
+    AND (payment_id IS NOT NULL);
 
-CREATE MATERIALIZED VIEW api_events_parse_errors
-(
-    `topic` String,
-    `partition` Int64,
-    `offset` Int64,
-    `raw` String,
-    `error` String
-)
-ENGINE = MergeTree
-ORDER BY (topic, partition, offset)
-SETTINGS index_granularity = 8192 AS
+CREATE MATERIALIZED VIEW api_events_mv TO api_events (
+    `merchant_id` String,
+    `payment_id` Nullable(String),
+    `refund_id` Nullable(String),
+    `payment_method_id` Nullable(String),
+    `payment_method` Nullable(String),
+    `payment_method_type` Nullable(String),
+    `customer_id` Nullable(String),
+    `user_id` Nullable(String),
+    `connector` Nullable(String),
+    `request_id` String,
+    `flow_type` LowCardinality(String),
+    `api_flow` LowCardinality(String),
+    `api_auth_type` LowCardinality(String),
+    `request` String,
+    `response` Nullable(String),
+    `error` Nullable(String),
+    `authentication_data` Nullable(String),
+    `status_code` UInt32,
+    `created_at` DateTime64(3),
+    `inserted_at` DateTime DEFAULT now() CODEC(T64, LZ4),
+    `latency` UInt128,
+    `user_agent` String,
+    `ip_addr` String,
+    `hs_latency` Nullable(UInt128),
+    `http_method` LowCardinality(Nullable(String)),
+    `url_path` Nullable(String),
+    `dispute_id` Nullable(String),
+    `masked_response` Nullable(String)
+) AS
 SELECT
-    _topic AS topic,
-    _partition AS partition,
-    _offset AS offset,
-    _raw_message AS raw,
-    _error AS error
-FROM api_events_queue
-WHERE length(_error) > 0
-;
+    merchant_id,
+    payment_id,
+    refund_id,
+    payment_method_id,
+    payment_method,
+    payment_method_type,
+    customer_id,
+    user_id,
+    connector,
+    request_id,
+    flow_type,
+    api_flow,
+    api_auth_type,
+    request,
+    response,
+    error,
+    authentication_data,
+    status_code,
+    created_at_timestamp AS created_at,
+    now() AS inserted_at,
+    latency,
+    user_agent,
+    ip_addr,
+    hs_latency,
+    http_method,
+    url_path,
+    dispute_id,
+    response AS masked_response
+FROM
+    api_events_queue
+WHERE
+    length(_error) = 0;
\ No newline at end of file
diff --git a/crates/analytics/docs/clickhouse/scripts/connector_events.sql b/crates/analytics/docs/clickhouse/scripts/connector_events.sql
index 47bbd7aec002..61a036bccd50 100644
--- a/crates/analytics/docs/clickhouse/scripts/connector_events.sql
+++ b/crates/analytics/docs/clickhouse/scripts/connector_events.sql
@@ -5,24 +5,42 @@ CREATE TABLE connector_events_queue (
     `request_id` String,
     `flow` LowCardinality(String),
     `request` String,
-    `response` Nullable(String),
     `masked_response` Nullable(String),
     `error` Nullable(String),
     `status_code` UInt32,
     `created_at` DateTime64(3),
     `latency` UInt128,
     `method` LowCardinality(String),
-    `refund_id` Nullable(String),
-    `dispute_id` Nullable(String)
+    `dispute_id` Nullable(String),
+    `refund_id` Nullable(String)
 ) ENGINE = Kafka SETTINGS kafka_broker_list = 'kafka0:29092',
-kafka_topic_list = 'hyperswitch-connector-api-events',
-kafka_group_name = 'hyper-c1',
+kafka_topic_list = 'hyperswitch-outgoing-connector-events',
+kafka_group_name = 'hyper',
 kafka_format = 'JSONEachRow',
 kafka_handle_error_mode = 'stream';
 
+CREATE MATERIALIZED VIEW connector_events_parse_errors (
+    `topic` String,
+    `partition` Int64,
+    `offset` Int64,
+    `raw` String,
+    `error` String
+) ENGINE = MergeTree
+ORDER BY
+    (topic, partition, offset) SETTINGS index_granularity = 8192 AS
+SELECT
+    _topic AS topic,
+    _partition AS partition,
+    _offset AS offset,
+    _raw_message AS raw,
+    _error AS error
+FROM
+    connector_events_queue
+WHERE
+    length(_error) > 0;
 
-CREATE TABLE connector_events_dist (
-    `merchant_id` String,
+CREATE TABLE connector_events (
+    `merchant_id` LowCardinality(String),
     `payment_id` Nullable(String),
     `connector_name` LowCardinality(String),
     `request_id` String,
@@ -36,19 +54,46 @@ CREATE TABLE connector_events_dist (
     `inserted_at` DateTime DEFAULT now() CODEC(T64, LZ4),
     `latency` UInt128,
     `method` LowCardinality(String),
+    `dispute_id` Nullable(String),
     `refund_id` Nullable(String),
+    INDEX flowIndex flow TYPE bloom_filter GRANULARITY 1,
+    INDEX connectorIndex connector_name TYPE bloom_filter GRANULARITY 1,
+    INDEX statusIndex status_code TYPE bloom_filter GRANULARITY 1
+) ENGINE = MergeTree PARTITION BY toStartOfDay(created_at)
+ORDER BY
+    (
+        created_at,
+        merchant_id,
+        connector_name,
+        flow,
+        status_code
+    ) TTL inserted_at + toIntervalMonth(18) SETTINGS index_granularity = 8192;
+
+CREATE TABLE connector_events_audit (
+    `merchant_id` LowCardinality(String),
+    `payment_id` String,
+    `connector_name` LowCardinality(String),
+    `request_id` String,
+    `flow` LowCardinality(String),
+    `request` String,
+    `response` Nullable(String),
+    `masked_response` Nullable(String),
+    `error` Nullable(String),
+    `status_code` UInt32,
+    `created_at` DateTime64(3),
+    `inserted_at` DateTime DEFAULT now() CODEC(T64, LZ4),
+    `latency` UInt128,
+    `method` LowCardinality(String),
     `dispute_id` Nullable(String),
+    `refund_id` Nullable(String),
     INDEX flowIndex flow TYPE bloom_filter GRANULARITY 1,
     INDEX connectorIndex connector_name TYPE bloom_filter GRANULARITY 1,
     INDEX statusIndex status_code TYPE bloom_filter GRANULARITY 1
-) ENGINE = MergeTree
-PARTITION BY toStartOfDay(created_at)
+) ENGINE = MergeTree PARTITION BY merchant_id
 ORDER BY
-	(created_at, merchant_id, connector_name, flow)
-TTL inserted_at + toIntervalMonth(6)
-;
+    (merchant_id, payment_id) TTL inserted_at + toIntervalMonth(18) SETTINGS index_granularity = 8192;
 
-CREATE MATERIALIZED VIEW connector_events_mv TO connector_events_dist (
+CREATE MATERIALIZED VIEW connector_events_audit_mv TO connector_events_audit (
     `merchant_id` String,
     `payment_id` Nullable(String),
     `connector_name` LowCardinality(String),
@@ -60,6 +105,7 @@ CREATE MATERIALIZED VIEW connector_events_mv TO connector_events_dist (
     `error` Nullable(String),
     `status_code` UInt32,
     `created_at` DateTime64(3),
+    `inserted_at` DateTime DEFAULT now() CODEC(T64, LZ4),
     `latency` UInt128,
     `method` LowCardinality(String),
     `refund_id` Nullable(String),
@@ -72,38 +118,58 @@ SELECT
     request_id,
     flow,
     request,
-    response,
+    masked_response AS response,
     masked_response,
     error,
     status_code,
     created_at,
-    now() as inserted_at,
+    now64() AS inserted_at,
     latency,
     method,
     refund_id,
     dispute_id
 FROM
     connector_events_queue
-where length(_error) = 0;
+WHERE
+    (length(_error) = 0)
+    AND (payment_id IS NOT NULL);
 
-
-CREATE MATERIALIZED VIEW connector_events_parse_errors
-(
-    `topic` String,
-    `partition` Int64,
-    `offset` Int64,
-    `raw` String,
-    `error` String
-)
-ENGINE = MergeTree
-ORDER BY (topic, partition, offset)
-SETTINGS index_granularity = 8192 AS
+CREATE MATERIALIZED VIEW connector_events_mv TO connector_events (
+    `merchant_id` String,
+    `payment_id` Nullable(String),
+    `connector_name` LowCardinality(String),
+    `request_id` String,
+    `flow` LowCardinality(String),
+    `request` String,
+    `response` Nullable(String),
+    `masked_response` Nullable(String),
+    `error` Nullable(String),
+    `status_code` UInt32,
+    `created_at` DateTime64(3),
+    `inserted_at` DateTime DEFAULT now() CODEC(T64, LZ4),
+    `latency` UInt128,
+    `method` LowCardinality(String),
+    `refund_id` Nullable(String),
+    `dispute_id` Nullable(String)
+) AS
 SELECT
-    _topic AS topic,
-    _partition AS partition,
-    _offset AS offset,
-    _raw_message AS raw,
-    _error AS error
-FROM connector_events_queue
-WHERE length(_error) > 0
-;
+    merchant_id,
+    payment_id,
+    connector_name,
+    request_id,
+    flow,
+    request,
+    masked_response AS response,
+    masked_response,
+    error,
+    status_code,
+    created_at,
+    now64() AS inserted_at,
+    latency,
+    method,
+    refund_id,
+    dispute_id
+FROM
+    connector_events_queue
+WHERE
+    length(_error) = 0;
\ No newline at end of file
diff --git a/crates/analytics/docs/clickhouse/scripts/disputes.sql b/crates/analytics/docs/clickhouse/scripts/disputes.sql
index 3f700bc06d38..bb7472a4d543 100644
--- a/crates/analytics/docs/clickhouse/scripts/disputes.sql
+++ b/crates/analytics/docs/clickhouse/scripts/disputes.sql
@@ -1,6 +1,6 @@
 CREATE TABLE dispute_queue (
     `dispute_id` String,
-    `amount` String,
+    `dispute_amount` UInt32,
     `currency` String,
     `dispute_stage` LowCardinality(String),
     `dispute_status` LowCardinality(String),
@@ -23,20 +23,19 @@ CREATE TABLE dispute_queue (
     `sign_flag` Int8
 ) ENGINE = Kafka SETTINGS kafka_broker_list = 'kafka0:29092',
 kafka_topic_list = 'hyperswitch-dispute-events',
-kafka_group_name = 'hyper-c1',
+kafka_group_name = 'hyper',
 kafka_format = 'JSONEachRow',
 kafka_handle_error_mode = 'stream';
 
-
 CREATE TABLE dispute (
     `dispute_id` String,
-    `amount` String,
+    `dispute_amount` UInt32,
     `currency` String,
     `dispute_stage` LowCardinality(String),
     `dispute_status` LowCardinality(String),
     `payment_id` String,
     `attempt_id` String,
-    `merchant_id` String,
+    `merchant_id` LowCardinality(String),
     `connector_status` String,
     `connector_dispute_id` String,
     `connector_reason` Nullable(String),
@@ -47,26 +46,21 @@ CREATE TABLE dispute (
     `created_at` DateTime DEFAULT now() CODEC(T64, LZ4),
     `modified_at` DateTime DEFAULT now() CODEC(T64, LZ4),
     `connector` LowCardinality(String),
-    `evidence` String DEFAULT '{}' CODEC(T64, LZ4),
+    `evidence` String DEFAULT '{}',
     `profile_id` Nullable(String),
     `merchant_connector_id` Nullable(String),
     `inserted_at` DateTime DEFAULT now() CODEC(T64, LZ4),
-    `sign_flag` Int8
+    `sign_flag` Int8,
     INDEX connectorIndex connector TYPE bloom_filter GRANULARITY 1,
     INDEX disputeStatusIndex dispute_status TYPE bloom_filter GRANULARITY 1,
     INDEX disputeStageIndex dispute_stage TYPE bloom_filter GRANULARITY 1
-) ENGINE = CollapsingMergeTree(
-    sign_flag
-)
-PARTITION BY toStartOfDay(created_at)
+) ENGINE = CollapsingMergeTree(sign_flag) PARTITION BY toStartOfDay(created_at)
 ORDER BY
-    (created_at, merchant_id, dispute_id)
-TTL created_at + toIntervalMonth(6)
-;
+    (created_at, merchant_id, dispute_id) TTL inserted_at + toIntervalMonth(18) SETTINGS index_granularity = 8192;
 
-CREATE MATERIALIZED VIEW kafka_parse_dispute TO dispute (
+CREATE MATERIALIZED VIEW dispute_mv TO dispute (
     `dispute_id` String,
-    `amount` String,
+    `dispute_amount` UInt32,
     `currency` String,
     `dispute_stage` LowCardinality(String),
     `dispute_status` LowCardinality(String),
@@ -91,7 +85,7 @@ CREATE MATERIALIZED VIEW kafka_parse_dispute TO dispute (
 ) AS
 SELECT
     dispute_id,
-    amount,
+    dispute_amount,
     currency,
     dispute_stage,
     dispute_status,
@@ -111,7 +105,29 @@ SELECT
     evidence,
     profile_id,
     merchant_connector_id,
-    now() as inserted_at,
+    now() AS inserted_at,
     sign_flag
 FROM
-    dispute_queue;
+    dispute_queue
+WHERE
+    length(_error) = 0;
+
+CREATE MATERIALIZED VIEW dispute_parse_errors (
+    `topic` String,
+    `partition` Int64,
+    `offset` Int64,
+    `raw` String,
+    `error` String
+) ENGINE = MergeTree
+ORDER BY
+    (topic, partition, offset) SETTINGS index_granularity = 8192 AS
+SELECT
+    _topic AS topic,
+    _partition AS partition,
+    _offset AS offset,
+    _raw_message AS raw,
+    _error AS error
+FROM
+    dispute_queue
+WHERE
+    length(_error) > 0;
\ No newline at end of file
diff --git a/crates/analytics/docs/clickhouse/scripts/outgoing_webhook_events.sql b/crates/analytics/docs/clickhouse/scripts/outgoing_webhook_events.sql
index 5d2d3fac74a8..30f3f293bfad 100644
--- a/crates/analytics/docs/clickhouse/scripts/outgoing_webhook_events.sql
+++ b/crates/analytics/docs/clickhouse/scripts/outgoing_webhook_events.sql
@@ -1,58 +1,75 @@
-CREATE TABLE
-    outgoing_webhook_events_queue (
-        `merchant_id` String,
-        `event_id` Nullable(String),
-        `event_type` LowCardinality(String),
-        `outgoing_webhook_event_type` LowCardinality(String),
-        `payment_id` Nullable(String),
-        `refund_id` Nullable(String),
-        `attempt_id` Nullable(String),
-        `dispute_id` Nullable(String),
-        `payment_method_id` Nullable(String),
-        `mandate_id` Nullable(String),
-        `content` Nullable(String),
-        `is_error` Bool,
-        `error` Nullable(String),
-        `created_at_timestamp` DateTime64(3),
-        `initial_attempt_id` Nullable(String)
-    ) ENGINE = Kafka SETTINGS kafka_broker_list = 'kafka0:29092',
-    kafka_topic_list = 'hyperswitch-outgoing-webhook-events',
-    kafka_group_name = 'hyper-c1',
-    kafka_format = 'JSONEachRow',
-    kafka_handle_error_mode = 'stream';
+CREATE TABLE outgoing_webhook_events_queue (
+    `merchant_id` String,
+    `event_id` String,
+    `event_type` LowCardinality(String),
+    `outgoing_webhook_event_type` LowCardinality(String),
+    `payment_id` Nullable(String),
+    `refund_id` Nullable(String),
+    `attempt_id` Nullable(String),
+    `dispute_id` Nullable(String),
+    `payment_method_id` Nullable(String),
+    `mandate_id` Nullable(String),
+    `content` Nullable(String),
+    `is_error` Bool,
+    `error` Nullable(String),
+    `created_at_timestamp` DateTime64(3)
+) ENGINE = Kafka SETTINGS kafka_broker_list = 'kafka0:29092',
+kafka_topic_list = 'hyperswitch-outgoing-webhook-events',
+kafka_group_name = 'hyper',
+kafka_format = 'JSONEachRow',
+kafka_handle_error_mode = 'stream';
 
-CREATE TABLE
-    outgoing_webhook_events_cluster (
-        `merchant_id` String,
-        `event_id` String,
-        `event_type` LowCardinality(String),
-        `outgoing_webhook_event_type` LowCardinality(String),
-        `payment_id` Nullable(String),
-        `refund_id` Nullable(String),
-        `attempt_id` Nullable(String),
-        `dispute_id` Nullable(String),
-        `payment_method_id` Nullable(String),
-        `mandate_id` Nullable(String),
-        `content` Nullable(String),
-        `is_error` Bool,
-        `error` Nullable(String),
-        `created_at_timestamp` DateTime64(3),
-        `inserted_at` DateTime DEFAULT now() CODEC(T64, LZ4),
-        `initial_attempt_id` Nullable(String),
-        INDEX eventIndex event_type TYPE bloom_filter GRANULARITY 1,
-        INDEX webhookeventIndex outgoing_webhook_event_type TYPE bloom_filter GRANULARITY 1
-    ) ENGINE = MergeTree PARTITION BY toStartOfDay(created_at_timestamp)
-ORDER BY (
-        created_at_timestamp,
+CREATE TABLE outgoing_webhook_events (
+    `merchant_id` LowCardinality(String),
+    `event_id` String,
+    `event_type` LowCardinality(String),
+    `outgoing_webhook_event_type` LowCardinality(String),
+    `payment_id` Nullable(String),
+    `refund_id` Nullable(String),
+    `attempt_id` Nullable(String),
+    `dispute_id` Nullable(String),
+    `payment_method_id` Nullable(String),
+    `mandate_id` Nullable(String),
+    `content` Nullable(String),
+    `is_error` Bool,
+    `error` Nullable(String),
+    `created_at` DateTime64(3),
+    `inserted_at` DateTime DEFAULT now() CODEC(T64, LZ4),
+    INDEX eventIndex event_type TYPE bloom_filter GRANULARITY 1,
+    INDEX webhookeventIndex outgoing_webhook_event_type TYPE bloom_filter GRANULARITY 1
+) ENGINE = MergeTree PARTITION BY toStartOfDay(created_at)
+ORDER BY
+    (
+        created_at,
         merchant_id,
         event_id,
         event_type,
         outgoing_webhook_event_type
-    ) TTL inserted_at + toIntervalMonth(6);
+    ) TTL inserted_at + toIntervalMonth(18) SETTINGS index_granularity = 8192;
 
-CREATE MATERIALIZED VIEW outgoing_webhook_events_mv TO outgoing_webhook_events_cluster (
+CREATE TABLE outgoing_webhook_events_audit (
+    `merchant_id` LowCardinality(String),
+    `event_id` String,
+    `event_type` LowCardinality(String),
+    `outgoing_webhook_event_type` LowCardinality(String),
+    `payment_id` String,
+    `refund_id` Nullable(String),
+    `attempt_id` Nullable(String),
+    `dispute_id` Nullable(String),
+    `payment_method_id` Nullable(String),
+    `mandate_id` Nullable(String),
+    `content` Nullable(String),
+    `is_error` Bool,
+    `error` Nullable(String),
+    `created_at` DateTime64(3),
+    `inserted_at` DateTime DEFAULT now() CODEC(T64, LZ4)
+) ENGINE = MergeTree PARTITION BY merchant_id
+ORDER BY
+    (merchant_id, payment_id) TTL inserted_at + toIntervalMonth(18) SETTINGS index_granularity = 8192;
+
+CREATE MATERIALIZED VIEW outgoing_webhook_events_mv TO outgoing_webhook_events (
     `merchant_id` String,
-    `event_id` Nullable(String),
+    `event_id` String,
     `event_type` LowCardinality(String),
     `outgoing_webhook_event_type` LowCardinality(String),
     `payment_id` Nullable(String),
@@ -64,9 +81,46 @@ CREATE MATERIALIZED VIEW outgoing_webhook_events_mv TO outgoing_webhook_events_c
     `content` Nullable(String),
     `is_error` Bool,
     `error` Nullable(String),
-    `created_at_timestamp` DateTime64(3),
-    `inserted_at` DateTime DEFAULT now() CODEC(T64, LZ4),
-    `initial_attempt_id` Nullable(String)
+    `created_at` DateTime64(3),
+    `inserted_at` DateTime DEFAULT now() CODEC(T64, LZ4)
+) AS
+SELECT
+    merchant_id,
+    event_id,
+    event_type,
+    outgoing_webhook_event_type,
+    payment_id,
+    refund_id,
+    attempt_id,
+    dispute_id,
+    payment_method_id,
+    mandate_id,
+    content,
+    is_error,
+    error,
+    created_at_timestamp AS created_at,
+    now() AS inserted_at
+FROM
+    outgoing_webhook_events_queue
+WHERE
+    length(_error) = 0;
+
+CREATE MATERIALIZED VIEW outgoing_webhook_events_audit_mv TO outgoing_webhook_events_audit (
+    `merchant_id` String,
+    `event_id` String,
+    `event_type` LowCardinality(String),
+    `outgoing_webhook_event_type` LowCardinality(String),
+    `payment_id` String,
+    `refund_id` Nullable(String),
+    `attempt_id` Nullable(String),
+    `dispute_id` Nullable(String),
+    `payment_method_id` Nullable(String),
+    `mandate_id` Nullable(String),
+    `content` Nullable(String),
+    `is_error` Bool,
+    `error` Nullable(String),
+    `created_at` DateTime64(3),
+    `inserted_at` DateTime DEFAULT now() CODEC(T64, LZ4)
 ) AS
 SELECT
     merchant_id,
@@ -82,12 +136,13 @@ SELECT
     content,
     is_error,
     error,
-    created_at_timestamp,
-    now() AS inserted_at,
-    initial_attempt_id
+    created_at_timestamp AS created_at,
+    now() AS inserted_at
 FROM
     outgoing_webhook_events_queue
-where length(_error) = 0;
+WHERE
+    (length(_error) = 0)
+    AND (payment_id IS NOT NULL);
 
 CREATE MATERIALIZED VIEW outgoing_webhook_parse_errors (
     `topic` String,
@@ -96,18 +151,15 @@ CREATE MATERIALIZED VIEW outgoing_webhook_parse_errors (
     `raw` String,
     `error` String
 ) ENGINE = MergeTree
-ORDER BY (
-        topic, partition,
-        offset
-    ) SETTINGS index_granularity = 8192 AS
+ORDER BY
+    (topic, partition, offset) SETTINGS index_granularity = 8192 AS
 SELECT
     _topic AS topic,
     _partition AS partition,
-    _offset AS
-offset
-,
+    _offset AS offset,
     _raw_message AS raw,
     _error AS error
 FROM
     outgoing_webhook_events_queue
-WHERE length(_error) > 0;
\ No newline at end of file
+WHERE
+    length(_error) > 0;
\ No newline at end of file
diff --git a/crates/analytics/docs/clickhouse/scripts/payment_attempts.sql b/crates/analytics/docs/clickhouse/scripts/payment_attempts.sql
index 8b7715044c1c..e5c52ccace82 100644
--- a/crates/analytics/docs/clickhouse/scripts/payment_attempts.sql
+++ b/crates/analytics/docs/clickhouse/scripts/payment_attempts.sql
@@ -1,4 +1,4 @@
-CREATE TABLE payment_attempts_queue (
+CREATE TABLE payment_attempt_queue (
     `payment_id` String,
     `merchant_id` String,
     `attempt_id` String,
@@ -32,22 +32,22 @@ CREATE TABLE payment_attempts_queue (
     `payment_method_data` Nullable(String),
     `error_reason` Nullable(String),
     `multiple_capture_count` Nullable(Int16),
-    `amount_capturable` Nullable(UInt64) ,
-    `merchant_connector_id`  Nullable(String),
-    `net_amount` Nullable(UInt64) ,
-    `unified_code`  Nullable(String),
-    `unified_message`  Nullable(String),
-    `mandate_data`  Nullable(String),
+    `amount_capturable` Nullable(UInt64),
+    `merchant_connector_id` Nullable(String),
+    `net_amount` Nullable(UInt64),
+    `unified_code` Nullable(String),
+    `unified_message` Nullable(String),
+    `mandate_data` Nullable(String),
     `sign_flag` Int8
 ) ENGINE = Kafka SETTINGS kafka_broker_list = 'kafka0:29092',
 kafka_topic_list = 'hyperswitch-payment-attempt-events',
-kafka_group_name = 'hyper-c1',
+kafka_group_name = 'hyper',
 kafka_format = 'JSONEachRow',
 kafka_handle_error_mode = 'stream';
 
-CREATE TABLE payment_attempt_dist (
+CREATE TABLE payment_attempts (
     `payment_id` String,
-    `merchant_id` String,
+    `merchant_id` LowCardinality(String),
     `attempt_id` String,
     `status` LowCardinality(String),
     `amount` Nullable(UInt32),
@@ -79,12 +79,12 @@ CREATE TABLE payment_attempt_dist (
     `payment_method_data` Nullable(String),
     `error_reason` Nullable(String),
     `multiple_capture_count` Nullable(Int16),
-    `amount_capturable` Nullable(UInt64) ,
-    `merchant_connector_id`  Nullable(String),
-    `net_amount` Nullable(UInt64) ,
-    `unified_code`  Nullable(String),
-    `unified_message`  Nullable(String),
-    `mandate_data`  Nullable(String),
+    `amount_capturable` Nullable(UInt64),
+    `merchant_connector_id` Nullable(String),
+    `net_amount` Nullable(UInt64),
+    `unified_code` Nullable(String),
+    `unified_message` Nullable(String),
+    `mandate_data` Nullable(String),
     `inserted_at` DateTime DEFAULT now() CODEC(T64, LZ4),
     `sign_flag` Int8,
     INDEX connectorIndex connector TYPE bloom_filter GRANULARITY 1,
@@ -92,17 +92,11 @@ CREATE TABLE payment_attempt_dist (
     INDEX authenticationTypeIndex authentication_type TYPE bloom_filter GRANULARITY 1,
     INDEX currencyIndex currency TYPE bloom_filter GRANULARITY 1,
     INDEX statusIndex status TYPE bloom_filter GRANULARITY 1
-) ENGINE = CollapsingMergeTree(
-    sign_flag
-)
-PARTITION BY toStartOfDay(created_at)
+) ENGINE = CollapsingMergeTree(sign_flag) PARTITION BY toStartOfDay(created_at)
 ORDER BY
-    (created_at, merchant_id, attempt_id)
-TTL created_at + toIntervalMonth(6)
-;
+    (created_at, merchant_id, attempt_id) TTL created_at + toIntervalMonth(18) SETTINGS index_granularity = 8192;
 
-
-CREATE MATERIALIZED VIEW kafka_parse_pa TO payment_attempt_dist (
+CREATE MATERIALIZED VIEW payment_attempt_mv TO payment_attempts (
     `payment_id` String,
     `merchant_id` String,
     `attempt_id` String,
@@ -136,12 +130,12 @@ CREATE MATERIALIZED VIEW kafka_parse_pa TO payment_attempt_dist (
     `payment_method_data` Nullable(String),
     `error_reason` Nullable(String),
     `multiple_capture_count` Nullable(Int16),
-    `amount_capturable` Nullable(UInt64) ,
-    `merchant_connector_id`  Nullable(String),
-    `net_amount` Nullable(UInt64) ,
-    `unified_code`  Nullable(String),
-    `unified_message`  Nullable(String),
-    `mandate_data`  Nullable(String),
+    `amount_capturable` Nullable(UInt64),
+    `merchant_connector_id` Nullable(String),
+    `net_amount` Nullable(UInt64),
+    `unified_code` Nullable(String),
+    `unified_message` Nullable(String),
+    `mandate_data` Nullable(String),
     `inserted_at` DateTime64(3),
     `sign_flag` Int8
 ) AS
@@ -185,8 +179,9 @@ SELECT
     unified_code,
     unified_message,
     mandate_data,
-    now() as inserted_at,
+    now() AS inserted_at,
     sign_flag
 FROM
-    payment_attempts_queue;
-
+    payment_attempt_queue
+WHERE
+    length(_error) = 0;
\ No newline at end of file
diff --git a/crates/analytics/docs/clickhouse/scripts/payment_intents.sql b/crates/analytics/docs/clickhouse/scripts/payment_intents.sql
index 8cd487f364b4..6889a1ff79df 100644
--- a/crates/analytics/docs/clickhouse/scripts/payment_intents.sql
+++ b/crates/analytics/docs/clickhouse/scripts/payment_intents.sql
@@ -1,4 +1,5 @@
-CREATE TABLE payment_intents_queue (
+CREATE TABLE payment_intents_queue
+(
     `payment_id` String,
     `merchant_id` String,
     `status` LowCardinality(String),
@@ -15,22 +16,23 @@ CREATE TABLE payment_intents_queue (
     `off_session` Nullable(Bool),
     `client_secret` Nullable(String),
     `active_attempt_id` String,
-    `business_country` String,
+    `business_country` LowCardinality(String),
     `business_label` String,
+    `attempt_count` UInt8,
     `modified_at` DateTime CODEC(T64, LZ4),
     `created_at` DateTime CODEC(T64, LZ4),
     `last_synced` Nullable(DateTime) CODEC(T64, LZ4),
     `sign_flag` Int8
 ) ENGINE = Kafka SETTINGS kafka_broker_list = 'kafka0:29092',
 kafka_topic_list = 'hyperswitch-payment-intent-events',
-kafka_group_name = 'hyper-c1',
+kafka_group_name = 'hyper',
 kafka_format = 'JSONEachRow',
 kafka_handle_error_mode = 'stream';
 
-
-CREATE TABLE payment_intents_dist (
+CREATE TABLE payment_intents
+(
     `payment_id` String,
-    `merchant_id` String,
+    `merchant_id` LowCardinality(String),
     `status` LowCardinality(String),
     `amount` UInt32,
     `currency` LowCardinality(Nullable(String)),
@@ -47,6 +49,7 @@ CREATE TABLE payment_intents_dist (
     `active_attempt_id` String,
     `business_country` LowCardinality(String),
     `business_label` String,
+    `attempt_count` UInt8,
     `modified_at` DateTime DEFAULT now() CODEC(T64, LZ4),
     `created_at` DateTime DEFAULT now() CODEC(T64, LZ4),
     `last_synced` Nullable(DateTime) CODEC(T64, LZ4),
@@ -55,16 +58,15 @@ CREATE TABLE payment_intents_dist (
     INDEX connectorIndex connector_id TYPE bloom_filter GRANULARITY 1,
     INDEX currencyIndex currency TYPE bloom_filter GRANULARITY 1,
     INDEX statusIndex status TYPE bloom_filter GRANULARITY 1
-) ENGINE = CollapsingMergeTree(
-    sign_flag
 )
+ENGINE = CollapsingMergeTree(sign_flag)
 PARTITION BY toStartOfDay(created_at)
-ORDER BY
-    (created_at, merchant_id, payment_id)
-TTL created_at + toIntervalMonth(6)
-;
+ORDER BY (created_at, merchant_id, payment_id)
+TTL created_at + toIntervalMonth(18)
+SETTINGS index_granularity = 8192;
 
-CREATE MATERIALIZED VIEW kafka_parse_payment_intent TO payment_intents_dist (
+CREATE MATERIALIZED VIEW payment_intents_mv TO payment_intents
+(
     `payment_id` String,
     `merchant_id` String,
     `status` LowCardinality(String),
@@ -83,6 +85,7 @@ CREATE MATERIALIZED VIEW kafka_parse_payment_intent TO payment_intents_dist (
     `active_attempt_id` String,
     `business_country` LowCardinality(String),
     `business_label` String,
+    `attempt_count` UInt8,
     `modified_at` DateTime64(3),
     `created_at` DateTime64(3),
     `last_synced` Nullable(DateTime64(3)),
@@ -108,9 +111,10 @@ SELECT
     active_attempt_id,
     business_country,
     business_label,
+    attempt_count,
     modified_at,
     created_at,
     last_synced,
-    now() as inserted_at,
+    now() AS inserted_at,
     sign_flag
-FROM payment_intents_queue;
+FROM payment_intents_queue;
\ No newline at end of file
diff --git a/crates/analytics/docs/clickhouse/scripts/payouts.sql b/crates/analytics/docs/clickhouse/scripts/payouts.sql
index 68d109f7b9bb..b7426c2983a3 100644
--- a/crates/analytics/docs/clickhouse/scripts/payouts.sql
+++ b/crates/analytics/docs/clickhouse/scripts/payouts.sql
@@ -25,13 +25,13 @@ CREATE TABLE payout_queue (
     `is_eligible` Nullable(Bool),
     `error_message` Nullable(String),
     `error_code` Nullable(String),
-    `business_country` Nullable(LowCardinality(String)),
+    `business_country` LowCardinality(Nullable(String)),
     `business_label` Nullable(String),
     `merchant_connector_id` Nullable(String),
     `sign_flag` Int8
 ) ENGINE = Kafka SETTINGS kafka_broker_list = 'kafka0:29092',
 kafka_topic_list = 'hyperswitch-payout-events',
-kafka_group_name = 'hyper-c1',
+kafka_group_name = 'hyper',
 kafka_format = 'JSONEachRow',
 kafka_handle_error_mode = 'stream';
 
@@ -42,7 +42,7 @@ CREATE TABLE payout (
     `customer_id` String,
     `address_id` String,
     `profile_id` String,
-    `payout_method_id` String,
+    `payout_method_id` Nullable(String),
     `payout_type` LowCardinality(String),
     `amount` UInt64,
     `destination_currency` LowCardinality(String),
@@ -62,7 +62,7 @@ CREATE TABLE payout (
     `is_eligible` Nullable(Bool),
     `error_message` Nullable(String),
     `error_code` Nullable(String),
-    `business_country` Nullable(LowCardinality(String)),
+    `business_country` LowCardinality(Nullable(String)),
     `business_label` Nullable(String),
     `merchant_connector_id` Nullable(String),
     `inserted_at` DateTime DEFAULT now() CODEC(T64, LZ4),
@@ -75,16 +75,16 @@ CREATE TABLE payout (
     INDEX businessCountryIndex business_country TYPE bloom_filter GRANULARITY 1
 ) ENGINE = CollapsingMergeTree(sign_flag) PARTITION BY toStartOfDay(created_at)
 ORDER BY
-    (created_at, merchant_id, payout_id) TTL created_at + toIntervalMonth(6);
+    (created_at, merchant_id, payout_id) TTL created_at + toIntervalMonth(6) SETTINGS index_granularity = 8192;
 
-CREATE MATERIALIZED VIEW kafka_parse_payout TO payout (
+CREATE MATERIALIZED VIEW payout_mv TO payout (
     `payout_id` String,
     `payout_attempt_id` String,
     `merchant_id` String,
     `customer_id` String,
     `address_id` String,
     `profile_id` String,
-    `payout_method_id` String,
+    `payout_method_id` Nullable(String),
     `payout_type` LowCardinality(String),
     `amount` UInt64,
     `destination_currency` LowCardinality(String),
@@ -95,8 +95,8 @@ CREATE MATERIALIZED VIEW kafka_parse_payout TO payout (
     `return_url` Nullable(String),
     `entity_type` LowCardinality(String),
     `metadata` Nullable(String),
-    `created_at` DateTime64(3),
-    `last_modified_at` DateTime64(3),
+    `created_at` DateTime DEFAULT now() CODEC(T64, LZ4),
+    `last_modified_at` DateTime DEFAULT now() CODEC(T64, LZ4),
     `attempt_count` UInt16,
     `status` LowCardinality(String),
     `connector` Nullable(String),
@@ -104,11 +104,11 @@ CREATE MATERIALIZED VIEW kafka_parse_payout TO payout (
     `is_eligible` Nullable(Bool),
     `error_message` Nullable(String),
     `error_code` Nullable(String),
-    `business_country` Nullable(LowCardinality(String)),
+    `business_country` LowCardinality(Nullable(String)),
     `business_label` Nullable(String),
     `merchant_connector_id` Nullable(String),
-    `inserted_at` DateTime64(3),
-    `sign_flag` Int8
+    `inserted_at` DateTime DEFAULT now() CODEC(T64, LZ4),
+    `sign_flag` Int8,
 ) AS
 SELECT
     payout_id,
diff --git a/crates/analytics/docs/clickhouse/scripts/refunds.sql b/crates/analytics/docs/clickhouse/scripts/refunds.sql
index a131270c1326..74c069db8535 100644
--- a/crates/analytics/docs/clickhouse/scripts/refunds.sql
+++ b/crates/analytics/docs/clickhouse/scripts/refunds.sql
@@ -19,21 +19,20 @@ CREATE TABLE refund_queue (
     `description` Nullable(String),
     `refund_reason` Nullable(String),
     `refund_error_code` Nullable(String),
-    `created_at` DateTime CODEC(T64, LZ4),
-    `modified_at` DateTime CODEC(T64, LZ4),
+    `created_at` DateTime,
+    `modified_at` DateTime,
     `sign_flag` Int8
 ) ENGINE = Kafka SETTINGS kafka_broker_list = 'kafka0:29092',
 kafka_topic_list = 'hyperswitch-refund-events',
-kafka_group_name = 'hyper-c1',
+kafka_group_name = 'hyper',
 kafka_format = 'JSONEachRow',
 kafka_handle_error_mode = 'stream';
 
-
-CREATE TABLE refund_dist (
+CREATE TABLE refunds (
     `internal_reference_id` String,
     `refund_id` String,
     `payment_id` String,
-    `merchant_id` String,
+    `merchant_id` LowCardinality(String),
     `connector_transaction_id` String,
     `connector` LowCardinality(Nullable(String)),
     `connector_refund_id` Nullable(String),
@@ -58,16 +57,11 @@ CREATE TABLE refund_dist (
     INDEX refundTypeIndex refund_type TYPE bloom_filter GRANULARITY 1,
     INDEX currencyIndex currency TYPE bloom_filter GRANULARITY 1,
     INDEX statusIndex refund_status TYPE bloom_filter GRANULARITY 1
-) ENGINE = CollapsingMergeTree(
-    sign_flag
-)
-PARTITION BY toStartOfDay(created_at)
+) ENGINE = CollapsingMergeTree(sign_flag) PARTITION BY toStartOfDay(created_at)
 ORDER BY
-    (created_at, merchant_id, refund_id)
-TTL created_at + toIntervalMonth(6)
-;
+    (created_at, merchant_id, refund_id) TTL created_at + toIntervalMonth(18) SETTINGS index_granularity = 8192;
 
-CREATE MATERIALIZED VIEW kafka_parse_refund TO refund_dist (
+CREATE MATERIALIZED VIEW refund_mv TO refunds (
     `internal_reference_id` String,
     `refund_id` String,
     `payment_id` String,
@@ -116,6 +110,9 @@ SELECT
     refund_error_code,
     created_at,
     modified_at,
-    now() as inserted_at,
+    now() AS inserted_at,
     sign_flag
-FROM refund_queue;
+FROM
+    refund_queue
+WHERE
+    length(_error) = 0;
\ No newline at end of file
diff --git a/docker-compose-development.yml b/docker-compose-development.yml
index 665bdf2f05db..f2ba6d3eda47 100644
--- a/docker-compose-development.yml
+++ b/docker-compose-development.yml
@@ -295,3 +295,29 @@ services:
       - "8001:8001"
     volumes:
       - redisinsight_store:/db
+
+  hyperswitch-control-center:
+    image: juspaydotin/hyperswitch-control-center:latest
+    networks:
+      - router_net
+    ports:
+      - "9000:9000"
+    environment:
+      apiBaseUrl:  http://localhost:8080
+      sdkBaseUrl: http://localhost:9050/HyperLoader.js
+
+  hyperswitch-web-sdk:
+    build:
+      dockerfile_inline: |
+        FROM node:lts
+        RUN git clone https://github.com/juspay/hyperswitch-web.git --depth 1
+        WORKDIR hyperswitch-web
+        RUN npm i --force
+    command: bash -c 'npm run re:build && npx run webpack serve --config webpack.dev.js --host 0.0.0.0'
+    ports:
+      - "9050:9050"
+    environment:
+      sdkEnv: local
+      envSdkUrl: http://localhost:9050
+      envBackendUrl: http://localhost:8080
+      envLoggingUrl: http://localhost:8207
diff --git a/docker-compose.yml b/docker-compose.yml
index 040832f8e27a..7d7c7c274056 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -3,6 +3,7 @@ version: "3.8"
 volumes:
   pg_data:
   redisinsight_store:
+  ckh_data:
 
 networks:
   router_net:
@@ -321,12 +322,14 @@ services:
       KAFKA_CLUSTERS_0_JMXPORT: 9997
 
   clickhouse-server:
-    image: clickhouse/clickhouse-server:23.5
+    image: clickhouse/clickhouse-server:24.3
     networks:
       - router_net
     ports:
       - "9000"
       - "8123:8123"
+    volumes:
+      - ./crates/analytics/docs/clickhouse/scripts:/docker-entrypoint-initdb.d
     profiles:
       - analytics
     ulimits:
@@ -363,4 +366,4 @@ services:
     environment:
       OPENSEARCH_HOSTS: '["https://opensearch:9200"]'
     networks:
-      - router_net
\ No newline at end of file
+      - router_net