diff --git a/src/main/java/liquibase/ext/hibernate/database/HibernateClassicDatabase.java b/src/main/java/liquibase/ext/hibernate/database/HibernateClassicDatabase.java
index 02c6d0b7..e950a4c5 100644
--- a/src/main/java/liquibase/ext/hibernate/database/HibernateClassicDatabase.java
+++ b/src/main/java/liquibase/ext/hibernate/database/HibernateClassicDatabase.java
@@ -44,7 +44,7 @@ protected void configureSources(MetadataSources sources) throws DatabaseExceptio
         Configuration config = new Configuration(sources);
         config.configure(getHibernateConnection().getPath());
 
-        config.setProperty(HibernateDatabase.HIBERNATE_TEMP_USE_JDBC_METADATA_DEFAULTS, Boolean.FALSE.toString());
+        config.setProperty("hibernate.temp.use_jdbc_metadata_defaults", "false");
         config.setProperty("hibernate.cache.use_second_level_cache", "false");
 
         ServiceRegistry standardRegistry = configuration.getStandardServiceRegistryBuilder()
diff --git a/src/main/java/liquibase/ext/hibernate/database/HibernateDatabase.java b/src/main/java/liquibase/ext/hibernate/database/HibernateDatabase.java
index 8972f1a9..3ff168a0 100644
--- a/src/main/java/liquibase/ext/hibernate/database/HibernateDatabase.java
+++ b/src/main/java/liquibase/ext/hibernate/database/HibernateDatabase.java
@@ -37,7 +37,6 @@ public abstract class HibernateDatabase extends AbstractJdbcDatabase {
 
     private boolean indexesForForeignKeys = false;
     public static final String DEFAULT_SCHEMA = "HIBERNATE";
-    public static final String HIBERNATE_TEMP_USE_JDBC_METADATA_DEFAULTS = "hibernate.temp.use_jdbc_metadata_defaults";
 
     public HibernateDatabase() {
         setDefaultCatalogName(DEFAULT_SCHEMA);
@@ -187,7 +186,6 @@ protected MetadataSources createMetadataSources() throws DatabaseException {
 
         ServiceRegistry standardRegistry = new StandardServiceRegistryBuilder()
                 .applySetting(AvailableSettings.DIALECT, dialect)
-                .applySetting(HibernateDatabase.HIBERNATE_TEMP_USE_JDBC_METADATA_DEFAULTS, Boolean.FALSE.toString())
                 .addService(ConnectionProvider.class, new NoOpConnectionProvider())
                 .addService(MultiTenantConnectionProvider.class, new NoOpConnectionProvider())
                 .build();
diff --git a/src/main/java/liquibase/ext/hibernate/database/HibernateEjb3Database.java b/src/main/java/liquibase/ext/hibernate/database/HibernateEjb3Database.java
index 08b59c8e..bc6dd918 100644
--- a/src/main/java/liquibase/ext/hibernate/database/HibernateEjb3Database.java
+++ b/src/main/java/liquibase/ext/hibernate/database/HibernateEjb3Database.java
@@ -77,7 +77,6 @@ protected EntityManagerFactoryBuilderImpl createEntityManagerFactoryBuilder() {
         MyHibernatePersistenceProvider persistenceProvider = new MyHibernatePersistenceProvider();
 
         Map<String, Object> properties = new HashMap<>();
-        properties.put(HibernateDatabase.HIBERNATE_TEMP_USE_JDBC_METADATA_DEFAULTS, Boolean.FALSE.toString());
         properties.put(AvailableSettings.USE_SECOND_LEVEL_CACHE, Boolean.FALSE.toString());
         properties.put(AvailableSettings.USE_NATIONALIZED_CHARACTER_DATA, getProperty(AvailableSettings.USE_NATIONALIZED_CHARACTER_DATA));
 
diff --git a/src/main/java/liquibase/ext/hibernate/database/HibernateSpringPackageDatabase.java b/src/main/java/liquibase/ext/hibernate/database/HibernateSpringPackageDatabase.java
index 1ae71d85..855de26e 100644
--- a/src/main/java/liquibase/ext/hibernate/database/HibernateSpringPackageDatabase.java
+++ b/src/main/java/liquibase/ext/hibernate/database/HibernateSpringPackageDatabase.java
@@ -91,7 +91,6 @@ protected EntityManagerFactoryBuilderImpl createEntityManagerFactoryBuilder() {
 
         Map<String, String> map = new HashMap<>();
         map.put(AvailableSettings.DIALECT, getProperty(AvailableSettings.DIALECT));
-        map.put(HibernateDatabase.HIBERNATE_TEMP_USE_JDBC_METADATA_DEFAULTS, Boolean.FALSE.toString());
         map.put(AvailableSettings.USE_SECOND_LEVEL_CACHE, Boolean.FALSE.toString());
         map.put(AvailableSettings.PHYSICAL_NAMING_STRATEGY, getHibernateConnection().getProperties().getProperty(AvailableSettings.PHYSICAL_NAMING_STRATEGY));
         map.put(AvailableSettings.IMPLICIT_NAMING_STRATEGY, getHibernateConnection().getProperties().getProperty(AvailableSettings.IMPLICIT_NAMING_STRATEGY));
diff --git a/src/main/java/liquibase/ext/hibernate/database/JpaPersistenceDatabase.java b/src/main/java/liquibase/ext/hibernate/database/JpaPersistenceDatabase.java
index 1b8f928d..5ed10dc1 100644
--- a/src/main/java/liquibase/ext/hibernate/database/JpaPersistenceDatabase.java
+++ b/src/main/java/liquibase/ext/hibernate/database/JpaPersistenceDatabase.java
@@ -1,6 +1,6 @@
 package liquibase.ext.hibernate.database;
 
-import java.util.Map;
+import java.util.Collections;
 
 import org.hibernate.jpa.boot.internal.EntityManagerFactoryBuilderImpl;
 import org.hibernate.jpa.boot.spi.Bootstrap;
@@ -50,8 +50,7 @@ protected EntityManagerFactoryBuilderImpl createEntityManagerFactoryBuilder() {
         internalPersistenceUnitManager.preparePersistenceUnitInfos();
         PersistenceUnitInfo persistenceUnitInfo = internalPersistenceUnitManager.obtainDefaultPersistenceUnitInfo();
 
-        EntityManagerFactoryBuilderImpl builder = (EntityManagerFactoryBuilderImpl) Bootstrap.getEntityManagerFactoryBuilder(persistenceUnitInfo, Map.of(
-                HibernateDatabase.HIBERNATE_TEMP_USE_JDBC_METADATA_DEFAULTS, Boolean.FALSE.toString()));
+        EntityManagerFactoryBuilderImpl builder = (EntityManagerFactoryBuilderImpl) Bootstrap.getEntityManagerFactoryBuilder(persistenceUnitInfo, Collections.emptyMap());
         return builder;
     }