diff --git a/core/store/primitives/src/main/java/org/onosproject/store/primitives/impl/StoragePartitionClient.java b/core/store/primitives/src/main/java/org/onosproject/store/primitives/impl/StoragePartitionClient.java
index a768a4f..999e694 100644
--- a/core/store/primitives/src/main/java/org/onosproject/store/primitives/impl/StoragePartitionClient.java
+++ b/core/store/primitives/src/main/java/org/onosproject/store/primitives/impl/StoragePartitionClient.java
@@ -63,13 +63,15 @@
  */
 public class StoragePartitionClient implements DistributedPrimitiveCreator, Managed<StoragePartitionClient> {
 
+    private static final int MAX_RETRIES = 8;
+    private static final String ATOMIC_VALUES_CONSISTENT_MAP_NAME = "onos-atomic-values";
+
     private final Logger log = getLogger(getClass());
 
     private final StoragePartition partition;
     private final MemberId localMemberId;
     private final RaftClientProtocol protocol;
     private RaftClient client;
-    private static final String ATOMIC_VALUES_CONSISTENT_MAP_NAME = "onos-atomic-values";
     private final com.google.common.base.Supplier<AsyncConsistentMap<String, byte[]>> onosAtomicValuesMap =
             Suppliers.memoize(() -> newAsyncConsistentMap(ATOMIC_VALUES_CONSISTENT_MAP_NAME,
                                                           Serializer.using(KryoNamespaces.BASIC)));
@@ -110,7 +112,7 @@
                         .withReadConsistency(ReadConsistency.SEQUENTIAL)
                         .withCommunicationStrategy(CommunicationStrategy.ANY)
                         .withTimeout(Duration.ofSeconds(30))
-                        .withMaxRetries(5)
+                        .withMaxRetries(MAX_RETRIES)
                         .build()
                         .open()
                         .join());
@@ -135,7 +137,7 @@
                         .withReadConsistency(ReadConsistency.SEQUENTIAL)
                         .withCommunicationStrategy(CommunicationStrategy.ANY)
                         .withTimeout(Duration.ofSeconds(30))
-                        .withMaxRetries(5)
+                        .withMaxRetries(MAX_RETRIES)
                         .build()
                         .open()
                         .join());
@@ -159,7 +161,7 @@
                         .withReadConsistency(ReadConsistency.SEQUENTIAL)
                         .withCommunicationStrategy(CommunicationStrategy.ANY)
                         .withTimeout(Duration.ofSeconds(30))
-                        .withMaxRetries(5)
+                        .withMaxRetries(MAX_RETRIES)
                         .build()
                         .open()
                         .join());
@@ -189,7 +191,7 @@
                 .withReadConsistency(ReadConsistency.LINEARIZABLE_LEASE)
                 .withCommunicationStrategy(CommunicationStrategy.LEADER)
                 .withTimeout(Duration.ofSeconds(30))
-                .withMaxRetries(5)
+                .withMaxRetries(MAX_RETRIES)
                 .build()
                 .open()
                 .join());
@@ -211,7 +213,7 @@
                 .withReadConsistency(ReadConsistency.LINEARIZABLE_LEASE)
                 .withCommunicationStrategy(CommunicationStrategy.LEADER)
                 .withTimeout(Duration.ofSeconds(30))
-                .withMaxRetries(5)
+                .withMaxRetries(MAX_RETRIES)
                 .build()
                 .open()
                 .join());
@@ -235,7 +237,7 @@
                 .withReadConsistency(ReadConsistency.LINEARIZABLE_LEASE)
                 .withCommunicationStrategy(CommunicationStrategy.LEADER)
                 .withTimeout(Duration.ofSeconds(5))
-                .withMaxRetries(5)
+                .withMaxRetries(MAX_RETRIES)
                 .build()
                 .open()
                 .join());
@@ -250,7 +252,7 @@
                 .withReadConsistency(ReadConsistency.SEQUENTIAL)
                 .withCommunicationStrategy(CommunicationStrategy.ANY)
                 .withTimeout(Duration.ofSeconds(30))
-                .withMaxRetries(5)
+                .withMaxRetries(MAX_RETRIES)
                 .build()
                 .open()
                 .join());
@@ -266,7 +268,7 @@
                 .withCommunicationStrategy(CommunicationStrategy.LEADER)
                 .withMinTimeout(Duration.ofSeconds(1))
                 .withMaxTimeout(Duration.ofSeconds(5))
-                .withMaxRetries(5)
+                .withMaxRetries(MAX_RETRIES)
                 .build()
                 .open()
                 .join());