diff --git a/batch-boot-jpa-sample/src/main/resources/application.properties b/batch-boot-jpa-sample/src/main/resources/application.properties
index 2e6b8f476..dc6a33da5 100644
--- a/batch-boot-jpa-sample/src/main/resources/application.properties
+++ b/batch-boot-jpa-sample/src/main/resources/application.properties
@@ -14,6 +14,8 @@ spring.jpa.show-sql=false
 spring.jpa.open-in-view=false
 spring.data.jpa.repositories.bootstrap-mode=deferred
 spring.datasource.hikari.auto-commit=false
+spring.datasource.hikari.pool-name=HikariPool-${spring.application.name}
+spring.datasource.hikari.data-source-properties.ApplicationName=${spring.application.name}
 spring.jpa.hibernate.ddl-auto=none
 #spring.jpa.properties.hibernate.format_sql=true
 spring.jpa.properties.hibernate.jdbc.time_zone=UTC
diff --git a/r2dbc/boot-r2dbc-sample/pom.xml b/r2dbc/boot-r2dbc-sample/pom.xml
index 42abd7e92..fbe06d203 100644
--- a/r2dbc/boot-r2dbc-sample/pom.xml
+++ b/r2dbc/boot-r2dbc-sample/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>3.2.4</version>
+        <version>3.3.0-M3</version>
         <relativePath/> <!-- lookup parent from repository -->
     </parent>
     <groupId>com.example.bootr2dbc</groupId>
diff --git a/r2dbc/boot-r2dbc-sample/src/test/java/com/example/bootr2dbc/TestApplication.java b/r2dbc/boot-r2dbc-sample/src/test/java/com/example/bootr2dbc/TestApplication.java
index 254d82d36..11c9bc78f 100644
--- a/r2dbc/boot-r2dbc-sample/src/test/java/com/example/bootr2dbc/TestApplication.java
+++ b/r2dbc/boot-r2dbc-sample/src/test/java/com/example/bootr2dbc/TestApplication.java
@@ -12,7 +12,7 @@ public class TestApplication {
     @Bean
     @ServiceConnection
     PostgreSQLContainer<?> postgreSQLContainer() {
-        return new PostgreSQLContainer<>("postgres:16.0-alpine");
+        return new PostgreSQLContainer<>("postgres:16.2-alpine");
     }
 
     public static void main(String[] args) {