diff --git a/api/chalicelib/core/signup.py b/api/chalicelib/core/signup.py
index b4f02f0b8..ab23eef68 100644
--- a/api/chalicelib/core/signup.py
+++ b/api/chalicelib/core/signup.py
@@ -63,13 +63,12 @@ def create_step1(data: schemas.UserSignupSchema):
         "fullname": fullname,
         "projectName": project_name,
         "data": json.dumps({"lastAnnouncementView": TimeUTC.now()}),
-        "organizationName": company_name,
-        "versionNumber": config("version_number")
+        "organizationName": company_name
     }
     query = f"""\
                 WITH t AS (
                     INSERT INTO public.tenants (name, version_number, edition)
-                        VALUES (%(organizationName)s, %(versionNumber)s, 'fos')
+                        VALUES (%(organizationName)s, (SELECT openreplay_version()), 'fos')
                     RETURNING api_key
                 ),
                  u AS (
diff --git a/ee/api/chalicelib/core/signup.py b/ee/api/chalicelib/core/signup.py
index aa4ba2af9..4014f5e92 100644
--- a/ee/api/chalicelib/core/signup.py
+++ b/ee/api/chalicelib/core/signup.py
@@ -1,7 +1,5 @@
 import json
 
-from decouple import config
-
 import schemas
 from chalicelib.core import users, telemetry, tenants
 from chalicelib.utils import captcha
@@ -63,12 +61,11 @@ def create_step1(data: schemas.UserSignupSchema):
     params = {"email": email, "password": password,
               "fullname": fullname, "companyName": company_name,
               "projectName": project_name,
-              "versionNumber": config("version_number"),
               "data": json.dumps({"lastAnnouncementView": TimeUTC.now()})}
     query = """\
             WITH t AS (
                 INSERT INTO public.tenants (name, version_number, edition)
-                    VALUES (%(companyName)s, %(versionNumber)s, 'ee')
+                    VALUES (%(companyName)s, (SELECT openreplay_version()), 'ee')
                     RETURNING tenant_id, api_key
             ),
                  r AS (
diff --git a/ee/scripts/helm/db/init_dbs/postgresql/1.5.3/1.5.3.sql b/ee/scripts/helm/db/init_dbs/postgresql/1.5.3/1.5.3.sql
index 399a2199f..1e08dfeae 100644
--- a/ee/scripts/helm/db/init_dbs/postgresql/1.5.3/1.5.3.sql
+++ b/ee/scripts/helm/db/init_dbs/postgresql/1.5.3/1.5.3.sql
@@ -80,11 +80,8 @@ ALTER TABLE events_common.requests
     ADD COLUMN IF NOT EXISTS status_code   smallint    NULL,
     ADD COLUMN IF NOT EXISTS method        http_method NULL;
 
-ALTER TABLE events_common.requests
-    ADD COLUMN IF NOT EXISTS schema       text NULL,
-    ADD COLUMN IF NOT EXISTS host         text NULL,
-    ADD COLUMN IF NOT EXISTS base_path    text NULL,
-    ADD COLUMN IF NOT EXISTS query_string text NULL;
+UPDATE tenants
+SET version_number= openreplay_version();
 
 COMMIT;
 
@@ -101,42 +98,3 @@ CREATE INDEX CONCURRENTLY IF NOT EXISTS graphql_response_body_nn_gin_idx ON even
 CREATE INDEX CONCURRENTLY IF NOT EXISTS graphql_status_code_nn_idx ON events.graphql (status_code) WHERE status_code IS NOT NULL;
 CREATE INDEX CONCURRENTLY IF NOT EXISTS graphql_duration_nn_gt0_idx ON events.graphql (duration) WHERE duration IS NOT NULL AND duration > 0;
 
-CREATE INDEX CONCURRENTLY IF NOT EXISTS requests_host_nn_idx ON events_common.requests (host) WHERE host IS NOT NULL;
-CREATE INDEX CONCURRENTLY IF NOT EXISTS requests_host_nn_gin_idx ON events_common.requests USING GIN (host gin_trgm_ops) WHERE host IS NOT NULL;
-CREATE INDEX CONCURRENTLY IF NOT EXISTS requests_base_path_nn_idx ON events_common.requests (base_path) WHERE base_path IS NOT NULL;
-CREATE INDEX CONCURRENTLY IF NOT EXISTS requests_base_path_nn_gin_idx ON events_common.requests USING GIN (base_path gin_trgm_ops) WHERE base_path IS NOT NULL;
-CREATE INDEX CONCURRENTLY IF NOT EXISTS requests_query_string_nn_idx ON events_common.requests (query_string) WHERE query_string IS NOT NULL;
-CREATE INDEX CONCURRENTLY IF NOT EXISTS requests_query_string_nn_gin_idx ON events_common.requests USING GIN (query_string gin_trgm_ops) WHERE query_string IS NOT NULL;
-
-
-
--- Split requests-URL: Takes too long to use
--- UPDATE events_common.requests
--- SET schema=CASE WHEN POSITION('://' IN url) > 0 THEN SUBSTRING(url, 1, POSITION('://' IN url) - 1) END,
---     host=CASE
---              WHEN POSITION('://' IN url) = 0 THEN NULL
---              WHEN POSITION('/' IN SUBSTRING(SUBSTRING(url, POSITION('://' IN url) + 3), 1)) > 0 THEN SUBSTRING(
---                      SUBSTRING(SUBSTRING(url, POSITION('://' IN url) + 3), 1), 1,
---                      POSITION('/' IN SUBSTRING(SUBSTRING(url, POSITION('://' IN url) + 3), 1)) - 1)
---              ELSE SUBSTRING(SUBSTRING(url, POSITION('://' IN url) + 3), 1) END,
---     base_path=CASE
---                   WHEN POSITION('://' IN url) = 0 THEN
---                       CASE
---                           WHEN POSITION('?' IN url) > 0 THEN
---                               SUBSTRING(url, 1, POSITION('?' IN url) - 1)
---                           ELSE url END
---                   WHEN POSITION('/' IN SUBSTRING(SUBSTRING(url, POSITION('://' IN url) + 3), 1)) > 0 THEN
---                       CASE
---                           WHEN POSITION('?' IN SUBSTRING(SUBSTRING(url, POSITION('://' IN url) + 3), 1)) > 0 THEN
---                               SUBSTRING(SUBSTRING(SUBSTRING(url, POSITION('://' IN url) + 3), 1),
---                                         POSITION('/' IN SUBSTRING(SUBSTRING(url, POSITION('://' IN url) + 3), 1)) + 1,
---                                         POSITION('?' IN SUBSTRING(SUBSTRING(url, POSITION('://' IN url) + 3), 1)) -
---                                         POSITION('/' IN SUBSTRING(SUBSTRING(url, POSITION('://' IN url) + 3), 1)) - 1)
---                           ELSE SUBSTRING(SUBSTRING(SUBSTRING(url, POSITION('://' IN url) + 3), 1),
---                                          POSITION('/' IN SUBSTRING(SUBSTRING(url, POSITION('://' IN url) + 3), 1)) +
---                                          1) END
---         END,
---     query_string=CASE
---                      WHEN POSITION('?' IN url) > 0 THEN SUBSTRING(url, POSITION('?' IN url) + 1)
---         END;
-
diff --git a/ee/scripts/helm/db/init_dbs/postgresql/init_schema.sql b/ee/scripts/helm/db/init_dbs/postgresql/init_schema.sql
index 6a81a107d..ae724f60b 100644
--- a/ee/scripts/helm/db/init_dbs/postgresql/init_schema.sql
+++ b/ee/scripts/helm/db/init_dbs/postgresql/init_schema.sql
@@ -1174,10 +1174,6 @@ $$
                 response_body text        NULL,
                 status_code   smallint    NULL,
                 method        http_method NULL,
-                schema        text        NULL,
-                host          text        NULL,
-                base_path     text        NULL,
-                query_string  text        NULL,
                 PRIMARY KEY (session_id, timestamp, seq_index)
             );
             CREATE INDEX IF NOT EXISTS requests_url_idx ON events_common.requests (url);
