diff --git a/schemacrawler-jdbc-drivers/pom.xml b/schemacrawler-jdbc-drivers/pom.xml
index e7cc679e09..44f6ede403 100644
--- a/schemacrawler-jdbc-drivers/pom.xml
+++ b/schemacrawler-jdbc-drivers/pom.xml
@@ -19,7 +19,7 @@
     <dependency>
       <groupId>org.postgresql</groupId>
       <artifactId>postgresql</artifactId>
-      <version>42.6.0</version>
+      <version>42.7.0</version>
     </dependency>
     <dependency>
       <groupId>com.mysql</groupId>
diff --git a/schemacrawler-postgresql/pom.xml b/schemacrawler-postgresql/pom.xml
index e7a52bd836..f960f34111 100644
--- a/schemacrawler-postgresql/pom.xml
+++ b/schemacrawler-postgresql/pom.xml
@@ -65,7 +65,7 @@
     <dependency>
       <groupId>org.postgresql</groupId>
       <artifactId>postgresql</artifactId>
-      <version>42.6.0</version>
+      <version>42.7.0</version>
     </dependency>
 
     <dependency>
diff --git a/schemacrawler-postgresql/src/test/resources/testPostgreSQL15WithConnection.8.txt b/schemacrawler-postgresql/src/test/resources/testPostgreSQL15WithConnection.8.txt
index 0745ba2aef..f7db4dd321 100644
--- a/schemacrawler-postgresql/src/test/resources/testPostgreSQL15WithConnection.8.txt
+++ b/schemacrawler-postgresql/src/test/resources/testPostgreSQL15WithConnection.8.txt
@@ -3,10 +3,10 @@
 System Information
 ========================================================================
 
-generated by                              SchemaCrawler 16.20.4         
-generated on                              2023-10-14 14:29:05           
+generated by                              SchemaCrawler 16.20.6         
+generated on                              2023-11-21 21:37:15           
 database version                          PostgreSQL 15.4               
-driver version                            PostgreSQL JDBC Driver 42.6.0 
+driver version                            PostgreSQL JDBC Driver 42.7.0 
 
 
 
@@ -3466,7 +3466,7 @@ all tables are selectable                 true
 auto commit failure closes all result sets  false                         
 catalog separator                         .                             
 catalog term                              database                      
-catalogs                                  test                          
+catalogs                                  postgres, template1, test     
 client info properties                    ApplicationName               
 data definition causes transaction commit  false                         
 data definition ignored in transactions   false                         
@@ -3478,7 +3478,7 @@ deletes are detected for TYPE_SCROLL_INSENSITIVE result sets  false
 deletes are detected for TYPE_SCROLL_SENSITIVE result sets  false                         
 does max row size include blobs           false                         
 driver major version                      42                            
-driver minor version                      6                             
+driver minor version                      7                             
 extra name characters                                                   
 generated key always returned             true                          
 identifier quote string                   "                             
@@ -3628,9 +3628,9 @@ uses local files                          false
 
 JDBC Driver Information
 -=--=--=--=--=--=--=--=--=--=--=--=--=--=--=--=--=--=--=--=--=--=--=--=-
-connection url                            jdbc:postgresql://localhost:50607/test?loggerLevel=OFF
+connection url                            jdbc:postgresql://localhost:54898/test?loggerLevel=OFF
 driver name                               PostgreSQL JDBC Driver        
-driver version                            42.6.0                        
+driver version                            42.7.0                        
 driver class name                         org.postgresql.Driver         
 is JDBC compliant                         false                         
 supported JDBC version                    4.2                           
@@ -3846,7 +3846,7 @@ PGHOST                                                 [driver property]
 PGPORT                                                 [driver property]
   Port of the PostgreSQL server (may be specified directly in the JDBC URL)
   not required
-  value                             50607                       
+  value                             54898                       
 
 preferQueryMode                                        [driver property]
   Specifies which mode is used to execute queries to database: simple means ('Q' execute, no parse, no bind, text mode only), extended means always use bind/execute messages, extendedForPrepared means extended for prepared statements only, extendedCacheEverything means use extended protocol and try cache every statement (including Statement.execute(String sql)) in a query cache.
