diff --git a/jooq.gradle b/jooq.gradle
index b2033abed..40e3f0f73 100644
--- a/jooq.gradle
+++ b/jooq.gradle
@@ -15,7 +15,7 @@ jooq {
             }
             database {
                 name = 'org.jooq.meta.postgres.PostgresDatabase'
-                inputSchema = 'public'
+                inputSchema = (hasDBSchema ? getProperty('DB_SCHEMA_POSTGRES') : 'public')
                 // ...
                 excludes = 'batch_.*|schema_migrations'
             }
diff --git a/project-properties.gradle b/project-properties.gradle
index 0881c2822..3ef02e089 100755
--- a/project-properties.gradle
+++ b/project-properties.gradle
@@ -6,6 +6,7 @@ def migrationsScriptsUrl = 'https://raw.githubusercontent.com/reportportal/migra
 
 project.ext {
     releaseMode = project.hasProperty("releaseMode")
+    hasDBSchema = project.hasProperty("DB_SCHEMA_POSTGRES")
     scriptsUrl = commonScriptsUrl + (releaseMode ? getProperty('scripts.version') : 'develop')
     migrationsUrl = migrationsScriptsUrl + (releaseMode ? getProperty('migrations.version') : 'develop')
     //TODO refactor with archive download