diff --git a/ee/scripts/schema/db/init_dbs/clickhouse/1.22.0/1.22.0.sql b/ee/scripts/schema/db/init_dbs/clickhouse/1.22.0/1.22.0.sql
index 27aadcf39..041fa6249 100644
--- a/ee/scripts/schema/db/init_dbs/clickhouse/1.22.0/1.22.0.sql
+++ b/ee/scripts/schema/db/init_dbs/clickhouse/1.22.0/1.22.0.sql
@@ -56,6 +56,7 @@ CREATE TABLE IF NOT EXISTS product_analytics.devices
     "$screen_height"   UInt16                 DEFAULT 0,
     "$screen_width"    UInt16                 DEFAULT 0,
     "$os"              LowCardinality(String) DEFAULT '',
+    "$os_version"      LowCardinality(String) DEFAULT '',
     "$browser"         LowCardinality(String) DEFAULT '',
     "$browser_version" String                 DEFAULT '',
 
@@ -119,9 +120,10 @@ CREATE TABLE IF NOT EXISTS product_analytics.events
     "$sdk_version"              LowCardinality(String),
     "$device_id"                String,
     "$os"                       LowCardinality(String) DEFAULT '',
+    "$os_version"               LowCardinality(String) DEFAULT '',
     "$browser"                  LowCardinality(String) DEFAULT '',
     "$browser_version"          String DEFAULT '',
-    "$device"                   String DEFAULT '' COMMENT 'web/mobile',
+    "$device"                   LowCardinality(String) DEFAULT '' COMMENT 'in session, it is platform; web/mobile',
     "$screen_height"            UInt16 DEFAULT 0,
     "$screen_width"             UInt16 DEFAULT 0,
     "$current_url"              String DEFAULT '',
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 1fd1a79e7..6745ab2be 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
@@ -389,6 +389,7 @@ CREATE TABLE IF NOT EXISTS product_analytics.devices
     "$screen_height"   UInt16                 DEFAULT 0,
     "$screen_width"    UInt16                 DEFAULT 0,
     "$os"              LowCardinality(String) DEFAULT '',
+    "$os_version"      LowCardinality(String) DEFAULT '',
     "$browser"         LowCardinality(String) DEFAULT '',
     "$browser_version" String                 DEFAULT '',
 
@@ -452,9 +453,10 @@ CREATE TABLE IF NOT EXISTS product_analytics.events
     "$sdk_version"              LowCardinality(String),
     "$device_id"                String,
     "$os"                       LowCardinality(String) DEFAULT '',
+    "$os_version"               LowCardinality(String) DEFAULT '',
     "$browser"                  LowCardinality(String) DEFAULT '',
     "$browser_version"          String DEFAULT '',
-    "$device"                   String DEFAULT '' COMMENT 'web/mobile',
+    "$device"                   LowCardinality(String) DEFAULT '' COMMENT 'in session, it is platform; web/mobile',
     "$screen_height"            UInt16 DEFAULT 0,
     "$screen_width"             UInt16 DEFAULT 0,
     "$current_url"              String DEFAULT '',
diff --git a/scripts/schema/db/init_dbs/clickhouse/1.22.0/1.22.0.sql b/scripts/schema/db/init_dbs/clickhouse/1.22.0/1.22.0.sql
index 2b9d89a8c..2d781ec7c 100644
--- a/scripts/schema/db/init_dbs/clickhouse/1.22.0/1.22.0.sql
+++ b/scripts/schema/db/init_dbs/clickhouse/1.22.0/1.22.0.sql
@@ -250,6 +250,7 @@ CREATE TABLE IF NOT EXISTS product_analytics.devices
     "$screen_height"   UInt16                 DEFAULT 0,
     "$screen_width"    UInt16                 DEFAULT 0,
     "$os"              LowCardinality(String) DEFAULT '',
+    "$os_version"      LowCardinality(String) DEFAULT '',
     "$browser"         LowCardinality(String) DEFAULT '',
     "$browser_version" String                 DEFAULT '',
 
@@ -313,9 +314,10 @@ CREATE TABLE IF NOT EXISTS product_analytics.events
     "$sdk_version"              LowCardinality(String),
     "$device_id"                String,
     "$os"                       LowCardinality(String) DEFAULT '',
+    "$os_version"               LowCardinality(String) DEFAULT '',
     "$browser"                  LowCardinality(String) DEFAULT '',
     "$browser_version"          String DEFAULT '',
-    "$device"                   String DEFAULT '' COMMENT 'web/mobile',
+    "$device"                   LowCardinality(String) DEFAULT '' COMMENT 'in session, it is platform; web/mobile',
     "$screen_height"            UInt16 DEFAULT 0,
     "$screen_width"             UInt16 DEFAULT 0,
     "$current_url"              String DEFAULT '',
diff --git a/scripts/schema/db/init_dbs/clickhouse/create/init_schema.sql b/scripts/schema/db/init_dbs/clickhouse/create/init_schema.sql
index 400321741..bf769ed91 100644
--- a/scripts/schema/db/init_dbs/clickhouse/create/init_schema.sql
+++ b/scripts/schema/db/init_dbs/clickhouse/create/init_schema.sql
@@ -251,6 +251,7 @@ CREATE TABLE IF NOT EXISTS product_analytics.devices
     "$screen_height"   UInt16                 DEFAULT 0,
     "$screen_width"    UInt16                 DEFAULT 0,
     "$os"              LowCardinality(String) DEFAULT '',
+    "$os_version"      LowCardinality(String) DEFAULT '',
     "$browser"         LowCardinality(String) DEFAULT '',
     "$browser_version" String                 DEFAULT '',
 
@@ -314,9 +315,10 @@ CREATE TABLE IF NOT EXISTS product_analytics.events
     "$sdk_version"              LowCardinality(String),
     "$device_id"                String,
     "$os"                       LowCardinality(String) DEFAULT '',
+    "$os_version"               LowCardinality(String) DEFAULT '',
     "$browser"                  LowCardinality(String) DEFAULT '',
     "$browser_version"          String DEFAULT '',
-    "$device"                   String DEFAULT '' COMMENT 'web/mobile',
+    "$device"                   LowCardinality(String) DEFAULT '' COMMENT 'in session, it is platform; web/mobile',
     "$screen_height"            UInt16 DEFAULT 0,
     "$screen_width"             UInt16 DEFAULT 0,
     "$current_url"              String DEFAULT '',