diff --git a/schemacrawler-postgresql/src/test/resources/testPostgreSQL15WithConnection.LTE.txt b/schemacrawler-postgresql/src/test/resources/testPostgreSQL15WithConnection.LTE.txt
index d3286bb00d..33d8881660 100644
--- a/schemacrawler-postgresql/src/test/resources/testPostgreSQL15WithConnection.LTE.txt
+++ b/schemacrawler-postgresql/src/test/resources/testPostgreSQL15WithConnection.LTE.txt
@@ -3,10 +3,10 @@
 System Information
 ========================================================================
 
-generated by                              SchemaCrawler 16.20.4         
-generated on                              2023-10-14 14:33:08           
+generated by                              SchemaCrawler 16.20.6         
+generated on                              2023-11-21 21:37:37           
 database version                          PostgreSQL 15.4               
-driver version                            PostgreSQL JDBC Driver 42.6.0 
+driver version                            PostgreSQL JDBC Driver 42.7.0 
 
 
 
@@ -3466,7 +3466,7 @@ all tables are selectable                 true
 auto commit failure closes all result sets  false                         
 catalog separator                         .                             
 catalog term                              database                      
-catalogs                                  test                          
+catalogs                                  postgres, template1, test     
 client info properties                    ApplicationName               
 data definition causes transaction commit  false                         
 data definition ignored in transactions   false                         
@@ -3478,7 +3478,7 @@ deletes are detected for TYPE_SCROLL_INSENSITIVE result sets  false
 deletes are detected for TYPE_SCROLL_SENSITIVE result sets  false                         
 does max row size include blobs           false                         
 driver major version                      42                            
-driver minor version                      6                             
+driver minor version                      7                             
 extra name characters                                                   
 generated key always returned             true                          
 identifier quote string                   "                             
@@ -3629,9 +3629,9 @@ uses local files                          false
 
 JDBC Driver Information
 -=--=--=--=--=--=--=--=--=--=--=--=--=--=--=--=--=--=--=--=--=--=--=--=-
-connection url                            jdbc:postgresql://localhost:51029/test?loggerLevel=OFF
+connection url                            jdbc:postgresql://localhost:54970/test?loggerLevel=OFF
 driver name                               PostgreSQL JDBC Driver        
-driver version                            42.6.0                        
+driver version                            42.7.0                        
 driver class name                         org.postgresql.Driver         
 is JDBC compliant                         false                         
 supported JDBC version                    4.2                           
@@ -3847,7 +3847,7 @@ PGHOST                                                 [driver property]
 PGPORT                                                 [driver property]
   Port of the PostgreSQL server (may be specified directly in the JDBC URL)
   not required
-  value                             51029                       
+  value                             54970                       
 
 preferQueryMode                                        [driver property]
   Specifies which mode is used to execute queries to database: simple means ('Q' execute, no parse, no bind, text mode only), extended means always use bind/execute messages, extendedForPrepared means extended for prepared statements only, extendedCacheEverything means use extended protocol and try cache every statement (including Statement.execute(String sql)) in a query cache.
diff --git a/schemacrawler-postgresql/src/test/resources/testPostgreSQLWithConnection.8.txt b/schemacrawler-postgresql/src/test/resources/testPostgreSQLWithConnection.8.txt
index db521e9e9a..bfcb9c41e7 100644
--- a/schemacrawler-postgresql/src/test/resources/testPostgreSQLWithConnection.8.txt
+++ b/schemacrawler-postgresql/src/test/resources/testPostgreSQLWithConnection.8.txt
@@ -3,10 +3,10 @@
 System Information
 ========================================================================
 
-generated by                              SchemaCrawler 16.20.4         
-generated on                              2023-10-14 14:29:11           
+generated by                              SchemaCrawler 16.20.6         
+generated on                              2023-11-21 21:37:26           
 database version                          PostgreSQL 12.16              
-driver version                            PostgreSQL JDBC Driver 42.6.0 
+driver version                            PostgreSQL JDBC Driver 42.7.0 
 
 
 
@@ -2082,7 +2082,7 @@ all tables are selectable                 true
 auto commit failure closes all result sets  false                         
 catalog separator                         .                             
 catalog term                              database                      
-catalogs                                  test                          
+catalogs                                  postgres, template1, test     
 client info properties                    ApplicationName               
 data definition causes transaction commit  false                         
 data definition ignored in transactions   false                         
@@ -2094,7 +2094,7 @@ deletes are detected for TYPE_SCROLL_INSENSITIVE result sets  false
 deletes are detected for TYPE_SCROLL_SENSITIVE result sets  false                         
 does max row size include blobs           false                         
 driver major version                      42                            
