diff --git a/ee/scripts/helm/db/init_dbs/clickhouse/1.6.1/1.6.1.sql b/ee/scripts/helm/db/init_dbs/clickhouse/1.6.1/1.6.1.sql
index 412f3ae2a..a8f90613d 100644
--- a/ee/scripts/helm/db/init_dbs/clickhouse/1.6.1/1.6.1.sql
+++ b/ee/scripts/helm/db/init_dbs/clickhouse/1.6.1/1.6.1.sql
@@ -1 +1,71 @@
-ALTER TABLE sessions DROP COLUMN pages_count;
\ No newline at end of file
+ALTER TABLE sessions
+    DROP COLUMN pages_count;
+
+CREATE TABLE default.sessions_metadata_temp
+(
+    session_id      UInt64,
+    project_id      UInt32,
+    tracker_version String,
+    rev_id Nullable(String),
+    user_uuid       UUID,
+    user_os         String,
+    user_os_version Nullable(String),
+    user_browser    String,
+    user_browser_version Nullable(String),
+    user_device Nullable(String),
+    user_device_type Enum8('other'=0, 'desktop'=1, 'mobile'=2),
+    user_country Enum8('UN'=-128, 'RW'=-127, 'SO'=-126, 'YE'=-125, 'IQ'=-124, 'SA'=-123, 'IR'=-122, 'CY'=-121, 'TZ'=-120, 'SY'=-119, 'AM'=-118, 'KE'=-117, 'CD'=-116, 'DJ'=-115, 'UG'=-114, 'CF'=-113, 'SC'=-112, 'JO'=-111, 'LB'=-110, 'KW'=-109, 'OM'=-108, 'QA'=-107, 'BH'=-106, 'AE'=-105, 'IL'=-104, 'TR'=-103, 'ET'=-102, 'ER'=-101, 'EG'=-100, 'SD'=-99, 'GR'=-98, 'BI'=-97, 'EE'=-96, 'LV'=-95, 'AZ'=-94, 'LT'=-93, 'SJ'=-92, 'GE'=-91, 'MD'=-90, 'BY'=-89, 'FI'=-88, 'AX'=-87, 'UA'=-86, 'MK'=-85, 'HU'=-84, 'BG'=-83, 'AL'=-82, 'PL'=-81, 'RO'=-80, 'XK'=-79, 'ZW'=-78, 'ZM'=-77, 'KM'=-76, 'MW'=-75, 'LS'=-74, 'BW'=-73, 'MU'=-72, 'SZ'=-71, 'RE'=-70, 'ZA'=-69, 'YT'=-68, 'MZ'=-67, 'MG'=-66, 'AF'=-65, 'PK'=-64, 'BD'=-63, 'TM'=-62, 'TJ'=-61, 'LK'=-60, 'BT'=-59, 'IN'=-58, 'MV'=-57, 'IO'=-56, 'NP'=-55, 'MM'=-54, 'UZ'=-53, 'KZ'=-52, 'KG'=-51, 'TF'=-50, 'HM'=-49, 'CC'=-48, 'PW'=-47, 'VN'=-46, 'TH'=-45, 'ID'=-44, 'LA'=-43, 'TW'=-42, 'PH'=-41, 'MY'=-40, 'CN'=-39, 'HK'=-38, 'BN'=-37, 'MO'=-36, 'KH'=-35, 'KR'=-34, 'JP'=-33, 'KP'=-32, 'SG'=-31, 'CK'=-30, 'TL'=-29, 'RU'=-28, 'MN'=-27, 'AU'=-26, 'CX'=-25, 'MH'=-24, 'FM'=-23, 'PG'=-22, 'SB'=-21, 'TV'=-20, 'NR'=-19, 'VU'=-18, 'NC'=-17, 'NF'=-16, 'NZ'=-15, 'FJ'=-14, 'LY'=-13, 'CM'=-12, 'SN'=-11, 'CG'=-10, 'PT'=-9, 'LR'=-8, 'CI'=-7, 'GH'=-6, 'GQ'=-5, 'NG'=-4, 'BF'=-3, 'TG'=-2, 'GW'=-1, 'MR'=0, 'BJ'=1, 'GA'=2, 'SL'=3, 'ST'=4, 'GI'=5, 'GM'=6, 'GN'=7, 'TD'=8, 'NE'=9, 'ML'=10, 'EH'=11, 'TN'=12, 'ES'=13, 'MA'=14, 'MT'=15, 'DZ'=16, 'FO'=17, 'DK'=18, 'IS'=19, 'GB'=20, 'CH'=21, 'SE'=22, 'NL'=23, 'AT'=24, 'BE'=25, 'DE'=26, 'LU'=27, 'IE'=28, 'MC'=29, 'FR'=30, 'AD'=31, 'LI'=32, 'JE'=33, 'IM'=34, 'GG'=35, 'SK'=36, 'CZ'=37, 'NO'=38, 'VA'=39, 'SM'=40, 'IT'=41, 'SI'=42, 'ME'=43, 'HR'=44, 'BA'=45, 'AO'=46, 'NA'=47, 'SH'=48, 'BV'=49, 'BB'=50, 'CV'=51, 'GY'=52, 'GF'=53, 'SR'=54, 'PM'=55, 'GL'=56, 'PY'=57, 'UY'=58, 'BR'=59, 'FK'=60, 'GS'=61, 'JM'=62, 'DO'=63, 'CU'=64, 'MQ'=65, 'BS'=66, 'BM'=67, 'AI'=68, 'TT'=69, 'KN'=70, 'DM'=71, 'AG'=72, 'LC'=73, 'TC'=74, 'AW'=75, 'VG'=76, 'VC'=77, 'MS'=78, 'MF'=79, 'BL'=80, 'GP'=81, 'GD'=82, 'KY'=83, 'BZ'=84, 'SV'=85, 'GT'=86, 'HN'=87, 'NI'=88, 'CR'=89, 'VE'=90, 'EC'=91, 'CO'=92, 'PA'=93, 'HT'=94, 'AR'=95, 'CL'=96, 'BO'=97, 'PE'=98, 'MX'=99, 'PF'=100, 'PN'=101, 'KI'=102, 'TK'=103, 'TO'=104, 'WF'=105, 'WS'=106, 'NU'=107, 'MP'=108, 'GU'=109, 'PR'=110, 'VI'=111, 'UM'=112, 'AS'=113, 'CA'=114, 'US'=115, 'PS'=116, 'RS'=117, 'AQ'=118, 'SX'=119, 'CW'=120, 'BQ'=121, 'SS'=122),
+    datetime        DateTime,
+    user_id Nullable(String),
+    user_anonymous_id Nullable(String),
+    metadata_1 Nullable(String),
+    metadata_2 Nullable(String),
+    metadata_3 Nullable(String),
+    metadata_4 Nullable(String),
+    metadata_5 Nullable(String),
+    metadata_6 Nullable(String),
+    metadata_7 Nullable(String),
+    metadata_8 Nullable(String),
+    metadata_9 Nullable(String),
+    metadata_10 Nullable(String)
+) ENGINE = MergeTree
+      PARTITION BY toDate(datetime)
+      ORDER BY (project_id, datetime)
+      TTL datetime + INTERVAL 1 MONTH;
+
+INSERT INTO default.sessions_metadata_temp(session_id, project_id, tracker_version, rev_id, user_uuid, user_os,
+                                           user_os_version,
+                                           user_browser, user_browser_version, user_device, user_device_type,
+                                           user_country,
+                                           datetime, user_id, user_anonymous_id, metadata_1, metadata_2, metadata_3,
+                                           metadata_4,
+                                           metadata_5, metadata_6, metadata_7, metadata_8, metadata_9, metadata_10)
+SELECT session_id,
+       project_id,
+       tracker_version,
+       rev_id,
+       user_uuid,
+       user_os,
+       user_os_version,
+       user_browser,
+       user_browser_version,
+       user_device,
+       user_device_type,
+       user_country,
+       datetime,
+       user_id,
+       user_anonymous_id,
+       metadata_1,
+       metadata_2,
+       metadata_3,
+       metadata_4,
+       metadata_5,
+       metadata_6,
+       metadata_7,
+       metadata_8,
+       metadata_9,
+       metadata_10
+FROM default.sessions_metadata;
+
+DROP TABLE default.sessions_metadata;
+RENAME TABLE default.sessions_metadata_temp TO default.sessions_metadata;
\ No newline at end of file
diff --git a/ee/scripts/helm/db/init_dbs/clickhouse/create/sessions_metadata.sql b/ee/scripts/helm/db/init_dbs/clickhouse/create/sessions_metadata.sql
index ddf8aed01..f6b77930e 100644
--- a/ee/scripts/helm/db/init_dbs/clickhouse/create/sessions_metadata.sql
+++ b/ee/scripts/helm/db/init_dbs/clickhouse/create/sessions_metadata.sql
@@ -27,5 +27,5 @@ CREATE TABLE IF NOT EXISTS sessions_metadata
     metadata_10          Nullable(String)
 ) ENGINE = MergeTree
       PARTITION BY toDate(datetime)
-      ORDER BY (session_id)
+      ORDER BY (project_id, datetime)
       TTL datetime + INTERVAL 1 MONTH;
\ No newline at end of file