@@ -1200,13 +1196,6 @@ $$
             CREATE INDEX IF NOT EXISTS requests_response_body_nn_gin_idx ON events_common.requests USING GIN (response_body gin_trgm_ops) WHERE response_body IS NOT NULL;
             CREATE INDEX IF NOT EXISTS requests_status_code_nn_idx ON events_common.requests (status_code) WHERE status_code IS NOT NULL;
 
-            CREATE INDEX IF NOT EXISTS requests_host_nn_idx ON events_common.requests (host) WHERE host IS NOT NULL;
-            CREATE INDEX IF NOT EXISTS requests_host_nn_gin_idx ON events_common.requests USING GIN (host gin_trgm_ops) WHERE host IS NOT NULL;
-            CREATE INDEX IF NOT EXISTS requests_base_path_nn_idx ON events_common.requests (base_path) WHERE base_path IS NOT NULL;
-            CREATE INDEX IF NOT EXISTS requests_base_path_nn_gin_idx ON events_common.requests USING GIN (base_path gin_trgm_ops) WHERE base_path IS NOT NULL;
-            CREATE INDEX IF NOT EXISTS requests_query_string_nn_idx ON events_common.requests (query_string) WHERE query_string IS NOT NULL;
-            CREATE INDEX IF NOT EXISTS requests_query_string_nn_gin_idx ON events_common.requests USING GIN (query_string gin_trgm_ops) WHERE query_string IS NOT NULL;
-
 
         END IF;
     END;