-driver minor version                      6                             
+driver minor version                      7                             
 extra name characters                                                   
 generated key always returned             true                          
 identifier quote string                   "                             
@@ -2244,9 +2244,9 @@ uses local files                          false
 
 JDBC Driver Information
 -=--=--=--=--=--=--=--=--=--=--=--=--=--=--=--=--=--=--=--=--=--=--=--=-
-connection url                            jdbc:postgresql://localhost:50651/test?loggerLevel=OFF
+connection url                            jdbc:postgresql://localhost:54920/test?loggerLevel=OFF
 driver name                               PostgreSQL JDBC Driver        
-driver version                            42.6.0                        
+driver version                            42.7.0                        
 driver class name                         org.postgresql.Driver         
 is JDBC compliant                         false                         
 supported JDBC version                    4.2                           
@@ -2462,7 +2462,7 @@ PGHOST                                                 [driver property]
 PGPORT                                                 [driver property]
   Port of the PostgreSQL server (may be specified directly in the JDBC URL)
   not required
-  value                             50651                       
+  value                             54920                       
 
 preferQueryMode                                        [driver property]
   Specifies which mode is used to execute queries to database: simple means ('Q' execute, no parse, no bind, text mode only), extended means always use bind/execute messages, extendedForPrepared means extended for prepared statements only, extendedCacheEverything means use extended protocol and try cache every statement (including Statement.execute(String sql)) in a query cache.
diff --git a/schemacrawler-postgresql/src/test/resources/testPostgreSQLWithConnection.LTE.txt b/schemacrawler-postgresql/src/test/resources/testPostgreSQLWithConnection.LTE.txt
index ceee9b2cc6..80986b8a3c 100644
--- a/schemacrawler-postgresql/src/test/resources/testPostgreSQLWithConnection.LTE.txt
+++ b/schemacrawler-postgresql/src/test/resources/testPostgreSQLWithConnection.LTE.txt
@@ -3,10 +3,10 @@
 System Information
 ========================================================================
 
-generated by                              SchemaCrawler 16.20.4         
-generated on                              2023-10-14 14:33:16           
+generated by                              SchemaCrawler 16.20.6         
+generated on                              2023-11-21 21:37:48           
 database version                          PostgreSQL 12.16              
-driver version                            PostgreSQL JDBC Driver 42.6.0 
+driver version                            PostgreSQL JDBC Driver 42.7.0 
 
 
 
@@ -2082,7 +2082,7 @@ all tables are selectable                 true
 auto commit failure closes all result sets  false                         
 catalog separator                         .                             
 catalog term                              database                      
-catalogs                                  test                          
+catalogs                                  postgres, template1, test     
 client info properties                    ApplicationName               
 data definition causes transaction commit  false                         
 data definition ignored in transactions   false                         
@@ -2094,7 +2094,7 @@ deletes are detected for TYPE_SCROLL_INSENSITIVE result sets  false
 deletes are detected for TYPE_SCROLL_SENSITIVE result sets  false                         
 does max row size include blobs           false                         
 driver major version                      42                            
-driver minor version                      6                             
+driver minor version                      7                             
 extra name characters                                                   
 generated key always returned             true                          
 identifier quote string                   "                             
@@ -2245,9 +2245,9 @@ uses local files                          false
 
 JDBC Driver Information
 -=--=--=--=--=--=--=--=--=--=--=--=--=--=--=--=--=--=--=--=--=--=--=--=-
-connection url                            jdbc:postgresql://localhost:51050/test?loggerLevel=OFF
+connection url                            jdbc:postgresql://localhost:54992/test?loggerLevel=OFF
 driver name                               PostgreSQL JDBC Driver        
-driver version                            42.6.0                        
+driver version                            42.7.0                        
 driver class name                         org.postgresql.Driver         
 is JDBC compliant                         false                         
 supported JDBC version                    4.2                           
@@ -2463,7 +2463,7 @@ PGHOST                                                 [driver property]
 PGPORT                                                 [driver property]
   Port of the PostgreSQL server (may be specified directly in the JDBC URL)
   not required
-  value                             51050                       
+  value                             54992                       
 
 preferQueryMode                                        [driver property]
   Specifies which mode is used to execute queries to database: simple means ('Q' execute, no parse, no bind, text mode only), extended means always use bind/execute messages, extendedForPrepared means extended for prepared statements only, extendedCacheEverything means use extended protocol and try cache every statement (including Statement.execute(String sql)) in a query cache.