diff --git a/src/main/java/com/epam/ta/reportportal/dao/ProjectRepositoryCustomImpl.java b/src/main/java/com/epam/ta/reportportal/dao/ProjectRepositoryCustomImpl.java
index 06c026eea..753ebe143 100644
--- a/src/main/java/com/epam/ta/reportportal/dao/ProjectRepositoryCustomImpl.java
+++ b/src/main/java/com/epam/ta/reportportal/dao/ProjectRepositoryCustomImpl.java
@@ -32,7 +32,6 @@
 import com.epam.ta.reportportal.commons.querygen.Queryable;
 import com.epam.ta.reportportal.entity.project.Project;
 import com.epam.ta.reportportal.entity.project.ProjectInfo;
-import java.time.Instant;
 import java.util.List;
 import java.util.Optional;
 import org.jooq.DSLContext;
@@ -132,19 +131,4 @@ public Page<Project> findAllIdsAndProjectAttributes(Pageable pageable) {
     );
   }
 
-  @Override
-  public int deleteByTypeAndLastLaunchRunBefore(ProjectType projectType, Instant bound,
-      int limit) {
-    return dsl.deleteFrom(PROJECT)
-        .where(PROJECT.ID.in(dsl.select(PROJECT.ID)
-            .from(PROJECT)
-            .join(LAUNCH)
-            .onKey()
-            .where(PROJECT.PROJECT_TYPE.eq(projectType.name()))
-            .groupBy(PROJECT.ID)
-            .having(DSL.max(LAUNCH.START_TIME).le(bound))
-            .limit(limit)))
-        .execute();
-  }
-
 }
