diff --git a/charts/apiserver-webhook/values.yaml b/charts/apiserver-webhook/values.yaml
index c202f3ca..12751978 100644
--- a/charts/apiserver-webhook/values.yaml
+++ b/charts/apiserver-webhook/values.yaml
@@ -39,7 +39,8 @@ labels:
     node_selector_value: enabled
 
 command_prefix:
-  - /apiserver
+  - /hyperkube
+  - kube-apiserver
   - --admission-control=NamespaceLifecycle,LimitRanger,ServiceAccount,PersistentVolumeLabel,DefaultStorageClass,ResourceQuota,DefaultTolerationSeconds
 
 apiserver_webhook:
diff --git a/charts/apiserver/values.yaml b/charts/apiserver/values.yaml
index 8d0a5670..4ebb5dcc 100644
--- a/charts/apiserver/values.yaml
+++ b/charts/apiserver/values.yaml
@@ -19,7 +19,8 @@ release_group: null
 const:
   encryption_annotation: "airshipit.org/encryption_key"
   command_prefix:
-    - /apiserver
+    - /hyperkube
+    - kube-apiserver
     - --advertise-address=$(POD_IP)
     - --allow-privileged=true
     - --anonymous-auth=false
diff --git a/charts/controller_manager/values.yaml b/charts/controller_manager/values.yaml
index 9a52eb40..d014c329 100644
--- a/charts/controller_manager/values.yaml
+++ b/charts/controller_manager/values.yaml
@@ -54,7 +54,8 @@ controller_manager:
     log_level: 5
 
 command_prefix:
-  - /controller-manager
+  - /hyperkube
+  - kube-controller-manager
   - --cluster-cidr=10.97.0.0/16
   - --node-monitor-period=5s
   - --node-monitor-grace-period=20s
diff --git a/charts/proxy/values.yaml b/charts/proxy/values.yaml
index 4d462a60..3ab9347e 100644
--- a/charts/proxy/values.yaml
+++ b/charts/proxy/values.yaml
@@ -52,7 +52,8 @@ proxy:
     log_level: 5
 
 command_prefix:
-  - /proxy
+  - /hyperkube
+  - kube-proxy
   - --proxy-mode=iptables
   - --cluster-cidr=10.97.0.0/16
 
diff --git a/charts/scheduler/values.yaml b/charts/scheduler/values.yaml
index 11c8ec9f..61df491c 100644
--- a/charts/scheduler/values.yaml
+++ b/charts/scheduler/values.yaml
@@ -82,5 +82,6 @@ service:
   name: kubernetes-scheduler
 
 command_prefix:
-  - /scheduler
+  - /hyperkube
+  - kube-scheduler
   - --feature-gates=TaintNodesByCondition=true
diff --git a/promenade/config.py b/promenade/config.py
index edf0bbec..f993c1e0 100644
--- a/promenade/config.py
+++ b/promenade/config.py
@@ -271,7 +271,7 @@ class Configuration:
 
     def bootstrap_apiserver_prefix(self):
         return self.get_path('Genesis:apiserver.command_prefix',
-                             ['/apiserver'])
+                             ['kube-apiserver'])
 
 
 def _matches_filter(document, *, schema, labels, name):
diff --git a/promenade/templates/roles/common/etc/systemd/system/kubelet.service b/promenade/templates/roles/common/etc/systemd/system/kubelet.service
index cb7a7a36..a7d2dd98 100644
--- a/promenade/templates/roles/common/etc/systemd/system/kubelet.service
+++ b/promenade/templates/roles/common/etc/systemd/system/kubelet.service
@@ -5,7 +5,6 @@ After=network-online.target
 
 [Service]
 ExecStart=/opt/kubernetes/bin/kubelet \
-    --allow-privileged=true \
     --anonymous-auth=false \
     --client-ca-file=/etc/kubernetes/pki/kubelet-client-ca.pem \
     --cluster-dns={{ config['KubernetesNetwork:dns.service_ip'] }} \
diff --git a/promenade/templates/roles/common/usr/local/bin/debug-report.sh b/promenade/templates/roles/common/usr/local/bin/debug-report.sh
index 1e36ad27..84e30ec9 100755
--- a/promenade/templates/roles/common/usr/local/bin/debug-report.sh
+++ b/promenade/templates/roles/common/usr/local/bin/debug-report.sh
@@ -30,7 +30,7 @@ function get_namespaces () {
 
 function get_pods () {
     NAMESPACE=$1
-    kubectl get pods -n "${NAMESPACE}" -o name --show-all | awk -F '/' '{ print $NF }' | xargs -L1 -P 1 -I {} echo "${NAMESPACE}" {}
+    kubectl get pods -n "${NAMESPACE}" -o name | awk -F '/' '{ print $NF }' | xargs -L1 -P 1 -I {} echo "${NAMESPACE}" {}
 }
 export -f get_pods
 
diff --git a/promenade/templates/roles/genesis/etc/kubernetes/manifests/kubernetes-scheduler.yaml b/promenade/templates/roles/genesis/etc/kubernetes/manifests/kubernetes-scheduler.yaml
index ae1e95ae..842f201a 100644
--- a/promenade/templates/roles/genesis/etc/kubernetes/manifests/kubernetes-scheduler.yaml
+++ b/promenade/templates/roles/genesis/etc/kubernetes/manifests/kubernetes-scheduler.yaml
@@ -17,7 +17,7 @@ spec:
       image: {{ config['Genesis:images.kubernetes.scheduler'] }}
       command:
       - ./hyperkube
-      - scheduler
+      - kube-scheduler
       - --leader-elect=true
       - --kubeconfig=/etc/kubernetes/scheduler/kubeconfig.yaml
       - --feature-gates=TaintNodesByCondition=true