diff --git a/application/src/main/resources/thingsboard.yml b/application/src/main/resources/thingsboard.yml
index f5dd6e78c3..4f11b6880c 100644
--- a/application/src/main/resources/thingsboard.yml
+++ b/application/src/main/resources/thingsboard.yml
@@ -535,7 +535,7 @@ spring:
     open-in-view: "false"
     hibernate:
       ddl-auto: "none"
-    database-platform: "${SPRING_JPA_DATABASE_PLATFORM:org.hibernate.dialect.PostgreSQLDialect}"
+    database-platform: "${SPRING_JPA_DATABASE_PLATFORM:org.hibernate.dialect.PostgreSQL10Dialect}"
   datasource:
     driverClassName: "${SPRING_DRIVER_CLASS_NAME:org.postgresql.Driver}"
     url: "${SPRING_DATASOURCE_URL:jdbc:postgresql://localhost:5432/thingsboard}"
diff --git a/common/dao-api/src/main/java/org/thingsboard/server/dao/util/PsqlDao.java b/common/dao-api/src/main/java/org/thingsboard/server/dao/util/PsqlDao.java
index 81855d99cf..ba30f8975a 100644
--- a/common/dao-api/src/main/java/org/thingsboard/server/dao/util/PsqlDao.java
+++ b/common/dao-api/src/main/java/org/thingsboard/server/dao/util/PsqlDao.java
@@ -21,6 +21,6 @@ import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 
 @Retention(RetentionPolicy.RUNTIME)
-@ConditionalOnProperty(prefix = "spring.jpa", value = "database-platform", havingValue = "org.hibernate.dialect.PostgreSQLDialect")
+@ConditionalOnProperty(prefix = "spring.jpa", value = "database-platform", havingValue = "org.hibernate.dialect.PostgreSQL10Dialect")
 public @interface PsqlDao {
 }
\ No newline at end of file
diff --git a/common/dao-api/src/main/java/org/thingsboard/server/dao/util/PsqlTsLatestAnyDao.java b/common/dao-api/src/main/java/org/thingsboard/server/dao/util/PsqlTsLatestAnyDao.java
index ea44bd52e1..368f550c14 100644
--- a/common/dao-api/src/main/java/org/thingsboard/server/dao/util/PsqlTsLatestAnyDao.java
+++ b/common/dao-api/src/main/java/org/thingsboard/server/dao/util/PsqlTsLatestAnyDao.java
@@ -22,6 +22,6 @@ import java.lang.annotation.RetentionPolicy;
 
 @Retention(RetentionPolicy.RUNTIME)
 @ConditionalOnExpression("('${database.ts_latest.type}'=='sql' || '${database.ts_latest.type}'=='timescale') " +
-        "&& '${spring.jpa.database-platform}'=='org.hibernate.dialect.PostgreSQLDialect'")
+        "&& '${spring.jpa.database-platform}'=='org.hibernate.dialect.PostgreSQL10Dialect'")
 public @interface PsqlTsLatestAnyDao {
 }
diff --git a/dao/src/test/resources/nosql-test.properties b/dao/src/test/resources/nosql-test.properties
index 293ec2235d..8f661359a9 100644
--- a/dao/src/test/resources/nosql-test.properties
+++ b/dao/src/test/resources/nosql-test.properties
@@ -11,7 +11,7 @@ spring.jpa.properties.hibernate.jdbc.log.warnings=false
 spring.jpa.show-sql=false
 
 spring.jpa.hibernate.ddl-auto=none
-spring.jpa.database-platform=org.hibernate.dialect.PostgreSQLDialect
+spring.jpa.database-platform=org.hibernate.dialect.PostgreSQL10Dialect
 spring.datasource.username=postgres
 spring.datasource.password=postgres
 spring.datasource.url=jdbc:tc:postgresql:12.8:///thingsboard?TC_DAEMON=true&TC_TMPFS=/testtmpfs:rw&?TC_INITFUNCTION=org.thingsboard.server.dao.PostgreSqlInitializer::initDb
diff --git a/dao/src/test/resources/sql-test.properties b/dao/src/test/resources/sql-test.properties
index 52033b3b27..d843b1dc09 100644
--- a/dao/src/test/resources/sql-test.properties
+++ b/dao/src/test/resources/sql-test.properties
@@ -12,7 +12,7 @@ spring.jpa.properties.hibernate.jdbc.log.warnings=false
 spring.jpa.show-sql=false
 
 spring.jpa.hibernate.ddl-auto=none