diff --git a/scripts/helm/db/init_dbs/postgresql/1.5.3/1.5.3.sql b/scripts/helm/db/init_dbs/postgresql/1.5.3/1.5.3.sql
index 0e25a7396..1030ba55d 100644
--- a/scripts/helm/db/init_dbs/postgresql/1.5.3/1.5.3.sql
+++ b/scripts/helm/db/init_dbs/postgresql/1.5.3/1.5.3.sql
@@ -78,11 +78,8 @@ ALTER TABLE events_common.requests
     ADD COLUMN IF NOT EXISTS status_code   smallint    NULL,
     ADD COLUMN IF NOT EXISTS method        http_method NULL;
 
-ALTER TABLE events_common.requests
-    ADD COLUMN IF NOT EXISTS schema       text NULL,
-    ADD COLUMN IF NOT EXISTS host         text NULL,
-    ADD COLUMN IF NOT EXISTS base_path    text NULL,
-    ADD COLUMN IF NOT EXISTS query_string text NULL;
+UPDATE tenants
+SET version_number= openreplay_version();
 
 COMMIT;
 
@@ -98,43 +95,3 @@ CREATE INDEX CONCURRENTLY IF NOT EXISTS graphql_response_body_nn_idx ON events.g
 CREATE INDEX CONCURRENTLY IF NOT EXISTS graphql_response_body_nn_gin_idx ON events.graphql USING GIN (response_body gin_trgm_ops) WHERE response_body IS NOT NULL;
 CREATE INDEX CONCURRENTLY IF NOT EXISTS graphql_status_code_nn_idx ON events.graphql (status_code) WHERE status_code IS NOT NULL;
 CREATE INDEX CONCURRENTLY IF NOT EXISTS graphql_duration_nn_gt0_idx ON events.graphql (duration) WHERE duration IS NOT NULL AND duration > 0;
