diff --git a/spring-cloud-kubernetes-fabric8-leader/src/main/java/org/springframework/cloud/kubernetes/fabric8/leader/election/Fabric8LeaderElectionInitiatorUtil.java b/spring-cloud-kubernetes-commons/src/main/java/org/springframework/cloud/kubernetes/commons/leader/election/LeaderElectionInitiatorUtil.java
similarity index 63%
rename from spring-cloud-kubernetes-fabric8-leader/src/main/java/org/springframework/cloud/kubernetes/fabric8/leader/election/Fabric8LeaderElectionInitiatorUtil.java
rename to spring-cloud-kubernetes-commons/src/main/java/org/springframework/cloud/kubernetes/commons/leader/election/LeaderElectionInitiatorUtil.java
index e3a97ee59..a5cc7a3a4 100644
--- a/spring-cloud-kubernetes-fabric8-leader/src/main/java/org/springframework/cloud/kubernetes/fabric8/leader/election/Fabric8LeaderElectionInitiatorUtil.java
+++ b/spring-cloud-kubernetes-commons/src/main/java/org/springframework/cloud/kubernetes/commons/leader/election/LeaderElectionInitiatorUtil.java
@@ -14,32 +14,51 @@
  * limitations under the License.
  */
 
-package org.springframework.cloud.kubernetes.fabric8.leader.election;
+package org.springframework.cloud.kubernetes.commons.leader.election;
 
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.TimeUnit;
 
-import io.fabric8.kubernetes.client.KubernetesClient;
-import io.fabric8.kubernetes.client.extended.leaderelection.LeaderElectionConfig;
-import io.fabric8.kubernetes.client.extended.leaderelection.LeaderElector;
-
-import org.springframework.cloud.kubernetes.commons.leader.election.LeaderElectionProperties;
 import org.springframework.core.log.LogAccessor;
 
