diff --git a/persistence-modules/spring-boot-persistence-2/pom.xml b/persistence-modules/spring-boot-persistence-2/pom.xml
index 260c558875d7..6bca6df2b90c 100644
--- a/persistence-modules/spring-boot-persistence-2/pom.xml
+++ b/persistence-modules/spring-boot-persistence-2/pom.xml
@@ -111,19 +111,10 @@
             <artifactId>hsqldb</artifactId>
         </dependency>
         <dependency>
-            <groupId>com.oracle.database.jdbc</groupId>
-            <artifactId>ojdbc8</artifactId>
-            <version>${oracle-database.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>com.oracle.database.ha</groupId>
-            <artifactId>ons</artifactId>
-            <version>${oracle-database.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>com.oracle.database.jdbc</groupId>
-            <artifactId>ucp</artifactId>
-            <version>${oracle-database.version}</version>
+            <groupId>com.oracle.database.spring</groupId>
+            <artifactId>oracle-spring-boot-starter-ucp</artifactId>
+            <version>3.1.0</version>   <!-- or 2.7.7 for Spring Boot 2.x -->
+            <type>pom</type>
         </dependency>
     </dependencies>
 
diff --git a/persistence-modules/spring-boot-persistence-2/src/test/java/com/baeldung/spring/oracle/pooling/SpringOraclePoolingApplicationOracleUCPLiveTest.java b/persistence-modules/spring-boot-persistence-2/src/test/java/com/baeldung/spring/oracle/pooling/SpringOraclePoolingApplicationOracleUCPLiveTest.java
index aa448bc44ae6..6ef780fcef07 100644
--- a/persistence-modules/spring-boot-persistence-2/src/test/java/com/baeldung/spring/oracle/pooling/SpringOraclePoolingApplicationOracleUCPLiveTest.java
+++ b/persistence-modules/spring-boot-persistence-2/src/test/java/com/baeldung/spring/oracle/pooling/SpringOraclePoolingApplicationOracleUCPLiveTest.java
@@ -15,7 +15,7 @@
 @RunWith(SpringRunner.class)
 @SpringBootTest(classes = {SpringOraclePoolingApplication.class})
 @ActiveProfiles({"oracle-pooling-basic"})
-@TestPropertySource(properties = "spring.datasource.type=oracle.ucp.jdbc.UCPDataSource")
+@TestPropertySource(properties = "spring.datasource.type=oracle.ucp.jdbc.PoolDataSource")
 public class SpringOraclePoolingApplicationOracleUCPLiveTest {
     
     @Autowired
@@ -23,8 +23,7 @@ public class SpringOraclePoolingApplicationOracleUCPLiveTest {
     
     @Test    
     public void givenOracleUCPConfiguration_thenBuildsOraclePoolDataSource() {
-        assertTrue(dataSource instanceof oracle.ucp.jdbc.UCPDataSource);
+        assertTrue(dataSource instanceof oracle.ucp.jdbc.PoolDataSource);
     }
 
-    
 }