diff --git a/gravitee-apim-repository/gravitee-apim-repository-hazelcast/src/main/java/io/gravitee/repository/hazelcast/ratelimit/HazelcastRateLimitRepository.java b/gravitee-apim-repository/gravitee-apim-repository-hazelcast/src/main/java/io/gravitee/repository/hazelcast/ratelimit/HazelcastRateLimitRepository.java
index 8ef90ad936..514099f15f 100644
--- a/gravitee-apim-repository/gravitee-apim-repository-hazelcast/src/main/java/io/gravitee/repository/hazelcast/ratelimit/HazelcastRateLimitRepository.java
+++ b/gravitee-apim-repository/gravitee-apim-repository-hazelcast/src/main/java/io/gravitee/repository/hazelcast/ratelimit/HazelcastRateLimitRepository.java
@@ -16,14 +16,16 @@
 package io.gravitee.repository.hazelcast.ratelimit;
 
 import com.hazelcast.core.HazelcastInstance;
-import com.hazelcast.core.IMap;
+import com.hazelcast.map.IMap;
 import io.gravitee.repository.hazelcast.ratelimit.configuration.HazelcastRateLimitConfiguration;
 import io.gravitee.repository.ratelimit.api.RateLimitRepository;
 import io.gravitee.repository.ratelimit.model.RateLimit;
-import io.reactivex.*;
+import io.reactivex.Completable;
+import io.reactivex.Maybe;
+import io.reactivex.Single;
+import io.reactivex.SingleSource;
 import io.reactivex.functions.Function;
 import io.reactivex.schedulers.Schedulers;
-import java.util.concurrent.Callable;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.locks.Lock;
 import java.util.function.Supplier;
@@ -53,7 +55,7 @@ public void afterPropertiesSet() {
     public Single<RateLimit> incrementAndGet(String key, long weight, Supplier<RateLimit> supplier) {
         final long now = System.currentTimeMillis();
 
-        Lock lock = hazelcastInstance.getLock("lock-rl-" + key);
+        Lock lock = hazelcastInstance.getCPSubsystem().getLock("lock-rl-" + key);
 
         return Completable
             .create(
@@ -67,7 +69,7 @@ public Single<RateLimit> incrementAndGet(String key, long weight, Supplier<RateL
                 Single.defer(
                     () ->
                         Maybe
-                            .fromFuture(counters.getAsync(key))
+                            .fromFuture(counters.getAsync(key).toCompletableFuture())
                             .switchIfEmpty((SingleSource<RateLimit>) observer -> observer.onSuccess(supplier.get()))
                             .flatMap(
                                 (Function<RateLimit, SingleSource<RateLimit>>) rateLimit -> {
@@ -81,12 +83,14 @@ public Single<RateLimit> incrementAndGet(String key, long weight, Supplier<RateL
 
                                     return Completable
                                         .fromFuture(
-                                            counters.setAsync(
-                                                rateLimit.getKey(),
-                                                rateLimit,
-                                                now - rateLimit.getResetTime(),
-                                                TimeUnit.MILLISECONDS
-                                            )
+                                            counters
+                                                .setAsync(
+                                                    rateLimit.getKey(),
+                                                    rateLimit,
+                                                    now - rateLimit.getResetTime(),
+                                                    TimeUnit.MILLISECONDS
+                                                )
+                                                .toCompletableFuture()
                                         )
                                         .andThen(Single.defer(() -> Single.just(finalRateLimit)))
                                         .doFinally(lock::unlock);
diff --git a/pom.xml b/pom.xml
index ad5fb3d043..c6e2a7da0a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -83,7 +83,7 @@
         <gson.version>2.7</gson.version>
         <guava.version>30.1.1-jre</guava.version>
         <hamcrest.version>1.3</hamcrest.version>
-        <hazelcast.version>3.12.9</hazelcast.version>
+        <hazelcast.version>4.1.1</hazelcast.version>
         <imageio.version>3.7.0</imageio.version>
         <jackson-mapper-asl.version>1.9.13</jackson-mapper-asl.version>
         <java-jwt.version>3.10.2</java-jwt.version>