diff --git a/pkg/ck8s/manifests/k8sd-proxy-template.yaml b/pkg/ck8s/manifests/k8sd-proxy-template.yaml
index ad99d7b7..2832a1b7 100644
--- a/pkg/ck8s/manifests/k8sd-proxy-template.yaml
+++ b/pkg/ck8s/manifests/k8sd-proxy-template.yaml
@@ -31,8 +31,7 @@ spec:
         effect: NoSchedule
       containers:
       - name: k8sd-proxy
-        # TODO: change back to ghcr image once this is public
-        image: alpine/socat:1.8.0.0
+        image: ghcr.io/canonical/cluster-api-k8s/socat:1.8.0.0
         env:
         # TODO: Make this more robust by possibly finding/parsing the right IP.
         # This works as a start but might not be sufficient as the kubelet IP might not match microcluster IP.
diff --git a/pkg/cloudinit/controlplane_init_test.go b/pkg/cloudinit/controlplane_init_test.go
index cf33eccb..79935853 100644
--- a/pkg/cloudinit/controlplane_init_test.go
+++ b/pkg/cloudinit/controlplane_init_test.go
@@ -46,20 +46,12 @@ func TestNewInitControlPlane(t *testing.T) {
 
 	// TODO: add tests for expected files and commands
 	g.Expect(err).To(BeNil())
-	g.Expect(config.WriteFiles).To(ContainElement(cloudinit.File{
-		Path:        "/tmp/file",
-		Content:     "test file",
-		Permissions: "0400",
-		Owner:       "root:root",
-	}))
-	g.Expect(config.BootCommands).To(ContainElement("bootcmd"))
 	g.Expect(config.RunCommands).To(Equal([]string{
 		"set -x",
 		"prerun1",
 		"prerun2",
 		"/capi/scripts/install.sh",
 		"/capi/scripts/bootstrap.sh",
-		"/capi/scripts/load-images.sh",
 		"/capi/scripts/wait-apiserver-ready.sh",
 		"/capi/scripts/deploy-manifests.sh",
 		"/capi/scripts/configure-token.sh",
diff --git a/test/e2e/data/infrastructure-docker/cluster-template.yaml b/test/e2e/data/infrastructure-docker/cluster-template.yaml
index 27ea144f..b33ac49d 100644
--- a/test/e2e/data/infrastructure-docker/cluster-template.yaml
+++ b/test/e2e/data/infrastructure-docker/cluster-template.yaml
@@ -101,7 +101,6 @@ metadata:
 spec:
   template:
     spec:
-      # TODO: make this customable
       customImage: k8s-snap:dev
 ---
 apiVersion: bootstrap.cluster.x-k8s.io/v1beta2