diff --git a/src/main/java/com/epam/ta/reportportal/jooq/JPublic.java b/src/main/java/com/epam/ta/reportportal/jooq/JPublic.java
index 7b4cdffde..6ae220456 100644
--- a/src/main/java/com/epam/ta/reportportal/jooq/JPublic.java
+++ b/src/main/java/com/epam/ta/reportportal/jooq/JPublic.java
@@ -90,7 +90,7 @@
 @SuppressWarnings({ "all", "unchecked", "rawtypes" })
 public class JPublic extends SchemaImpl {
 
-    private static final long serialVersionUID = 1294370065;
+    private static final long serialVersionUID = 1942212796;
 
     /**
      * The reference instance of <code>public</code>
diff --git a/src/main/java/com/epam/ta/reportportal/jooq/tables/JActivity.java b/src/main/java/com/epam/ta/reportportal/jooq/tables/JActivity.java
index 89480579d..e5f4a4a66 100644
--- a/src/main/java/com/epam/ta/reportportal/jooq/tables/JActivity.java
+++ b/src/main/java/com/epam/ta/reportportal/jooq/tables/JActivity.java
@@ -45,7 +45,7 @@
 @SuppressWarnings({ "all", "unchecked", "rawtypes" })
 public class JActivity extends TableImpl<JActivityRecord> {
 
-    private static final long serialVersionUID = 1836644654;
+    private static final long serialVersionUID = 946186659;
 
     /**
      * The reference instance of <code>public.activity</code>
diff --git a/src/main/java/com/epam/ta/reportportal/jooq/tables/JAnalyticsData.java b/src/main/java/com/epam/ta/reportportal/jooq/tables/JAnalyticsData.java
index 60df1ebc3..6c2059f32 100644
--- a/src/main/java/com/epam/ta/reportportal/jooq/tables/JAnalyticsData.java
+++ b/src/main/java/com/epam/ta/reportportal/jooq/tables/JAnalyticsData.java
@@ -45,7 +45,7 @@
 @SuppressWarnings({ "all", "unchecked", "rawtypes" })
 public class JAnalyticsData extends TableImpl<JAnalyticsDataRecord> {
 
-    private static final long serialVersionUID = -1928480576;
+    private static final long serialVersionUID = 282420139;
 
     /**
      * The reference instance of <code>public.analytics_data</code>
diff --git a/src/main/java/com/epam/ta/reportportal/jooq/tables/JApiKeys.java b/src/main/java/com/epam/ta/reportportal/jooq/tables/JApiKeys.java
index c6fb7a1a0..789c12c0d 100644
--- a/src/main/java/com/epam/ta/reportportal/jooq/tables/JApiKeys.java
+++ b/src/main/java/com/epam/ta/reportportal/jooq/tables/JApiKeys.java
@@ -45,7 +45,7 @@
 @SuppressWarnings({ "all", "unchecked", "rawtypes" })
 public class JApiKeys extends TableImpl<JApiKeysRecord> {
 
-    private static final long serialVersionUID = -1384819830;
+    private static final long serialVersionUID = -859604491;
 
     /**
      * The reference instance of <code>public.api_keys</code>
diff --git a/src/main/java/com/epam/ta/reportportal/jooq/tables/JAttachment.java b/src/main/java/com/epam/ta/reportportal/jooq/tables/JAttachment.java
index 883e68fd6..42540b733 100644
--- a/src/main/java/com/epam/ta/reportportal/jooq/tables/JAttachment.java
+++ b/src/main/java/com/epam/ta/reportportal/jooq/tables/JAttachment.java
@@ -44,7 +44,7 @@
 @SuppressWarnings({ "all", "unchecked", "rawtypes" })
 public class JAttachment extends TableImpl<JAttachmentRecord> {
 
-    private static final long serialVersionUID = -2060499086;
+    private static final long serialVersionUID = 116419815;
 
     /**
      * The reference instance of <code>public.attachment</code>
diff --git a/src/main/java/com/epam/ta/reportportal/jooq/tables/JAttachmentDeletion.java b/src/main/java/com/epam/ta/reportportal/jooq/tables/JAttachmentDeletion.java
index c74b309ba..c18e2e6fa 100644
--- a/src/main/java/com/epam/ta/reportportal/jooq/tables/JAttachmentDeletion.java
+++ b/src/main/java/com/epam/ta/reportportal/jooq/tables/JAttachmentDeletion.java
@@ -43,7 +43,7 @@
 @SuppressWarnings({ "all", "unchecked", "rawtypes" })
 public class JAttachmentDeletion extends TableImpl<JAttachmentDeletionRecord> {
 
-    private static final long serialVersionUID = 466997915;
+    private static final long serialVersionUID = 2100753798;
 
     /**
      * The reference instance of <code>public.attachment_deletion</code>
diff --git a/src/main/java/com/epam/ta/reportportal/jooq/tables/JDashboard.java b/src/main/java/com/epam/ta/reportportal/jooq/tables/JDashboard.java
index c348f7199..c68a40768 100644
--- a/src/main/java/com/epam/ta/reportportal/jooq/tables/JDashboard.java
+++ b/src/main/java/com/epam/ta/reportportal/jooq/tables/JDashboard.java
@@ -43,7 +43,7 @@
 @SuppressWarnings({ "all", "unchecked", "rawtypes" })
 public class JDashboard extends TableImpl<JDashboardRecord> {
 
-    private static final long serialVersionUID = 1541902098;
+    private static final long serialVersionUID = 396879431;
 
     /**
      * The reference instance of <code>public.dashboard</code>
diff --git a/src/main/java/com/epam/ta/reportportal/jooq/tables/JIntegration.java b/src/main/java/com/epam/ta/reportportal/jooq/tables/JIntegration.java
index f50105bfd..230965e8f 100644
--- a/src/main/java/com/epam/ta/reportportal/jooq/tables/JIntegration.java
+++ b/src/main/java/com/epam/ta/reportportal/jooq/tables/JIntegration.java
@@ -45,7 +45,7 @@
 @SuppressWarnings({ "all", "unchecked", "rawtypes" })
 public class JIntegration extends TableImpl<JIntegrationRecord> {
 
-    private static final long serialVersionUID = 514650851;
+    private static final long serialVersionUID = -1251108530;
 
     /**
      * The reference instance of <code>public.integration</code>
diff --git a/src/main/java/com/epam/ta/reportportal/jooq/tables/JIntegrationType.java b/src/main/java/com/epam/ta/reportportal/jooq/tables/JIntegrationType.java
index 44fe30fd2..a97f51060 100644
--- a/src/main/java/com/epam/ta/reportportal/jooq/tables/JIntegrationType.java
+++ b/src/main/java/com/epam/ta/reportportal/jooq/tables/JIntegrationType.java
@@ -47,7 +47,7 @@
 @SuppressWarnings({ "all", "unchecked", "rawtypes" })
 public class JIntegrationType extends TableImpl<JIntegrationTypeRecord> {
 
-    private static final long serialVersionUID = 1851238148;
+    private static final long serialVersionUID = 884680057;
 
     /**
      * The reference instance of <code>public.integration_type</code>
diff --git a/src/main/java/com/epam/ta/reportportal/jooq/tables/JLaunch.java b/src/main/java/com/epam/ta/reportportal/jooq/tables/JLaunch.java
index 678437c06..bf0e3dd83 100644
--- a/src/main/java/com/epam/ta/reportportal/jooq/tables/JLaunch.java
+++ b/src/main/java/com/epam/ta/reportportal/jooq/tables/JLaunch.java
@@ -47,7 +47,7 @@
 @SuppressWarnings({ "all", "unchecked", "rawtypes" })
 public class JLaunch extends TableImpl<JLaunchRecord> {
 
-    private static final long serialVersionUID = 1239960135;
+    private static final long serialVersionUID = -860672068;
 
     /**
      * The reference instance of <code>public.launch</code>
diff --git a/src/main/java/com/epam/ta/reportportal/jooq/tables/JLog.java b/src/main/java/com/epam/ta/reportportal/jooq/tables/JLog.java
index 0fc88d006..1609af1b3 100644
--- a/src/main/java/com/epam/ta/reportportal/jooq/tables/JLog.java
+++ b/src/main/java/com/epam/ta/reportportal/jooq/tables/JLog.java
@@ -44,7 +44,7 @@
 @SuppressWarnings({ "all", "unchecked", "rawtypes" })
 public class JLog extends TableImpl<JLogRecord> {
 
-    private static final long serialVersionUID = -540189389;
+    private static final long serialVersionUID = 2006866472;
 
     /**
      * The reference instance of <code>public.log</code>
diff --git a/src/main/java/com/epam/ta/reportportal/jooq/tables/JOrganization.java b/src/main/java/com/epam/ta/reportportal/jooq/tables/JOrganization.java
index 660c5a07f..3795c30e3 100644
--- a/src/main/java/com/epam/ta/reportportal/jooq/tables/JOrganization.java
+++ b/src/main/java/com/epam/ta/reportportal/jooq/tables/JOrganization.java
@@ -4,12 +4,13 @@
 package com.epam.ta.reportportal.jooq.tables;
 
 
+import com.epam.ta.reportportal.dao.converters.InstantConverter;
 import com.epam.ta.reportportal.jooq.Indexes;
 import com.epam.ta.reportportal.jooq.JPublic;
 import com.epam.ta.reportportal.jooq.Keys;
 import com.epam.ta.reportportal.jooq.tables.records.JOrganizationRecord;
 
-import java.sql.Timestamp;
+import java.time.Instant;
 import java.util.Arrays;
 import java.util.List;
 
@@ -43,7 +44,7 @@
 @SuppressWarnings({ "all", "unchecked", "rawtypes" })
 public class JOrganization extends TableImpl<JOrganizationRecord> {
 
-    private static final long serialVersionUID = 116167718;
+    private static final long serialVersionUID = -2027595115;
 
     /**
      * The reference instance of <code>public.organization</code>
@@ -66,7 +67,7 @@ public Class<JOrganizationRecord> getRecordType() {
     /**
      * The column <code>public.organization.created_at</code>.
      */
-    public final TableField<JOrganizationRecord, Timestamp> CREATED_AT = createField(DSL.name("created_at"), org.jooq.impl.SQLDataType.TIMESTAMP.nullable(false).defaultValue(org.jooq.impl.DSL.field("now()", org.jooq.impl.SQLDataType.TIMESTAMP)), this, "");
+    public final TableField<JOrganizationRecord, Instant> CREATED_AT = createField(DSL.name("created_at"), org.jooq.impl.SQLDataType.TIMESTAMP.nullable(false).defaultValue(org.jooq.impl.DSL.field("now()", org.jooq.impl.SQLDataType.TIMESTAMP)), this, "", new InstantConverter());
 
     /**
      * The column <code>public.organization.name</code>.
@@ -86,7 +87,7 @@ public Class<JOrganizationRecord> getRecordType() {
     /**
      * The column <code>public.organization.updated_at</code>.
      */
-    public final TableField<JOrganizationRecord, Timestamp> UPDATED_AT = createField(DSL.name("updated_at"), org.jooq.impl.SQLDataType.TIMESTAMP.nullable(false).defaultValue(org.jooq.impl.DSL.field("now()", org.jooq.impl.SQLDataType.TIMESTAMP)), this, "");
+    public final TableField<JOrganizationRecord, Instant> UPDATED_AT = createField(DSL.name("updated_at"), org.jooq.impl.SQLDataType.TIMESTAMP.nullable(false).defaultValue(org.jooq.impl.DSL.field("now()", org.jooq.impl.SQLDataType.TIMESTAMP)), this, "", new InstantConverter());
 
     /**
      * The column <code>public.organization.external_id</code>.
@@ -182,7 +183,7 @@ public JOrganization rename(Name name) {
     // -------------------------------------------------------------------------
 
     @Override
-    public Row7<Long, Timestamp, String, String, String, Timestamp, String> fieldsRow() {
+    public Row7<Long, Instant, String, String, String, Instant, String> fieldsRow() {
         return (Row7) super.fieldsRow();
     }
 }
diff --git a/src/main/java/com/epam/ta/reportportal/jooq/tables/JOrganizationUser.java b/src/main/java/com/epam/ta/reportportal/jooq/tables/JOrganizationUser.java
index 134348bab..81a862334 100644
--- a/src/main/java/com/epam/ta/reportportal/jooq/tables/JOrganizationUser.java
+++ b/src/main/java/com/epam/ta/reportportal/jooq/tables/JOrganizationUser.java
@@ -4,13 +4,14 @@
 package com.epam.ta.reportportal.jooq.tables;
 
 
+import com.epam.ta.reportportal.dao.converters.InstantConverter;
 import com.epam.ta.reportportal.jooq.Indexes;
 import com.epam.ta.reportportal.jooq.JPublic;
 import com.epam.ta.reportportal.jooq.Keys;
 import com.epam.ta.reportportal.jooq.enums.JOrganizationRoleEnum;
 import com.epam.ta.reportportal.jooq.tables.records.JOrganizationUserRecord;
 
-import java.sql.Timestamp;
+import java.time.Instant;
 import java.util.Arrays;
 import java.util.List;
 
@@ -43,7 +44,7 @@
 @SuppressWarnings({ "all", "unchecked", "rawtypes" })
 public class JOrganizationUser extends TableImpl<JOrganizationUserRecord> {
 
-    private static final long serialVersionUID = 363900676;
+    private static final long serialVersionUID = -1132022965;
 
     /**
      * The reference instance of <code>public.organization_user</code>
@@ -76,7 +77,7 @@ public Class<JOrganizationUserRecord> getRecordType() {
     /**
      * The column <code>public.organization_user.assigned_at</code>.
      */
-    public final TableField<JOrganizationUserRecord, Timestamp> ASSIGNED_AT = createField(DSL.name("assigned_at"), org.jooq.impl.SQLDataType.TIMESTAMP.nullable(false).defaultValue(org.jooq.impl.DSL.field("now()", org.jooq.impl.SQLDataType.TIMESTAMP)), this, "");
+    public final TableField<JOrganizationUserRecord, Instant> ASSIGNED_AT = createField(DSL.name("assigned_at"), org.jooq.impl.SQLDataType.TIMESTAMP.nullable(false).defaultValue(org.jooq.impl.DSL.field("now()", org.jooq.impl.SQLDataType.TIMESTAMP)), this, "", new InstantConverter());
 
     /**
      * Create a <code>public.organization_user</code> table reference
@@ -175,7 +176,7 @@ public JOrganizationUser rename(Name name) {
     // -------------------------------------------------------------------------
 
     @Override
-    public Row4<Long, Long, JOrganizationRoleEnum, Timestamp> fieldsRow() {
+    public Row4<Long, Long, JOrganizationRoleEnum, Instant> fieldsRow() {
         return (Row4) super.fieldsRow();
     }
 }
diff --git a/src/main/java/com/epam/ta/reportportal/jooq/tables/JProject.java b/src/main/java/com/epam/ta/reportportal/jooq/tables/JProject.java
index 816173aae..707d34416 100644
--- a/src/main/java/com/epam/ta/reportportal/jooq/tables/JProject.java
+++ b/src/main/java/com/epam/ta/reportportal/jooq/tables/JProject.java
@@ -4,12 +4,13 @@
 package com.epam.ta.reportportal.jooq.tables;
 
 
+import com.epam.ta.reportportal.dao.converters.InstantConverter;
 import com.epam.ta.reportportal.jooq.Indexes;
 import com.epam.ta.reportportal.jooq.JPublic;
 import com.epam.ta.reportportal.jooq.Keys;
 import com.epam.ta.reportportal.jooq.tables.records.JProjectRecord;
 
-import java.sql.Timestamp;
+import java.time.Instant;
 import java.util.Arrays;
 import java.util.List;
 
@@ -44,7 +45,7 @@
 @SuppressWarnings({ "all", "unchecked", "rawtypes" })
 public class JProject extends TableImpl<JProjectRecord> {
 
-    private static final long serialVersionUID = -1307600510;
+    private static final long serialVersionUID = 1618773229;
 
     /**
      * The reference instance of <code>public.project</code>
@@ -77,7 +78,7 @@ public Class<JProjectRecord> getRecordType() {
     /**
      * The column <code>public.project.created_at</code>.
      */
-    public final TableField<JProjectRecord, Timestamp> CREATED_AT = createField(DSL.name("created_at"), org.jooq.impl.SQLDataType.TIMESTAMP.nullable(false).defaultValue(org.jooq.impl.DSL.field("now()", org.jooq.impl.SQLDataType.TIMESTAMP)), this, "");
+    public final TableField<JProjectRecord, Instant> CREATED_AT = createField(DSL.name("created_at"), org.jooq.impl.SQLDataType.TIMESTAMP.nullable(false).defaultValue(org.jooq.impl.DSL.field("now()", org.jooq.impl.SQLDataType.TIMESTAMP)), this, "", new InstantConverter());
 
     /**
      * The column <code>public.project.metadata</code>.
@@ -107,7 +108,7 @@ public Class<JProjectRecord> getRecordType() {
     /**
      * The column <code>public.project.updated_at</code>.
      */
-    public final TableField<JProjectRecord, Timestamp> UPDATED_AT = createField(DSL.name("updated_at"), org.jooq.impl.SQLDataType.TIMESTAMP.nullable(false).defaultValue(org.jooq.impl.DSL.field("now()", org.jooq.impl.SQLDataType.TIMESTAMP)), this, "");
+    public final TableField<JProjectRecord, Instant> UPDATED_AT = createField(DSL.name("updated_at"), org.jooq.impl.SQLDataType.TIMESTAMP.nullable(false).defaultValue(org.jooq.impl.DSL.field("now()", org.jooq.impl.SQLDataType.TIMESTAMP)), this, "", new InstantConverter());
 
     /**
      * Create a <code>public.project</code> table reference
@@ -198,7 +199,7 @@ public JProject rename(Name name) {
     // -------------------------------------------------------------------------
 
     @Override
-    public Row10<Long, String, String, Timestamp, JSONB, Long, Long, String, String, Timestamp> fieldsRow() {
+    public Row10<Long, String, String, Instant, JSONB, Long, Long, String, String, Instant> fieldsRow() {
         return (Row10) super.fieldsRow();
     }
 }
diff --git a/src/main/java/com/epam/ta/reportportal/jooq/tables/JRestorePasswordBid.java b/src/main/java/com/epam/ta/reportportal/jooq/tables/JRestorePasswordBid.java
index 81f79e323..71928bfce 100644
--- a/src/main/java/com/epam/ta/reportportal/jooq/tables/JRestorePasswordBid.java
+++ b/src/main/java/com/epam/ta/reportportal/jooq/tables/JRestorePasswordBid.java
@@ -43,7 +43,7 @@
 @SuppressWarnings({ "all", "unchecked", "rawtypes" })
 public class JRestorePasswordBid extends TableImpl<JRestorePasswordBidRecord> {
 
-    private static final long serialVersionUID = 422602805;
+    private static final long serialVersionUID = -1448430102;
 
     /**
      * The reference instance of <code>public.restore_password_bid</code>
diff --git a/src/main/java/com/epam/ta/reportportal/jooq/tables/JShedlock.java b/src/main/java/com/epam/ta/reportportal/jooq/tables/JShedlock.java
index e0b6bd7ca..62dc844a1 100644
--- a/src/main/java/com/epam/ta/reportportal/jooq/tables/JShedlock.java
+++ b/src/main/java/com/epam/ta/reportportal/jooq/tables/JShedlock.java
@@ -43,7 +43,7 @@
 @SuppressWarnings({ "all", "unchecked", "rawtypes" })
 public class JShedlock extends TableImpl<JShedlockRecord> {
 
-    private static final long serialVersionUID = -2077089538;
+    private static final long serialVersionUID = -1932515469;
 
     /**
      * The reference instance of <code>public.shedlock</code>
diff --git a/src/main/java/com/epam/ta/reportportal/jooq/tables/JStaleMaterializedView.java b/src/main/java/com/epam/ta/reportportal/jooq/tables/JStaleMaterializedView.java
index d2cdb14a6..ee847eec8 100644
--- a/src/main/java/com/epam/ta/reportportal/jooq/tables/JStaleMaterializedView.java
+++ b/src/main/java/com/epam/ta/reportportal/jooq/tables/JStaleMaterializedView.java
@@ -44,7 +44,7 @@
 @SuppressWarnings({ "all", "unchecked", "rawtypes" })
 public class JStaleMaterializedView extends TableImpl<JStaleMaterializedViewRecord> {
 
-    private static final long serialVersionUID = -70601346;
+    private static final long serialVersionUID = 581510835;
 
     /**
      * The reference instance of <code>public.stale_materialized_view</code>
diff --git a/src/main/java/com/epam/ta/reportportal/jooq/tables/JTestItem.java b/src/main/java/com/epam/ta/reportportal/jooq/tables/JTestItem.java
index 0971b13c1..a15fb1a2c 100644
--- a/src/main/java/com/epam/ta/reportportal/jooq/tables/JTestItem.java
+++ b/src/main/java/com/epam/ta/reportportal/jooq/tables/JTestItem.java
@@ -45,7 +45,7 @@
 @SuppressWarnings({ "all", "unchecked", "rawtypes" })
 public class JTestItem extends TableImpl<JTestItemRecord> {
 
-    private static final long serialVersionUID = 1074590849;
+    private static final long serialVersionUID = 767540278;
 
     /**
      * The reference instance of <code>public.test_item</code>
diff --git a/src/main/java/com/epam/ta/reportportal/jooq/tables/JTestItemResults.java b/src/main/java/com/epam/ta/reportportal/jooq/tables/JTestItemResults.java
index c197d28f4..27d13056d 100644
--- a/src/main/java/com/epam/ta/reportportal/jooq/tables/JTestItemResults.java
+++ b/src/main/java/com/epam/ta/reportportal/jooq/tables/JTestItemResults.java
@@ -44,7 +44,7 @@
 @SuppressWarnings({ "all", "unchecked", "rawtypes" })
 public class JTestItemResults extends TableImpl<JTestItemResultsRecord> {
 
-    private static final long serialVersionUID = -648299127;
+    private static final long serialVersionUID = -722704972;
 
     /**
      * The reference instance of <code>public.test_item_results</code>
diff --git a/src/main/java/com/epam/ta/reportportal/jooq/tables/JTicket.java b/src/main/java/com/epam/ta/reportportal/jooq/tables/JTicket.java
index 50bf76788..cd51bd1d8 100644
--- a/src/main/java/com/epam/ta/reportportal/jooq/tables/JTicket.java
+++ b/src/main/java/com/epam/ta/reportportal/jooq/tables/JTicket.java
@@ -44,7 +44,7 @@
 @SuppressWarnings({ "all", "unchecked", "rawtypes" })
 public class JTicket extends TableImpl<JTicketRecord> {
 
-    private static final long serialVersionUID = -914734476;
+    private static final long serialVersionUID = -1169544097;
 
     /**
      * The reference instance of <code>public.ticket</code>
diff --git a/src/main/java/com/epam/ta/reportportal/jooq/tables/JUserCreationBid.java b/src/main/java/com/epam/ta/reportportal/jooq/tables/JUserCreationBid.java
index 4ad7c02d9..3ea90ae84 100644
--- a/src/main/java/com/epam/ta/reportportal/jooq/tables/JUserCreationBid.java
+++ b/src/main/java/com/epam/ta/reportportal/jooq/tables/JUserCreationBid.java
@@ -4,6 +4,7 @@
 package com.epam.ta.reportportal.jooq.tables;
 
 
+import com.epam.ta.reportportal.dao.converters.InstantConverter;
 import com.epam.ta.reportportal.jooq.Indexes;
 import com.epam.ta.reportportal.jooq.JPublic;
 import com.epam.ta.reportportal.jooq.Keys;
@@ -11,7 +12,7 @@
 import com.epam.ta.reportportal.jooq.enums.JProjectRoleEnum;
 import com.epam.ta.reportportal.jooq.tables.records.JUserCreationBidRecord;
 
-import java.sql.Timestamp;
+import java.time.Instant;
 import java.util.Arrays;
 import java.util.List;
 
@@ -45,7 +46,7 @@
 @SuppressWarnings({ "all", "unchecked", "rawtypes" })
 public class JUserCreationBid extends TableImpl<JUserCreationBidRecord> {
 
-    private static final long serialVersionUID = 957519504;
+    private static final long serialVersionUID = 935947735;
 
     /**
      * The reference instance of <code>public.user_creation_bid</code>
@@ -68,7 +69,7 @@ public Class<JUserCreationBidRecord> getRecordType() {
     /**
      * The column <code>public.user_creation_bid.last_modified</code>.
      */
-    public final TableField<JUserCreationBidRecord, Timestamp> LAST_MODIFIED = createField(DSL.name("last_modified"), org.jooq.impl.SQLDataType.TIMESTAMP.defaultValue(org.jooq.impl.DSL.field("now()", org.jooq.impl.SQLDataType.TIMESTAMP)), this, "");
+    public final TableField<JUserCreationBidRecord, Instant> LAST_MODIFIED = createField(DSL.name("last_modified"), org.jooq.impl.SQLDataType.TIMESTAMP.defaultValue(org.jooq.impl.DSL.field("now()", org.jooq.impl.SQLDataType.TIMESTAMP)), this, "", new InstantConverter());
 
     /**
      * The column <code>public.user_creation_bid.email</code>.
@@ -202,7 +203,7 @@ public JUserCreationBid rename(Name name) {
     // -------------------------------------------------------------------------
 
     @Override
-    public Row9<String, Timestamp, String, JProjectRoleEnum, Long, String, JSONB, Long, JOrganizationRoleEnum> fieldsRow() {
+    public Row9<String, Instant, String, JProjectRoleEnum, Long, String, JSONB, Long, JOrganizationRoleEnum> fieldsRow() {
         return (Row9) super.fieldsRow();
     }
 }
diff --git a/src/main/java/com/epam/ta/reportportal/jooq/tables/JUsers.java b/src/main/java/com/epam/ta/reportportal/jooq/tables/JUsers.java
index 9bc0283de..bac1175af 100644
--- a/src/main/java/com/epam/ta/reportportal/jooq/tables/JUsers.java
+++ b/src/main/java/com/epam/ta/reportportal/jooq/tables/JUsers.java
@@ -4,12 +4,13 @@
 package com.epam.ta.reportportal.jooq.tables;
 
 
+import com.epam.ta.reportportal.dao.converters.InstantConverter;
 import com.epam.ta.reportportal.jooq.Indexes;
 import com.epam.ta.reportportal.jooq.JPublic;
 import com.epam.ta.reportportal.jooq.Keys;
 import com.epam.ta.reportportal.jooq.tables.records.JUsersRecord;
 
-import java.sql.Timestamp;
+import java.time.Instant;
 import java.util.Arrays;
 import java.util.List;
 
@@ -44,7 +45,7 @@
 @SuppressWarnings({ "all", "unchecked", "rawtypes" })
 public class JUsers extends TableImpl<JUsersRecord> {
 
-    private static final long serialVersionUID = -679507963;
+    private static final long serialVersionUID = -1153492256;
 
     /**
      * The reference instance of <code>public.users</code>
@@ -117,12 +118,12 @@ public Class<JUsersRecord> getRecordType() {
     /**
      * The column <code>public.users.created_at</code>.
      */
-    public final TableField<JUsersRecord, Timestamp> CREATED_AT = createField(DSL.name("created_at"), org.jooq.impl.SQLDataType.TIMESTAMP.nullable(false).defaultValue(org.jooq.impl.DSL.field("now()", org.jooq.impl.SQLDataType.TIMESTAMP)), this, "");
+    public final TableField<JUsersRecord, Instant> CREATED_AT = createField(DSL.name("created_at"), org.jooq.impl.SQLDataType.TIMESTAMP.nullable(false).defaultValue(org.jooq.impl.DSL.field("now()", org.jooq.impl.SQLDataType.TIMESTAMP)), this, "", new InstantConverter());
 
     /**
      * The column <code>public.users.updated_at</code>.
      */
-    public final TableField<JUsersRecord, Timestamp> UPDATED_AT = createField(DSL.name("updated_at"), org.jooq.impl.SQLDataType.TIMESTAMP.nullable(false).defaultValue(org.jooq.impl.DSL.field("now()", org.jooq.impl.SQLDataType.TIMESTAMP)), this, "");
+    public final TableField<JUsersRecord, Instant> UPDATED_AT = createField(DSL.name("updated_at"), org.jooq.impl.SQLDataType.TIMESTAMP.nullable(false).defaultValue(org.jooq.impl.DSL.field("now()", org.jooq.impl.SQLDataType.TIMESTAMP)), this, "", new InstantConverter());
 
     /**
      * Create a <code>public.users</code> table reference
@@ -213,7 +214,7 @@ public JUsers rename(Name name) {
     // -------------------------------------------------------------------------
 
     @Override
-    public Row13<Long, String, String, String, String, String, String, String, Boolean, String, JSONB, Timestamp, Timestamp> fieldsRow() {
+    public Row13<Long, String, String, String, String, String, String, String, Boolean, String, JSONB, Instant, Instant> fieldsRow() {
         return (Row13) super.fieldsRow();
     }
 }
diff --git a/src/main/java/com/epam/ta/reportportal/jooq/tables/records/JOrganizationRecord.java b/src/main/java/com/epam/ta/reportportal/jooq/tables/records/JOrganizationRecord.java
index 9bb3371d0..ea9cdbed2 100644
--- a/src/main/java/com/epam/ta/reportportal/jooq/tables/records/JOrganizationRecord.java
+++ b/src/main/java/com/epam/ta/reportportal/jooq/tables/records/JOrganizationRecord.java
@@ -6,7 +6,7 @@
 
 import com.epam.ta.reportportal.jooq.tables.JOrganization;
 
-import java.sql.Timestamp;
+import java.time.Instant;
 
 import javax.annotation.processing.Generated;
 
@@ -28,9 +28,9 @@
     comments = "This class is generated by jOOQ"
 )
 @SuppressWarnings({ "all", "unchecked", "rawtypes" })
-public class JOrganizationRecord extends UpdatableRecordImpl<JOrganizationRecord> implements Record7<Long, Timestamp, String, String, String, Timestamp, String> {
+public class JOrganizationRecord extends UpdatableRecordImpl<JOrganizationRecord> implements Record7<Long, Instant, String, String, String, Instant, String> {
 
-    private static final long serialVersionUID = -451955554;
+    private static final long serialVersionUID = -1855764542;
 
     /**
      * Setter for <code>public.organization.id</code>.
@@ -49,15 +49,15 @@ public Long getId() {
     /**
      * Setter for <code>public.organization.created_at</code>.
      */
-    public void setCreatedAt(Timestamp value) {
+    public void setCreatedAt(Instant value) {
         set(1, value);
     }
 
     /**
      * Getter for <code>public.organization.created_at</code>.
      */
-    public Timestamp getCreatedAt() {
-        return (Timestamp) get(1);
+    public Instant getCreatedAt() {
+        return (Instant) get(1);
     }
 
     /**
@@ -105,15 +105,15 @@ public String getSlug() {
     /**
      * Setter for <code>public.organization.updated_at</code>.
      */
-    public void setUpdatedAt(Timestamp value) {
+    public void setUpdatedAt(Instant value) {
         set(5, value);
     }
 
     /**
      * Getter for <code>public.organization.updated_at</code>.
      */
-    public Timestamp getUpdatedAt() {
-        return (Timestamp) get(5);
+    public Instant getUpdatedAt() {
+        return (Instant) get(5);
     }
 
     /**
@@ -144,12 +144,12 @@ public Record1<Long> key() {
     // -------------------------------------------------------------------------
 
     @Override
-    public Row7<Long, Timestamp, String, String, String, Timestamp, String> fieldsRow() {
+    public Row7<Long, Instant, String, String, String, Instant, String> fieldsRow() {
         return (Row7) super.fieldsRow();
     }
 
     @Override
-    public Row7<Long, Timestamp, String, String, String, Timestamp, String> valuesRow() {
+    public Row7<Long, Instant, String, String, String, Instant, String> valuesRow() {
         return (Row7) super.valuesRow();
     }
 
@@ -159,7 +159,7 @@ public Field<Long> field1() {
     }
 
     @Override
-    public Field<Timestamp> field2() {
+    public Field<Instant> field2() {
         return JOrganization.ORGANIZATION.CREATED_AT;
     }
 
@@ -179,7 +179,7 @@ public Field<String> field5() {
     }
 
     @Override
-    public Field<Timestamp> field6() {
+    public Field<Instant> field6() {
         return JOrganization.ORGANIZATION.UPDATED_AT;
     }
 
@@ -194,7 +194,7 @@ public Long component1() {
     }
 
     @Override
-    public Timestamp component2() {
+    public Instant component2() {
         return getCreatedAt();
     }
 
@@ -214,7 +214,7 @@ public String component5() {
     }
 
     @Override
-    public Timestamp component6() {
+    public Instant component6() {
         return getUpdatedAt();
     }
 
@@ -229,7 +229,7 @@ public Long value1() {
     }
 
     @Override
-    public Timestamp value2() {
+    public Instant value2() {
         return getCreatedAt();
     }
 
@@ -249,7 +249,7 @@ public String value5() {
     }
 
     @Override
-    public Timestamp value6() {
+    public Instant value6() {
         return getUpdatedAt();
     }
 
@@ -265,7 +265,7 @@ public JOrganizationRecord value1(Long value) {
     }
 
     @Override
-    public JOrganizationRecord value2(Timestamp value) {
+    public JOrganizationRecord value2(Instant value) {
         setCreatedAt(value);
         return this;
     }
@@ -289,7 +289,7 @@ public JOrganizationRecord value5(String value) {
     }
 
     @Override
-    public JOrganizationRecord value6(Timestamp value) {
+    public JOrganizationRecord value6(Instant value) {
         setUpdatedAt(value);
         return this;
     }
@@ -301,7 +301,7 @@ public JOrganizationRecord value7(String value) {
     }
 
     @Override
-    public JOrganizationRecord values(Long value1, Timestamp value2, String value3, String value4, String value5, Timestamp value6, String value7) {
+    public JOrganizationRecord values(Long value1, Instant value2, String value3, String value4, String value5, Instant value6, String value7) {
         value1(value1);
         value2(value2);
         value3(value3);
@@ -326,7 +326,7 @@ public JOrganizationRecord() {
     /**
      * Create a detached, initialised JOrganizationRecord
      */
-    public JOrganizationRecord(Long id, Timestamp createdAt, String name, String organizationType, String slug, Timestamp updatedAt, String externalId) {
+    public JOrganizationRecord(Long id, Instant createdAt, String name, String organizationType, String slug, Instant updatedAt, String externalId) {
         super(JOrganization.ORGANIZATION);
 
         set(0, id);
diff --git a/src/main/java/com/epam/ta/reportportal/jooq/tables/records/JOrganizationUserRecord.java b/src/main/java/com/epam/ta/reportportal/jooq/tables/records/JOrganizationUserRecord.java
index 2f6c5e856..5f4034ac9 100644
--- a/src/main/java/com/epam/ta/reportportal/jooq/tables/records/JOrganizationUserRecord.java
+++ b/src/main/java/com/epam/ta/reportportal/jooq/tables/records/JOrganizationUserRecord.java
@@ -7,7 +7,7 @@
 import com.epam.ta.reportportal.jooq.enums.JOrganizationRoleEnum;
 import com.epam.ta.reportportal.jooq.tables.JOrganizationUser;
 
-import java.sql.Timestamp;
+import java.time.Instant;
 
 import javax.annotation.processing.Generated;
 
@@ -29,9 +29,9 @@
     comments = "This class is generated by jOOQ"
 )
 @SuppressWarnings({ "all", "unchecked", "rawtypes" })
-public class JOrganizationUserRecord extends UpdatableRecordImpl<JOrganizationUserRecord> implements Record4<Long, Long, JOrganizationRoleEnum, Timestamp> {
+public class JOrganizationUserRecord extends UpdatableRecordImpl<JOrganizationUserRecord> implements Record4<Long, Long, JOrganizationRoleEnum, Instant> {
 
-    private static final long serialVersionUID = -1880412991;
+    private static final long serialVersionUID = -769931279;
 
     /**
      * Setter for <code>public.organization_user.user_id</code>.
@@ -78,15 +78,15 @@ public JOrganizationRoleEnum getOrganizationRole() {
     /**
      * Setter for <code>public.organization_user.assigned_at</code>.
      */
-    public void setAssignedAt(Timestamp value) {
+    public void setAssignedAt(Instant value) {
         set(3, value);
     }
 
     /**
      * Getter for <code>public.organization_user.assigned_at</code>.
      */
-    public Timestamp getAssignedAt() {
-        return (Timestamp) get(3);
+    public Instant getAssignedAt() {
+        return (Instant) get(3);
     }
 
     // -------------------------------------------------------------------------
@@ -103,12 +103,12 @@ public Record2<Long, Long> key() {
     // -------------------------------------------------------------------------
 
     @Override
-    public Row4<Long, Long, JOrganizationRoleEnum, Timestamp> fieldsRow() {
+    public Row4<Long, Long, JOrganizationRoleEnum, Instant> fieldsRow() {
         return (Row4) super.fieldsRow();
     }
 
     @Override
-    public Row4<Long, Long, JOrganizationRoleEnum, Timestamp> valuesRow() {
+    public Row4<Long, Long, JOrganizationRoleEnum, Instant> valuesRow() {
         return (Row4) super.valuesRow();
     }
 
@@ -128,7 +128,7 @@ public Field<JOrganizationRoleEnum> field3() {
     }
 
     @Override
-    public Field<Timestamp> field4() {
+    public Field<Instant> field4() {
         return JOrganizationUser.ORGANIZATION_USER.ASSIGNED_AT;
     }
 
@@ -148,7 +148,7 @@ public JOrganizationRoleEnum component3() {
     }
 
     @Override
-    public Timestamp component4() {
+    public Instant component4() {
         return getAssignedAt();
     }
 
@@ -168,7 +168,7 @@ public JOrganizationRoleEnum value3() {
     }
 
     @Override
-    public Timestamp value4() {
+    public Instant value4() {
         return getAssignedAt();
     }
 
@@ -191,13 +191,13 @@ public JOrganizationUserRecord value3(JOrganizationRoleEnum value) {
     }
 
     @Override
-    public JOrganizationUserRecord value4(Timestamp value) {
+    public JOrganizationUserRecord value4(Instant value) {
         setAssignedAt(value);
         return this;
     }
 
     @Override
-    public JOrganizationUserRecord values(Long value1, Long value2, JOrganizationRoleEnum value3, Timestamp value4) {
+    public JOrganizationUserRecord values(Long value1, Long value2, JOrganizationRoleEnum value3, Instant value4) {
         value1(value1);
         value2(value2);
         value3(value3);
@@ -219,7 +219,7 @@ public JOrganizationUserRecord() {
     /**
      * Create a detached, initialised JOrganizationUserRecord
      */
-    public JOrganizationUserRecord(Long userId, Long organizationId, JOrganizationRoleEnum organizationRole, Timestamp assignedAt) {
+    public JOrganizationUserRecord(Long userId, Long organizationId, JOrganizationRoleEnum organizationRole, Instant assignedAt) {
         super(JOrganizationUser.ORGANIZATION_USER);
 
         set(0, userId);
diff --git a/src/main/java/com/epam/ta/reportportal/jooq/tables/records/JProjectRecord.java b/src/main/java/com/epam/ta/reportportal/jooq/tables/records/JProjectRecord.java
index 037c12fba..19d36da05 100644
--- a/src/main/java/com/epam/ta/reportportal/jooq/tables/records/JProjectRecord.java
+++ b/src/main/java/com/epam/ta/reportportal/jooq/tables/records/JProjectRecord.java
@@ -6,7 +6,7 @@
 
 import com.epam.ta.reportportal.jooq.tables.JProject;
 
-import java.sql.Timestamp;
+import java.time.Instant;
 
 import javax.annotation.processing.Generated;
 
@@ -29,9 +29,9 @@
     comments = "This class is generated by jOOQ"
 )
 @SuppressWarnings({ "all", "unchecked", "rawtypes" })
-public class JProjectRecord extends UpdatableRecordImpl<JProjectRecord> implements Record10<Long, String, String, Timestamp, JSONB, Long, Long, String, String, Timestamp> {
+public class JProjectRecord extends UpdatableRecordImpl<JProjectRecord> implements Record10<Long, String, String, Instant, JSONB, Long, Long, String, String, Instant> {
 
-    private static final long serialVersionUID = 1303086890;
+    private static final long serialVersionUID = 963926100;
 
     /**
      * Setter for <code>public.project.id</code>.
@@ -78,15 +78,15 @@ public String getOrganization() {
     /**
      * Setter for <code>public.project.created_at</code>.
      */
-    public void setCreatedAt(Timestamp value) {
+    public void setCreatedAt(Instant value) {
         set(3, value);
     }
 
     /**
      * Getter for <code>public.project.created_at</code>.
      */
-    public Timestamp getCreatedAt() {
-        return (Timestamp) get(3);
+    public Instant getCreatedAt() {
+        return (Instant) get(3);
     }
 
     /**
@@ -162,15 +162,15 @@ public String getKey() {
     /**
      * Setter for <code>public.project.updated_at</code>.
      */
-    public void setUpdatedAt(Timestamp value) {
+    public void setUpdatedAt(Instant value) {
         set(9, value);
     }
 
     /**
      * Getter for <code>public.project.updated_at</code>.
      */
-    public Timestamp getUpdatedAt() {
-        return (Timestamp) get(9);
+    public Instant getUpdatedAt() {
+        return (Instant) get(9);
     }
 
     // -------------------------------------------------------------------------
@@ -187,12 +187,12 @@ public Record1<Long> key() {
     // -------------------------------------------------------------------------
 
     @Override
-    public Row10<Long, String, String, Timestamp, JSONB, Long, Long, String, String, Timestamp> fieldsRow() {
+    public Row10<Long, String, String, Instant, JSONB, Long, Long, String, String, Instant> fieldsRow() {
         return (Row10) super.fieldsRow();
     }
 
     @Override
-    public Row10<Long, String, String, Timestamp, JSONB, Long, Long, String, String, Timestamp> valuesRow() {
+    public Row10<Long, String, String, Instant, JSONB, Long, Long, String, String, Instant> valuesRow() {
         return (Row10) super.valuesRow();
     }
 
@@ -212,7 +212,7 @@ public Field<String> field3() {
     }
 
     @Override
-    public Field<Timestamp> field4() {
+    public Field<Instant> field4() {
         return JProject.PROJECT.CREATED_AT;
     }
 
@@ -242,7 +242,7 @@ public Field<String> field9() {
     }
 
     @Override
-    public Field<Timestamp> field10() {
+    public Field<Instant> field10() {
         return JProject.PROJECT.UPDATED_AT;
     }
 
@@ -262,7 +262,7 @@ public String component3() {
     }
 
     @Override
-    public Timestamp component4() {
+    public Instant component4() {
         return getCreatedAt();
     }
 
@@ -292,7 +292,7 @@ public String component9() {
     }
 
     @Override
-    public Timestamp component10() {
+    public Instant component10() {
         return getUpdatedAt();
     }
 
@@ -312,7 +312,7 @@ public String value3() {
     }
 
     @Override
-    public Timestamp value4() {
+    public Instant value4() {
         return getCreatedAt();
     }
 
@@ -342,7 +342,7 @@ public String value9() {
     }
 
     @Override
-    public Timestamp value10() {
+    public Instant value10() {
         return getUpdatedAt();
     }
 
@@ -365,7 +365,7 @@ public JProjectRecord value3(String value) {
     }
 
     @Override
-    public JProjectRecord value4(Timestamp value) {
+    public JProjectRecord value4(Instant value) {
         setCreatedAt(value);
         return this;
     }
@@ -401,13 +401,13 @@ public JProjectRecord value9(String value) {
     }
 
     @Override
-    public JProjectRecord value10(Timestamp value) {
+    public JProjectRecord value10(Instant value) {
         setUpdatedAt(value);
         return this;
     }
 
     @Override
-    public JProjectRecord values(Long value1, String value2, String value3, Timestamp value4, JSONB value5, Long value6, Long value7, String value8, String value9, Timestamp value10) {
+    public JProjectRecord values(Long value1, String value2, String value3, Instant value4, JSONB value5, Long value6, Long value7, String value8, String value9, Instant value10) {
         value1(value1);
         value2(value2);
         value3(value3);
@@ -435,7 +435,7 @@ public JProjectRecord() {
     /**
      * Create a detached, initialised JProjectRecord
      */
-    public JProjectRecord(Long id, String name, String organization, Timestamp createdAt, JSONB metadata, Long allocatedStorage, Long organizationId, String slug, String key, Timestamp updatedAt) {
+    public JProjectRecord(Long id, String name, String organization, Instant createdAt, JSONB metadata, Long allocatedStorage, Long organizationId, String slug, String key, Instant updatedAt) {
         super(JProject.PROJECT);
 
         set(0, id);
diff --git a/src/main/java/com/epam/ta/reportportal/jooq/tables/records/JUserCreationBidRecord.java b/src/main/java/com/epam/ta/reportportal/jooq/tables/records/JUserCreationBidRecord.java
index ec0b9f32a..e36d3ae30 100644
--- a/src/main/java/com/epam/ta/reportportal/jooq/tables/records/JUserCreationBidRecord.java
+++ b/src/main/java/com/epam/ta/reportportal/jooq/tables/records/JUserCreationBidRecord.java
@@ -8,7 +8,7 @@
 import com.epam.ta.reportportal.jooq.enums.JProjectRoleEnum;
 import com.epam.ta.reportportal.jooq.tables.JUserCreationBid;
 
-import java.sql.Timestamp;
+import java.time.Instant;
 
 import javax.annotation.processing.Generated;
 
@@ -31,9 +31,9 @@
     comments = "This class is generated by jOOQ"
 )
 @SuppressWarnings({ "all", "unchecked", "rawtypes" })
-public class JUserCreationBidRecord extends UpdatableRecordImpl<JUserCreationBidRecord> implements Record9<String, Timestamp, String, JProjectRoleEnum, Long, String, JSONB, Long, JOrganizationRoleEnum> {
+public class JUserCreationBidRecord extends UpdatableRecordImpl<JUserCreationBidRecord> implements Record9<String, Instant, String, JProjectRoleEnum, Long, String, JSONB, Long, JOrganizationRoleEnum> {
 
-    private static final long serialVersionUID = 1624132004;
+    private static final long serialVersionUID = -849559566;
 
     /**
      * Setter for <code>public.user_creation_bid.uuid</code>.
@@ -52,15 +52,15 @@ public String getUuid() {
     /**
      * Setter for <code>public.user_creation_bid.last_modified</code>.
      */
-    public void setLastModified(Timestamp value) {
+    public void setLastModified(Instant value) {
         set(1, value);
     }
 
     /**
      * Getter for <code>public.user_creation_bid.last_modified</code>.
      */
-    public Timestamp getLastModified() {
-        return (Timestamp) get(1);
+    public Instant getLastModified() {
+        return (Instant) get(1);
     }
 
     /**
@@ -175,12 +175,12 @@ public Record1<String> key() {
     // -------------------------------------------------------------------------
 
     @Override
-    public Row9<String, Timestamp, String, JProjectRoleEnum, Long, String, JSONB, Long, JOrganizationRoleEnum> fieldsRow() {
+    public Row9<String, Instant, String, JProjectRoleEnum, Long, String, JSONB, Long, JOrganizationRoleEnum> fieldsRow() {
         return (Row9) super.fieldsRow();
     }
 
     @Override
-    public Row9<String, Timestamp, String, JProjectRoleEnum, Long, String, JSONB, Long, JOrganizationRoleEnum> valuesRow() {
+    public Row9<String, Instant, String, JProjectRoleEnum, Long, String, JSONB, Long, JOrganizationRoleEnum> valuesRow() {
         return (Row9) super.valuesRow();
     }
 
@@ -190,7 +190,7 @@ public Field<String> field1() {
     }
 
     @Override
-    public Field<Timestamp> field2() {
+    public Field<Instant> field2() {
         return JUserCreationBid.USER_CREATION_BID.LAST_MODIFIED;
     }
 
@@ -235,7 +235,7 @@ public String component1() {
     }
 
     @Override
-    public Timestamp component2() {
+    public Instant component2() {
         return getLastModified();
     }
 
@@ -280,7 +280,7 @@ public String value1() {
     }
 
     @Override
-    public Timestamp value2() {
+    public Instant value2() {
         return getLastModified();
     }
 
@@ -326,7 +326,7 @@ public JUserCreationBidRecord value1(String value) {
     }
 
     @Override
-    public JUserCreationBidRecord value2(Timestamp value) {
+    public JUserCreationBidRecord value2(Instant value) {
         setLastModified(value);
         return this;
     }
@@ -374,7 +374,7 @@ public JUserCreationBidRecord value9(JOrganizationRoleEnum value) {
     }
 
     @Override
-    public JUserCreationBidRecord values(String value1, Timestamp value2, String value3, JProjectRoleEnum value4, Long value5, String value6, JSONB value7, Long value8, JOrganizationRoleEnum value9) {
+    public JUserCreationBidRecord values(String value1, Instant value2, String value3, JProjectRoleEnum value4, Long value5, String value6, JSONB value7, Long value8, JOrganizationRoleEnum value9) {
         value1(value1);
         value2(value2);
         value3(value3);
@@ -401,7 +401,7 @@ public JUserCreationBidRecord() {
     /**
      * Create a detached, initialised JUserCreationBidRecord
      */
-    public JUserCreationBidRecord(String uuid, Timestamp lastModified, String email, JProjectRoleEnum role, Long invitingUserId, String projectKey, JSONB metadata, Long organizationId, JOrganizationRoleEnum organizationRole) {
+    public JUserCreationBidRecord(String uuid, Instant lastModified, String email, JProjectRoleEnum role, Long invitingUserId, String projectKey, JSONB metadata, Long organizationId, JOrganizationRoleEnum organizationRole) {
         super(JUserCreationBid.USER_CREATION_BID);
 
         set(0, uuid);
diff --git a/src/main/java/com/epam/ta/reportportal/jooq/tables/records/JUsersRecord.java b/src/main/java/com/epam/ta/reportportal/jooq/tables/records/JUsersRecord.java
index 64e17028d..5b4c01b00 100644
--- a/src/main/java/com/epam/ta/reportportal/jooq/tables/records/JUsersRecord.java
+++ b/src/main/java/com/epam/ta/reportportal/jooq/tables/records/JUsersRecord.java
@@ -6,7 +6,7 @@
 
 import com.epam.ta.reportportal.jooq.tables.JUsers;
 
-import java.sql.Timestamp;
+import java.time.Instant;
 
 import javax.annotation.processing.Generated;
 
@@ -29,9 +29,9 @@
     comments = "This class is generated by jOOQ"
 )
 @SuppressWarnings({ "all", "unchecked", "rawtypes" })
-public class JUsersRecord extends UpdatableRecordImpl<JUsersRecord> implements Record13<Long, String, String, String, String, String, String, String, Boolean, String, JSONB, Timestamp, Timestamp> {
+public class JUsersRecord extends UpdatableRecordImpl<JUsersRecord> implements Record13<Long, String, String, String, String, String, String, String, Boolean, String, JSONB, Instant, Instant> {
 
-    private static final long serialVersionUID = 292587137;
+    private static final long serialVersionUID = 581656917;
 
     /**
      * Setter for <code>public.users.id</code>.
@@ -190,29 +190,29 @@ public JSONB getMetadata() {
     /**
      * Setter for <code>public.users.created_at</code>.
      */
-    public void setCreatedAt(Timestamp value) {
+    public void setCreatedAt(Instant value) {
         set(11, value);
     }
 
     /**
      * Getter for <code>public.users.created_at</code>.
      */
-    public Timestamp getCreatedAt() {
-        return (Timestamp) get(11);
+    public Instant getCreatedAt() {
+        return (Instant) get(11);
     }
 
     /**
      * Setter for <code>public.users.updated_at</code>.
      */
-    public void setUpdatedAt(Timestamp value) {
+    public void setUpdatedAt(Instant value) {
         set(12, value);
     }
 
     /**
      * Getter for <code>public.users.updated_at</code>.
      */
-    public Timestamp getUpdatedAt() {
-        return (Timestamp) get(12);
+    public Instant getUpdatedAt() {
+        return (Instant) get(12);
     }
 
     // -------------------------------------------------------------------------
@@ -229,12 +229,12 @@ public Record1<Long> key() {
     // -------------------------------------------------------------------------
 
     @Override
-    public Row13<Long, String, String, String, String, String, String, String, Boolean, String, JSONB, Timestamp, Timestamp> fieldsRow() {
+    public Row13<Long, String, String, String, String, String, String, String, Boolean, String, JSONB, Instant, Instant> fieldsRow() {
         return (Row13) super.fieldsRow();
     }
 
     @Override
-    public Row13<Long, String, String, String, String, String, String, String, Boolean, String, JSONB, Timestamp, Timestamp> valuesRow() {
+    public Row13<Long, String, String, String, String, String, String, String, Boolean, String, JSONB, Instant, Instant> valuesRow() {
         return (Row13) super.valuesRow();
     }
 
@@ -294,12 +294,12 @@ public Field<JSONB> field11() {
     }
 
     @Override
-    public Field<Timestamp> field12() {
+    public Field<Instant> field12() {
         return JUsers.USERS.CREATED_AT;
     }
 
     @Override
-    public Field<Timestamp> field13() {
+    public Field<Instant> field13() {
         return JUsers.USERS.UPDATED_AT;
     }
 
@@ -359,12 +359,12 @@ public JSONB component11() {
     }
 
     @Override
-    public Timestamp component12() {
+    public Instant component12() {
         return getCreatedAt();
     }
 
     @Override
-    public Timestamp component13() {
+    public Instant component13() {
         return getUpdatedAt();
     }
 
@@ -424,12 +424,12 @@ public JSONB value11() {
     }
 
     @Override
-    public Timestamp value12() {
+    public Instant value12() {
         return getCreatedAt();
     }
 
     @Override
-    public Timestamp value13() {
+    public Instant value13() {
         return getUpdatedAt();
     }
 
@@ -500,19 +500,19 @@ public JUsersRecord value11(JSONB value) {
     }
 
     @Override
-    public JUsersRecord value12(Timestamp value) {
+    public JUsersRecord value12(Instant value) {
         setCreatedAt(value);
         return this;
     }
 
     @Override
-    public JUsersRecord value13(Timestamp value) {
+    public JUsersRecord value13(Instant value) {
         setUpdatedAt(value);
         return this;
     }
 
     @Override
-    public JUsersRecord values(Long value1, String value2, String value3, String value4, String value5, String value6, String value7, String value8, Boolean value9, String value10, JSONB value11, Timestamp value12, Timestamp value13) {
+    public JUsersRecord values(Long value1, String value2, String value3, String value4, String value5, String value6, String value7, String value8, Boolean value9, String value10, JSONB value11, Instant value12, Instant value13) {
         value1(value1);
         value2(value2);
         value3(value3);
@@ -543,7 +543,7 @@ public JUsersRecord() {
     /**
      * Create a detached, initialised JUsersRecord
      */
-    public JUsersRecord(Long id, String login, String password, String email, String attachment, String attachmentThumbnail, String role, String type, Boolean expired, String fullName, JSONB metadata, Timestamp createdAt, Timestamp updatedAt) {
+    public JUsersRecord(Long id, String login, String password, String email, String attachment, String attachmentThumbnail, String role, String type, Boolean expired, String fullName, JSONB metadata, Instant createdAt, Instant updatedAt) {
         super(JUsers.USERS);
 
         set(0, id);