-
-CREATE INDEX CONCURRENTLY IF NOT EXISTS requests_host_nn_idx ON events_common.requests (host) WHERE host IS NOT NULL;
-CREATE INDEX CONCURRENTLY IF NOT EXISTS requests_host_nn_gin_idx ON events_common.requests USING GIN (host gin_trgm_ops) WHERE host IS NOT NULL;
-CREATE INDEX CONCURRENTLY IF NOT EXISTS requests_base_path_nn_idx ON events_common.requests (base_path) WHERE base_path IS NOT NULL;
-CREATE INDEX CONCURRENTLY IF NOT EXISTS requests_base_path_nn_gin_idx ON events_common.requests USING GIN (base_path gin_trgm_ops) WHERE base_path IS NOT NULL;
-CREATE INDEX CONCURRENTLY IF NOT EXISTS requests_query_string_nn_idx ON events_common.requests (query_string) WHERE query_string IS NOT NULL;
-CREATE INDEX CONCURRENTLY IF NOT EXISTS requests_query_string_nn_gin_idx ON events_common.requests USING GIN (query_string gin_trgm_ops) WHERE query_string IS NOT NULL;
-
-
-
--- Split requests-URL: Takes too long to use
--- UPDATE events_common.requests
--- SET schema=CASE WHEN POSITION('://' IN url) > 0 THEN SUBSTRING(url, 1, POSITION('://' IN url) - 1) END,
---     host=CASE
---              WHEN POSITION('://' IN url) = 0 THEN NULL
---              WHEN POSITION('/' IN SUBSTRING(SUBSTRING(url, POSITION('://' IN url) + 3), 1)) > 0 THEN SUBSTRING(
---                      SUBSTRING(SUBSTRING(url, POSITION('://' IN url) + 3), 1), 1,
---                      POSITION('/' IN SUBSTRING(SUBSTRING(url, POSITION('://' IN url) + 3), 1)) - 1)
---              ELSE SUBSTRING(SUBSTRING(url, POSITION('://' IN url) + 3), 1) END,
---     base_path=CASE
---                   WHEN POSITION('://' IN url) = 0 THEN
---                       CASE
---                           WHEN POSITION('?' IN url) > 0 THEN
---                               SUBSTRING(url, 1, POSITION('?' IN url) - 1)
---                           ELSE url END
---                   WHEN POSITION('/' IN SUBSTRING(SUBSTRING(url, POSITION('://' IN url) + 3), 1)) > 0 THEN
---                       CASE
---                           WHEN POSITION('?' IN SUBSTRING(SUBSTRING(url, POSITION('://' IN url) + 3), 1)) > 0 THEN
---                               SUBSTRING(SUBSTRING(SUBSTRING(url, POSITION('://' IN url) + 3), 1),
---                                         POSITION('/' IN SUBSTRING(SUBSTRING(url, POSITION('://' IN url) + 3), 1)) + 1,
---                                         POSITION('?' IN SUBSTRING(SUBSTRING(url, POSITION('://' IN url) + 3), 1)) -
---                                         POSITION('/' IN SUBSTRING(SUBSTRING(url, POSITION('://' IN url) + 3), 1)) - 1)
---                           ELSE SUBSTRING(SUBSTRING(SUBSTRING(url, POSITION('://' IN url) + 3), 1),
---                                          POSITION('/' IN SUBSTRING(SUBSTRING(url, POSITION('://' IN url) + 3), 1)) +
---                                          1) END
---         END,
---     query_string=CASE
---                      WHEN POSITION('?' IN url) > 0 THEN SUBSTRING(url, POSITION('?' IN url) + 1)
---         END;
-
diff --git a/scripts/helm/db/init_dbs/postgresql/init_schema.sql b/scripts/helm/db/init_dbs/postgresql/init_schema.sql
index fb2e7bb63..c7d1f2110 100644
--- a/scripts/helm/db/init_dbs/postgresql/init_schema.sql
+++ b/scripts/helm/db/init_dbs/postgresql/init_schema.sql
@@ -644,10 +644,6 @@ $$
                 response_body text        NULL,
                 status_code   smallint    NULL,
                 method        http_method NULL,
-                schema        text        NULL,
-                host          text        NULL,
-                base_path     text        NULL,
-                query_string  text        NULL,
                 PRIMARY KEY (session_id, timestamp, seq_index)
             );
             CREATE INDEX requests_url_idx ON events_common.requests (url);
@@ -667,12 +663,6 @@ $$
             CREATE INDEX requests_response_body_nn_idx ON events_common.requests (response_body) WHERE response_body IS NOT NULL;
             CREATE INDEX requests_response_body_nn_gin_idx ON events_common.requests USING GIN (response_body gin_trgm_ops) WHERE response_body IS NOT NULL;
             CREATE INDEX requests_status_code_nn_idx ON events_common.requests (status_code) WHERE status_code IS NOT NULL;
-            CREATE INDEX requests_host_nn_idx ON events_common.requests (host) WHERE host IS NOT NULL;
-            CREATE INDEX requests_host_nn_gin_idx ON events_common.requests USING GIN (host gin_trgm_ops) WHERE host IS NOT NULL;
-            CREATE INDEX requests_base_path_nn_idx ON events_common.requests (base_path) WHERE base_path IS NOT NULL;
-            CREATE INDEX requests_base_path_nn_gin_idx ON events_common.requests USING GIN (base_path gin_trgm_ops) WHERE base_path IS NOT NULL;
-            CREATE INDEX requests_query_string_nn_idx ON events_common.requests (query_string) WHERE query_string IS NOT NULL;
-            CREATE INDEX requests_query_string_nn_gin_idx ON events_common.requests USING GIN (query_string gin_trgm_ops) WHERE query_string IS NOT NULL;
 
 -- --- events.sql ---
             CREATE SCHEMA IF NOT EXISTS events;