-final class Fabric8LeaderElectionInitiatorUtil {
+/**
+ * @author wind57
+ */
+public final class LeaderElectionInitiatorUtil {
+
+	private static final LogAccessor LOG = new LogAccessor(LeaderElectionInitiatorUtil.class);
 
-	private static final LogAccessor LOG = new LogAccessor(Fabric8LeaderElectionInitiatorUtil.class);
+	private LeaderElectionInitiatorUtil() {
 
-	private Fabric8LeaderElectionInitiatorUtil() {
+	}
 
+	public static void blockReadinessCheck(CompletableFuture<?> ready) {
+		try {
+			ready.get();
+		}
+		catch (Exception e) {
+			LOG.error(e, () -> "block readiness check failed with : " + e.getMessage());
+			throw new RuntimeException(e);
+		}
+	}
+
+	public static void shutDownExecutor(ExecutorService podReadyWaitingExecutor, String candidateIdentity) {
+		LOG.debug(() -> "podReadyWaitingExecutor will be shutdown for : " + candidateIdentity);
+		podReadyWaitingExecutor.shutdownNow();
+		try {
+			podReadyWaitingExecutor.awaitTermination(3, TimeUnit.SECONDS);
+		}
+		catch (InterruptedException e) {
+			Thread.currentThread().interrupt();
+		}
 	}
 
 	/**
 	 * if 'ready' is already completed at this point, thread will run this, otherwise it
 	 * will attach the pipeline and move on to 'blockReadinessCheck'.
 	 */
-	static CompletableFuture<?> attachReadinessLoggerPipeline(CompletableFuture<?> innerPodReadyFuture,
+	public static CompletableFuture<?> attachReadinessLoggerPipeline(CompletableFuture<?> innerPodReadyFuture,
 			String candidateIdentity) {
 		return innerPodReadyFuture.whenComplete((ok, error) -> {
 			if (error != null) {
@@ -51,7 +70,7 @@ static CompletableFuture<?> attachReadinessLoggerPipeline(CompletableFuture<?> i
 		});
 	}
 
-	static void sleep(LeaderElectionProperties leaderElectionProperties) {
+	public static void sleep(LeaderElectionProperties leaderElectionProperties) {
 		try {
 			TimeUnit.SECONDS.sleep(leaderElectionProperties.waitAfterRenewalFailure().toSeconds());
 		}
@@ -60,29 +79,4 @@ static void sleep(LeaderElectionProperties leaderElectionProperties) {
 		}
 	}
 
-	static LeaderElector leaderElector(LeaderElectionConfig config, KubernetesClient fabric8KubernetesClient) {
-		return fabric8KubernetesClient.leaderElector().withConfig(config).build();
-	}
-
-	static void blockReadinessCheck(CompletableFuture<?> ready) {
-		try {
-			ready.get();
-		}
-		catch (Exception e) {
-			LOG.error(e, () -> "block readiness check failed with : " + e.getMessage());
-			throw new RuntimeException(e);
-		}
-	}
-
-	static void shutDownExecutor(ExecutorService podReadyWaitingExecutor, String candidateIdentity) {
-		LOG.debug(() -> "podReadyWaitingExecutor will be shutdown for : " + candidateIdentity);
-		podReadyWaitingExecutor.shutdownNow();
-		try {
-			podReadyWaitingExecutor.awaitTermination(3, TimeUnit.SECONDS);
-		}
-		catch (InterruptedException e) {
-			Thread.currentThread().interrupt();
-		}
-	}
-
 }
diff --git a/spring-cloud-kubernetes-fabric8-leader/src/main/java/org/springframework/cloud/kubernetes/fabric8/leader/election/Fabric8LeaderElectionAutoConfiguration.java b/spring-cloud-kubernetes-fabric8-leader/src/main/java/org/springframework/cloud/kubernetes/fabric8/leader/election/Fabric8LeaderElectionAutoConfiguration.java
index f20e84bfe..a4db68a6c 100644
--- a/spring-cloud-kubernetes-fabric8-leader/src/main/java/org/springframework/cloud/kubernetes/fabric8/leader/election/Fabric8LeaderElectionAutoConfiguration.java
+++ b/spring-cloud-kubernetes-fabric8-leader/src/main/java/org/springframework/cloud/kubernetes/fabric8/leader/election/Fabric8LeaderElectionAutoConfiguration.java
@@ -107,7 +107,8 @@ LeaderElectionConfig fabric8LeaderElectionConfig(LeaderElectionProperties proper
 
 	@Bean
 	@ConditionalOnMissingBean
-	Lock fabric8LeaderElectionLock(KubernetesClient fabric8KubernetesClient, LeaderElectionProperties properties, String candidateIdentity) {
+	Lock fabric8LeaderElectionLock(KubernetesClient fabric8KubernetesClient, LeaderElectionProperties properties,
+			String candidateIdentity) {
 		boolean leaseSupported = fabric8KubernetesClient.getApiGroups()
 			.getGroups()
 			.stream()
diff --git a/spring-cloud-kubernetes-fabric8-leader/src/main/java/org/springframework/cloud/kubernetes/fabric8/leader/election/Fabric8LeaderElectionInitiator.java b/spring-cloud-kubernetes-fabric8-leader/src/main/java/org/springframework/cloud/kubernetes/fabric8/leader/election/Fabric8LeaderElectionInitiator.java
index 17bae6048..58fdb2b57 100644
--- a/spring-cloud-kubernetes-fabric8-leader/src/main/java/org/springframework/cloud/kubernetes/fabric8/leader/election/Fabric8LeaderElectionInitiator.java
+++ b/spring-cloud-kubernetes-fabric8-leader/src/main/java/org/springframework/cloud/kubernetes/fabric8/leader/election/Fabric8LeaderElectionInitiator.java
@@ -31,11 +31,10 @@
 import org.springframework.core.log.LogAccessor;
 
 import static java.util.concurrent.Executors.newSingleThreadExecutor;
-import static org.springframework.cloud.kubernetes.fabric8.leader.election.Fabric8LeaderElectionInitiatorUtil.attachReadinessLoggerPipeline;
-import static org.springframework.cloud.kubernetes.fabric8.leader.election.Fabric8LeaderElectionInitiatorUtil.blockReadinessCheck;
-import static org.springframework.cloud.kubernetes.fabric8.leader.election.Fabric8LeaderElectionInitiatorUtil.leaderElector;
-import static org.springframework.cloud.kubernetes.fabric8.leader.election.Fabric8LeaderElectionInitiatorUtil.shutDownExecutor;
-import static org.springframework.cloud.kubernetes.fabric8.leader.election.Fabric8LeaderElectionInitiatorUtil.sleep;
+import static org.springframework.cloud.kubernetes.commons.leader.election.LeaderElectionInitiatorUtil.attachReadinessLoggerPipeline;
+import static org.springframework.cloud.kubernetes.commons.leader.election.LeaderElectionInitiatorUtil.blockReadinessCheck;
+import static org.springframework.cloud.kubernetes.commons.leader.election.LeaderElectionInitiatorUtil.shutDownExecutor;
+import static org.springframework.cloud.kubernetes.commons.leader.election.LeaderElectionInitiatorUtil.sleep;
 
 /**
  * @author wind57
@@ -152,7 +151,7 @@ CompletableFuture<?> leaderFeature() {
 
 	private void startLeaderElection() {
 
-		leaderFuture = leaderElector(leaderElectionConfig, fabric8KubernetesClient).start();
+		leaderFuture = fabric8KubernetesClient.leaderElector().withConfig(leaderElectionConfig).build().start();
 
 		leaderFuture.whenComplete((ok, error) -> {