diff --git a/pom.xml b/pom.xml
index 5e1deca0..c16820af 100644
--- a/pom.xml
+++ b/pom.xml
@@ -31,8 +31,10 @@
         <spring-cloud-starter-bootstrap>4.1.2</spring-cloud-starter-bootstrap>
         <maven.javadoc.plugin>3.3.0</maven.javadoc.plugin>
         <maven.gpg.plugin>1.6</maven.gpg.plugin>
-        <aerospike-client-jdk8>8.1.2</aerospike-client-jdk8>
-        <aerospike-reactor-client>8.1.2</aerospike-reactor-client>
+<!--        <aerospike-client-jdk8>8.1.2</aerospike-client-jdk8>-->
+<!--        <aerospike-reactor-client>8.1.2</aerospike-reactor-client>-->
+        <aerospike-client>7.2.1</aerospike-client>
+        <aerospike-reactor-client>7.1.0</aerospike-reactor-client>
         <aerospike-proxy-client>8.1.2</aerospike-proxy-client>
         <reactor-test>3.6.1</reactor-test>
         <embedded-aerospike>3.1.6</embedded-aerospike>
@@ -193,10 +195,15 @@
                 <version>${springdata.spring-boot}</version>
                 <scope>compile</scope>
             </dependency>
+<!--            <dependency>-->
+<!--                <groupId>com.aerospike</groupId>-->
+<!--                <artifactId>aerospike-client-jdk8</artifactId>-->
+<!--                <version>${aerospike-client-jdk8}</version>-->
+<!--            </dependency>-->
             <dependency>
                 <groupId>com.aerospike</groupId>
-                <artifactId>aerospike-client-jdk8</artifactId>
-                <version>${aerospike-client-jdk8}</version>
+                <artifactId>aerospike-client</artifactId>
+                <version>${aerospike-client}</version>
             </dependency>
             <dependency>
                 <groupId>com.aerospike</groupId>
@@ -252,9 +259,13 @@
             <groupId>org.springframework</groupId>
             <artifactId>spring-tx</artifactId>
         </dependency>
+<!--        <dependency>-->
+<!--            <groupId>com.aerospike</groupId>-->
+<!--            <artifactId>aerospike-client-jdk8</artifactId>-->
+<!--        </dependency>-->
         <dependency>
             <groupId>com.aerospike</groupId>
-            <artifactId>aerospike-client-jdk8</artifactId>
+            <artifactId>aerospike-client</artifactId>
         </dependency>
         <dependency>
             <groupId>com.aerospike</groupId>
diff --git a/src/test/java/org/springframework/data/aerospike/core/AerospikeTemplateSaveTests.java b/src/test/java/org/springframework/data/aerospike/core/AerospikeTemplateSaveTests.java
index fca35c75..b774a2b5 100644
--- a/src/test/java/org/springframework/data/aerospike/core/AerospikeTemplateSaveTests.java
+++ b/src/test/java/org/springframework/data/aerospike/core/AerospikeTemplateSaveTests.java
@@ -403,7 +403,7 @@ public void shouldSaveAllVersionedDocumentsIfDuplicatesNotWithinOneBatch() {
             assertThat(newFirst.getVersion()).isSameAs(0);
             assertThat(newSecond.getVersion()).isSameAs(0);
 
-            template.saveAll(List.of(newFirst, newSecond));
+            template.saveAll(List.of(newFirst, newSecond)); // OptimisticLockingFailure Failed to save the record with ID 'newId2' due to versions mismatch
             assertThat(newFirst.getVersion()).isSameAs(1);
             assertThat(newSecond.getVersion()).isSameAs(1);