-spring.jpa.database-platform=org.hibernate.dialect.PostgreSQLDialect
+spring.jpa.database-platform=org.hibernate.dialect.PostgreSQL10Dialect
 spring.datasource.username=postgres
 spring.datasource.password=postgres
 spring.datasource.url=jdbc:tc:postgresql:12.8:///thingsboard?TC_DAEMON=true&TC_TMPFS=/testtmpfs:rw&?TC_INITFUNCTION=org.thingsboard.server.dao.PostgreSqlInitializer::initDb
@@ -32,7 +32,7 @@ service.type=monolith
 #spring.jpa.properties.hibernate.jdbc.lob.non_contextual_creation=true
 #spring.jpa.show-sql=false
 #spring.jpa.hibernate.ddl-auto=none
-#spring.jpa.database-platform=org.hibernate.dialect.PostgreSQLDialect
+#spring.jpa.database-platform=org.hibernate.dialect.PostgreSQL10Dialect
 #
 #spring.datasource.username=postgres
 #spring.datasource.password=postgres
diff --git a/docker/tb-node.hybrid.env b/docker/tb-node.hybrid.env
index 2f5dcee2e3..5f72c6e1a1 100644
--- a/docker/tb-node.hybrid.env
+++ b/docker/tb-node.hybrid.env
@@ -2,7 +2,7 @@
 
 DATABASE_TS_TYPE=cassandra
 CASSANDRA_URL=cassandra:9042
-SPRING_JPA_DATABASE_PLATFORM=org.hibernate.dialect.PostgreSQLDialect
+SPRING_JPA_DATABASE_PLATFORM=org.hibernate.dialect.PostgreSQL10Dialect
 SPRING_DRIVER_CLASS_NAME=org.postgresql.Driver
 SPRING_DATASOURCE_URL=jdbc:postgresql://postgres:5432/thingsboard
 SPRING_DATASOURCE_USERNAME=postgres
diff --git a/docker/tb-node.postgres.env b/docker/tb-node.postgres.env
index 63e8d11889..f4e11cd70a 100644
--- a/docker/tb-node.postgres.env
+++ b/docker/tb-node.postgres.env
@@ -1,7 +1,7 @@
 # ThingsBoard server configuration for PostgreSQL database
 
 DATABASE_TS_TYPE=sql
-SPRING_JPA_DATABASE_PLATFORM=org.hibernate.dialect.PostgreSQLDialect
+SPRING_JPA_DATABASE_PLATFORM=org.hibernate.dialect.PostgreSQL10Dialect
 SPRING_DRIVER_CLASS_NAME=org.postgresql.Driver
 SPRING_DATASOURCE_URL=jdbc:postgresql://postgres:5432/thingsboard
 SPRING_DATASOURCE_USERNAME=postgres
diff --git a/msa/tb/docker-cassandra/Dockerfile b/msa/tb/docker-cassandra/Dockerfile
index 42dfebee45..144c359cc0 100644
--- a/msa/tb/docker-cassandra/Dockerfile
+++ b/msa/tb/docker-cassandra/Dockerfile
@@ -54,7 +54,7 @@ ENV DATABASE_TS_TYPE=cassandra
 ENV PGDATA=/data/db
 ENV CASSANDRA_DATA=/data/cassandra
 
-ENV SPRING_JPA_DATABASE_PLATFORM=org.hibernate.dialect.PostgreSQLDialect
+ENV SPRING_JPA_DATABASE_PLATFORM=org.hibernate.dialect.PostgreSQL10Dialect
 ENV SPRING_DRIVER_CLASS_NAME=org.postgresql.Driver
 ENV SPRING_DATASOURCE_URL=jdbc:postgresql://localhost:5432/thingsboard
 ENV SPRING_DATASOURCE_USERNAME=${pkg.user}
diff --git a/msa/tb/docker-postgres/Dockerfile b/msa/tb/docker-postgres/Dockerfile
index 47e1a0dec6..6b6dbc0011 100644
--- a/msa/tb/docker-postgres/Dockerfile
+++ b/msa/tb/docker-postgres/Dockerfile
@@ -50,7 +50,7 @@ ENV DATABASE_TS_TYPE=sql
 ENV PGDATA=/data/db
 ENV PATH=$PATH:/usr/lib/postgresql/$PG_MAJOR/bin
 
-ENV SPRING_JPA_DATABASE_PLATFORM=org.hibernate.dialect.PostgreSQLDialect
+ENV SPRING_JPA_DATABASE_PLATFORM=org.hibernate.dialect.PostgreSQL10Dialect
 ENV SPRING_DRIVER_CLASS_NAME=org.postgresql.Driver
 ENV SPRING_DATASOURCE_URL=jdbc:postgresql://localhost:5432/thingsboard
 ENV SPRING_DATASOURCE_USERNAME=${pkg.user}