diff --git a/pom.xml b/pom.xml
index 048dd04b..656610ab 100644
--- a/pom.xml
+++ b/pom.xml
@@ -92,7 +92,7 @@
       <dependency>
         <groupId>io.fabric8</groupId>
         <artifactId>kubernetes-client</artifactId>
-        <version>3.1.8</version>
+        <version>4.0.4</version>
         <type>jar</type>
       </dependency>
 
diff --git a/src/main/java/org/microbean/helm/TillerInstaller.java b/src/main/java/org/microbean/helm/TillerInstaller.java
index 767d3318..886788c7 100644
--- a/src/main/java/org/microbean/helm/TillerInstaller.java
+++ b/src/main/java/org/microbean/helm/TillerInstaller.java
@@ -37,15 +37,6 @@
 import java.util.regex.Pattern;
 
 import com.github.zafarkhaja.semver.Version;
-
-import io.fabric8.kubernetes.client.DefaultKubernetesClient;
-import io.fabric8.kubernetes.client.HttpClientAware;
-import io.fabric8.kubernetes.client.KubernetesClient;
-import io.fabric8.kubernetes.client.KubernetesClientException;
-
-import io.fabric8.kubernetes.client.dsl.Listable;
-import io.fabric8.kubernetes.client.dsl.Resource;
-
 import io.fabric8.kubernetes.api.model.Container;
 import io.fabric8.kubernetes.api.model.ContainerPort;
 import io.fabric8.kubernetes.api.model.EnvVar;
@@ -64,10 +55,18 @@
 import io.fabric8.kubernetes.api.model.Status;
 import io.fabric8.kubernetes.api.model.Volume;
 import io.fabric8.kubernetes.api.model.VolumeMount;
+import io.fabric8.kubernetes.api.model.LabelSelector;
+import io.fabric8.kubernetes.api.model.apps.Deployment;
+import io.fabric8.kubernetes.api.model.apps.DeploymentSpec;
+import io.fabric8.kubernetes.api.model.apps.DoneableDeployment;
+
+import io.fabric8.kubernetes.client.DefaultKubernetesClient;
+import io.fabric8.kubernetes.client.HttpClientAware;
+import io.fabric8.kubernetes.client.KubernetesClient;
+import io.fabric8.kubernetes.client.KubernetesClientException;
 
-import io.fabric8.kubernetes.api.model.extensions.Deployment;
-import io.fabric8.kubernetes.api.model.extensions.DeploymentSpec;
-import io.fabric8.kubernetes.api.model.extensions.DoneableDeployment;
+import io.fabric8.kubernetes.client.dsl.Listable;
+import io.fabric8.kubernetes.client.dsl.Resource;
 
 import io.grpc.health.v1.HealthCheckRequest;
 import io.grpc.health.v1.HealthCheckResponse.ServingStatus;
@@ -578,7 +577,7 @@ public void install(String namespace,
                             tls,
                             verifyTls);
         
-    this.kubernetesClient.extensions().deployments().inNamespace(namespace).create(deployment);
+    this.kubernetesClient.apps().deployments().inNamespace(namespace).create(deployment);
 
     final Service service = this.createService(namespace, normalizeServiceName(serviceName), labels);
     this.kubernetesClient.services().inNamespace(namespace).create(service);
@@ -627,7 +626,7 @@ public void upgrade(String namespace,
     namespace = normalizeNamespace(namespace);
     serviceName = normalizeServiceName(serviceName);
 
-    final Resource<Deployment, DoneableDeployment> resource = this.kubernetesClient.extensions()
+    final Resource<Deployment, DoneableDeployment> resource = this.kubernetesClient.apps()
       .deployments()
       .inNamespace(namespace)
       .withName(normalizeDeploymentName(deploymentName));
@@ -836,7 +835,10 @@ protected DeploymentSpec createDeploymentSpec(final Map<String, String> labels,
       podSpec.setVolumes(Arrays.asList(volume));
     }
     podTemplateSpec.setSpec(podSpec);
-    deploymentSpec.setTemplate(podTemplateSpec);    
+    deploymentSpec.setTemplate(podTemplateSpec);
+    LabelSelector selector = new LabelSelector();
+    selector.setMatchLabels(labels);
+    deploymentSpec.setSelector(selector);
     return deploymentSpec;
   }