diff --git a/ee/scripts/schema/db/init_dbs/clickhouse/create/init_schema.sql b/ee/scripts/schema/db/init_dbs/clickhouse/create/init_schema.sql
index 7d1a9559a..71bd6ad55 100644
--- a/ee/scripts/schema/db/init_dbs/clickhouse/create/init_schema.sql
+++ b/ee/scripts/schema/db/init_dbs/clickhouse/create/init_schema.sql
@@ -791,7 +791,8 @@ CREATE TABLE IF NOT EXISTS product_analytics.property_values_samples
     ENGINE = ReplacingMergeTree(_timestamp)
         ORDER BY (project_id, property_name, is_event_property);
 -- Incremental materialized view to get random examples of property values using $properties & properties
-CREATE MATERIALIZED VIEW IF NOT EXISTS product_analytics.property_values_sampler_mvREFRESHEVERY30HOURTOproduct_analytics.property_values_samples AS
+CREATE MATERIALIZED VIEW IF NOT EXISTS product_analytics.property_values_sampler_mv
+    REFRESH EVERY 30 HOUR TO product_analytics.property_values_samples AS
 SELECT project_id,
        property_name,
        TRUE                                                      AS is_event_property,
diff --git a/ee/scripts/schema/db/init_dbs/postgresql/1.23.0/1.23.0.sql b/ee/scripts/schema/db/init_dbs/postgresql/1.23.0/1.23.0.sql
index 718a6e693..9c878f57a 100644
--- a/ee/scripts/schema/db/init_dbs/postgresql/1.23.0/1.23.0.sql
+++ b/ee/scripts/schema/db/init_dbs/postgresql/1.23.0/1.23.0.sql
@@ -23,6 +23,8 @@ DROP SCHEMA IF EXISTS or_cache CASCADE;
 ALTER TABLE public.tenants
     ALTER COLUMN scope_state SET DEFAULT 2;
 
+ALTER TYPE issue_type ADD VALUE IF NOT EXISTS 'incident';
+
 COMMIT;
 
 \elif :is_next
diff --git a/ee/scripts/schema/db/init_dbs/postgresql/init_schema.sql b/ee/scripts/schema/db/init_dbs/postgresql/init_schema.sql
index 4701bc53f..caf4e7467 100644
--- a/ee/scripts/schema/db/init_dbs/postgresql/init_schema.sql
+++ b/ee/scripts/schema/db/init_dbs/postgresql/init_schema.sql
@@ -352,7 +352,8 @@ CREATE TYPE issue_type AS ENUM (
     'custom',
     'js_exception',
     'mouse_thrashing',
-    'app_crash'
+    'app_crash',
+    'incident'
     );
 
 CREATE TABLE public.issues
diff --git a/scripts/schema/db/init_dbs/clickhouse/1.23.0/1.23.0.sql b/scripts/schema/db/init_dbs/clickhouse/1.23.0/1.23.0.sql
index 50dd204bb..baef5f007 100644
--- a/scripts/schema/db/init_dbs/clickhouse/1.23.0/1.23.0.sql
+++ b/scripts/schema/db/init_dbs/clickhouse/1.23.0/1.23.0.sql
@@ -168,7 +168,8 @@ CREATE TABLE IF NOT EXISTS product_analytics.property_values_samples
     ENGINE = ReplacingMergeTree(_timestamp)
         ORDER BY (project_id, property_name, is_event_property);
 
-CREATE MATERIALIZED VIEW IF NOT EXISTS product_analytics.property_values_sampler_mvREFRESHEVERY30HOURTOproduct_analytics.property_values_samples AS
+CREATE MATERIALIZED VIEW IF NOT EXISTS product_analytics.property_values_sampler_mv
+    REFRESH EVERY 30 HOUR TO product_analytics.property_values_samples AS
 SELECT project_id,
        property_name,
        TRUE                                                      AS is_event_property,
@@ -219,7 +220,8 @@ CREATE TABLE IF NOT EXISTS product_analytics.autocomplete_events_grouped
       ORDER BY (project_id, value)
       TTL _timestamp + INTERVAL 1 MONTH;
 
-CREATE MATERIALIZED VIEW IF NOT EXISTS product_analytics.autocomplete_events_grouped_mvREFRESHEVERY30MINUTETOproduct_analytics.autocomplete_events_grouped AS
+CREATE MATERIALIZED VIEW IF NOT EXISTS product_analytics.autocomplete_events_grouped_mv
+    REFRESH EVERY 30 MINUTE TO product_analytics.autocomplete_events_grouped AS
 SELECT project_id,
        value,
        count(1)        AS data_count,
@@ -265,7 +267,8 @@ CREATE TABLE IF NOT EXISTS product_analytics.autocomplete_event_properties_group
       ORDER BY (project_id, event_name, property_name, value)
       TTL _timestamp + INTERVAL 1 MONTH;
 
-CREATE MATERIALIZED VIEW IF NOT EXISTS product_analytics.autocomplete_event_properties_grouped_mvREFRESHEVERY30MINUTETOproduct_analytics.autocomplete_event_properties_grouped AS
+CREATE MATERIALIZED VIEW IF NOT EXISTS product_analytics.autocomplete_event_properties_grouped_mv
+    REFRESH EVERY 30 MINUTE TO product_analytics.autocomplete_event_properties_grouped AS
 SELECT project_id,
        event_name,
        property_name,
diff --git a/scripts/schema/db/init_dbs/postgresql/1.23.0/1.23.0.sql b/scripts/schema/db/init_dbs/postgresql/1.23.0/1.23.0.sql
index 8003f6753..36f9e8d6d 100644
--- a/scripts/schema/db/init_dbs/postgresql/1.23.0/1.23.0.sql
+++ b/scripts/schema/db/init_dbs/postgresql/1.23.0/1.23.0.sql
@@ -23,6 +23,8 @@ DROP SCHEMA IF EXISTS or_cache CASCADE;
 ALTER TABLE public.tenants
     ALTER COLUMN scope_state SET DEFAULT 2;
 
+ALTER TYPE issue_type ADD VALUE IF NOT EXISTS 'incident';
+
 COMMIT;
 
 \elif :is_next
diff --git a/scripts/schema/db/init_dbs/postgresql/init_schema.sql b/scripts/schema/db/init_dbs/postgresql/init_schema.sql
index 7c6eb396e..2df44883a 100644
--- a/scripts/schema/db/init_dbs/postgresql/init_schema.sql
+++ b/scripts/schema/db/init_dbs/postgresql/init_schema.sql
@@ -314,7 +314,8 @@ CREATE TYPE issue_type AS ENUM (
     'custom',
     'js_exception',
     'mouse_thrashing',
-    'app_crash'
+    'app_crash',
+    'incident'
     );
 
 CREATE TABLE public.issues