diff --git a/config.tf b/config.tf
index 6c0559c63b0..5725a581442 100644
--- a/config.tf
+++ b/config.tf
@@ -59,18 +59,18 @@ variable "tectonic_container_images" {
   default = {
     addon_resizer                        = "gcr.io/google_containers/addon-resizer:2.1"
     bootkube                             = "quay.io/coreos/bootkube:v0.10.0"
-    tnc_operator                         = "quay.io/coreos/tectonic-node-controller-operator-dev:436b1b4395ae54d866edc88864c9b01797cebac1"
     etcd_cert_signer                     = "quay.io/coreos/kube-etcd-signer-server:678cc8e6841e2121ebfdb6e2db568fce290b67d6"
     etcd                                 = "quay.io/coreos/etcd:v3.2.14"
     hyperkube                            = "openshift/origin-node:latest"
-    kube_core_renderer                   = "quay.io/coreos/kube-core-renderer-dev:436b1b4395ae54d866edc88864c9b01797cebac1"
-    kube_core_operator                   = "quay.io/coreos/kube-core-operator-dev:436b1b4395ae54d866edc88864c9b01797cebac1"
-    tectonic_channel_operator            = "quay.io/coreos/tectonic-channel-operator-dev:436b1b4395ae54d866edc88864c9b01797cebac1"
-    kube_addon_operator                  = "quay.io/coreos/kube-addon-operator-dev:436b1b4395ae54d866edc88864c9b01797cebac1"
     tectonic_alm_operator                = "quay.io/coreos/tectonic-alm-operator:v0.3.1"
-    tectonic_ingress_controller_operator = "quay.io/coreos/tectonic-ingress-controller-operator-dev:436b1b4395ae54d866edc88864c9b01797cebac1"
-    tectonic_utility_operator            = "quay.io/coreos/tectonic-utility-operator-dev:436b1b4395ae54d866edc88864c9b01797cebac1"
-    tectonic_network_operator            = "quay.io/coreos/tectonic-network-operator-dev:436b1b4395ae54d866edc88864c9b01797cebac1"
+    tnc_operator                         = "quay.io/coreos/tectonic-node-controller-operator-dev:b0e6febc1dfe4998f911c4ce2c911228a3fdcb38"
+    kube_core_renderer                   = "quay.io/coreos/kube-core-renderer-dev:b0e6febc1dfe4998f911c4ce2c911228a3fdcb38"
+    kube_core_operator                   = "quay.io/coreos/kube-core-operator-dev:b0e6febc1dfe4998f911c4ce2c911228a3fdcb38"
+    tectonic_channel_operator            = "quay.io/coreos/tectonic-channel-operator-dev:b0e6febc1dfe4998f911c4ce2c911228a3fdcb38"
+    kube_addon_operator                  = "quay.io/coreos/kube-addon-operator-dev:b0e6febc1dfe4998f911c4ce2c911228a3fdcb38"
+    tectonic_ingress_controller_operator = "quay.io/coreos/tectonic-ingress-controller-operator-dev:b0e6febc1dfe4998f911c4ce2c911228a3fdcb38"
+    tectonic_utility_operator            = "quay.io/coreos/tectonic-utility-operator-dev:b0e6febc1dfe4998f911c4ce2c911228a3fdcb38"
+    tectonic_network_operator            = "quay.io/coreos/tectonic-network-operator-dev:b0e6febc1dfe4998f911c4ce2c911228a3fdcb38"
   }
 }
 
diff --git a/modules/ignition/assets.tf b/modules/ignition/assets.tf
index 7543988b1bc..8dad6a26cca 100644
--- a/modules/ignition/assets.tf
+++ b/modules/ignition/assets.tf
@@ -18,8 +18,6 @@ data "template_file" "kubelet" {
   template = "${file("${path.module}/resources/services/kubelet.service")}"
 
   vars {
-    kubelet_image_url     = "${replace(var.container_images["hyperkube"],var.image_re,"$1")}"
-    kubelet_image_tag     = "${replace(var.container_images["hyperkube"],var.image_re,"$2")}"
     cloud_provider        = "${var.cloud_provider}"
     cloud_provider_config = "${var.cloud_provider_config != "" ? "--cloud-config=/etc/kubernetes/cloud/config" : ""}"
     cluster_dns_ip        = "${var.kube_dns_service_ip}"
diff --git a/modules/ignition/resources/services/kubelet.service b/modules/ignition/resources/services/kubelet.service
index ef8c3405d18..0ac72ff3522 100644
--- a/modules/ignition/resources/services/kubelet.service
+++ b/modules/ignition/resources/services/kubelet.service
@@ -6,31 +6,10 @@ After=docker.service kubelet-workaround.service
 
 [Service]
 EnvironmentFile=-/etc/kubernetes/kubelet-workaround
-ExecStartPre=/bin/mkdir --parents /etc/kubernetes/manifests
-ExecStartPre=/bin/mkdir --parents /etc/kubernetes/checkpoint-secrets
-ExecStartPre=/bin/mkdir --parents /etc/kubernetes/cni/net.d
-ExecStartPre=/bin/mkdir --parents /run/kubelet
-ExecStartPre=/bin/mkdir --parents /var/lib/cni
-ExecStartPre=/bin/mkdir --parents /var/lib/kubelet/pki
 
 ExecStartPre=/usr/bin/bash -c "gawk '/certificate-authority-data/ {print $2}' /etc/kubernetes/kubeconfig | base64 --decode > /etc/kubernetes/ca.crt"
 
-ExecStart=/usr/bin/docker \
-  run \
-    --rm \
-    --net host \
-    --pid host \
-    --privileged \
-    --volume /dev:/dev:rw \
-    --volume /sys:/sys:ro \
-    --volume /var/run:/var/run:rw \
-    --volume /var/lib/cni/:/var/lib/cni:rw \
-    --volume /var/lib/docker/:/var/lib/docker:rw \
-    --volume /var/lib/kubelet/:/var/lib/kubelet:shared \
-    --volume /var/log:/var/log:shared \
-    --volume /etc/kubernetes:/etc/kubernetes:ro \
-    --entrypoint /usr/bin/hyperkube \
-  "${kubelet_image_url}:${kubelet_image_tag}" \
+ExecStart=/usr/bin/hyperkube \
     kubelet \
       --bootstrap-kubeconfig=/etc/kubernetes/kubeconfig \
       --kubeconfig=/var/lib/kubelet/kubeconfig \