diff --git a/sample-operators/mysql-schema/src/main/java/io/javaoperatorsdk/operator/sample/MySQLSchemaOperator.java b/sample-operators/mysql-schema/src/main/java/io/javaoperatorsdk/operator/sample/MySQLSchemaOperator.java
index f1cd015c34..b2fb0aab65 100644
--- a/sample-operators/mysql-schema/src/main/java/io/javaoperatorsdk/operator/sample/MySQLSchemaOperator.java
+++ b/sample-operators/mysql-schema/src/main/java/io/javaoperatorsdk/operator/sample/MySQLSchemaOperator.java
@@ -9,10 +9,7 @@
 import org.takes.http.Exit;
 import org.takes.http.FtBasic;
 
-import io.fabric8.kubernetes.client.Config;
-import io.fabric8.kubernetes.client.ConfigBuilder;
-import io.fabric8.kubernetes.client.DefaultKubernetesClient;
-import io.fabric8.kubernetes.client.KubernetesClient;
+import io.fabric8.kubernetes.client.*;
 import io.javaoperatorsdk.operator.Operator;
 import io.javaoperatorsdk.operator.monitoring.micrometer.MicrometerMetrics;
 import io.javaoperatorsdk.operator.sample.dependent.ResourcePollerConfig;
@@ -26,8 +23,7 @@ public class MySQLSchemaOperator {
   public static void main(String[] args) throws IOException {
     log.info("MySQL Schema Operator starting");
 
-    Config config = new ConfigBuilder().withNamespace(null).build();
-    KubernetesClient client = new DefaultKubernetesClient(config);
+    KubernetesClient client = new KubernetesClientBuilder().build();
     Operator operator = new Operator(client,
         overrider -> overrider.withMetrics(new MicrometerMetrics(new LoggingMeterRegistry())));
 
diff --git a/sample-operators/tomcat-operator/src/main/java/io/javaoperatorsdk/operator/sample/TomcatOperator.java b/sample-operators/tomcat-operator/src/main/java/io/javaoperatorsdk/operator/sample/TomcatOperator.java
index 6b894a3348..3973379769 100644
--- a/sample-operators/tomcat-operator/src/main/java/io/javaoperatorsdk/operator/sample/TomcatOperator.java
+++ b/sample-operators/tomcat-operator/src/main/java/io/javaoperatorsdk/operator/sample/TomcatOperator.java
@@ -9,10 +9,7 @@
 import org.takes.http.Exit;
 import org.takes.http.FtBasic;
 
-import io.fabric8.kubernetes.client.Config;
-import io.fabric8.kubernetes.client.ConfigBuilder;
-import io.fabric8.kubernetes.client.DefaultKubernetesClient;
-import io.fabric8.kubernetes.client.KubernetesClient;
+import io.fabric8.kubernetes.client.*;
 import io.javaoperatorsdk.operator.Operator;
 
 public class TomcatOperator {
@@ -21,8 +18,7 @@ public class TomcatOperator {
 
   public static void main(String[] args) throws IOException {
 
-    Config config = new ConfigBuilder().withNamespace(null).build();
-    KubernetesClient client = new DefaultKubernetesClient(config);
+    KubernetesClient client = new KubernetesClientBuilder().build();
     Operator operator = new Operator(client);
     operator.register(new TomcatReconciler());
     operator.register(new WebappReconciler(client));
diff --git a/sample-operators/webpage/src/main/java/io/javaoperatorsdk/operator/sample/WebPageOperator.java b/sample-operators/webpage/src/main/java/io/javaoperatorsdk/operator/sample/WebPageOperator.java
index 661f6f3ba8..9b137649fc 100644
--- a/sample-operators/webpage/src/main/java/io/javaoperatorsdk/operator/sample/WebPageOperator.java
+++ b/sample-operators/webpage/src/main/java/io/javaoperatorsdk/operator/sample/WebPageOperator.java
@@ -9,10 +9,7 @@
 import org.takes.http.Exit;
 import org.takes.http.FtBasic;
 
-import io.fabric8.kubernetes.client.Config;
-import io.fabric8.kubernetes.client.ConfigBuilder;
-import io.fabric8.kubernetes.client.DefaultKubernetesClient;
-import io.fabric8.kubernetes.client.KubernetesClient;
+import io.fabric8.kubernetes.client.*;
 import io.javaoperatorsdk.operator.Operator;
 
 public class WebPageOperator {
@@ -25,8 +22,7 @@ public class WebPageOperator {
   public static void main(String[] args) throws IOException {
     log.info("WebServer Operator starting!");
 
-    Config config = new ConfigBuilder().withNamespace(null).build();
-    KubernetesClient client = new DefaultKubernetesClient(config);
+    KubernetesClient client = new KubernetesClientBuilder().build();
     Operator operator = new Operator(client);
     String reconcilerEnvVar = System.getenv(WEBPAGE_RECONCILER_ENV);
     if (WEBPAGE_CLASSIC_RECONCILER_ENV_VALUE.equals(reconcilerEnvVar)) {