diff --git a/zuul_operator/utils.py b/zuul_operator/utils.py
index ee547a5..07622ed 100644
--- a/zuul_operator/utils.py
+++ b/zuul_operator/utils.py
@@ -19,7 +19,6 @@ import string
 import kopf
 import yaml
 import jinja2
-import kubernetes
 from kubernetes.client import Configuration
 from kubernetes.client.api import core_v1_api
 from kubernetes.stream import stream
@@ -82,7 +81,6 @@ def update_secret(api, namespace, name, string_data):
 
 
 def pod_exec(namespace, name, command):
-    kubernetes.config.load_kube_config()
     try:
         c = Configuration().get_default_copy()
     except AttributeError:
diff --git a/zuul_operator/zuul.py b/zuul_operator/zuul.py
index c739116..643bb6d 100644
--- a/zuul_operator/zuul.py
+++ b/zuul_operator/zuul.py
@@ -450,7 +450,7 @@ class Zuul:
 
         for obj in objects.Pod.objects(self.api).filter(
                 namespace=self.namespace,
-                selector={'app.kubernetes.io/instance': 'zuul',
+                selector={'app.kubernetes.io/instance': self.name,
                           'app.kubernetes.io/component': 'zuul-scheduler',
                           'app.kubernetes.io/name': 'zuul'}):
             self.log.info("Waiting for config to update on %s",