From 120c0b65aa9c8a565f41d971251cb15f5ccd2552 Mon Sep 17 00:00:00 2001
From: Ciprian Hacman <ciprian@hakman.dev>
Date: Mon, 4 Sep 2023 23:51:15 +0300
Subject: [PATCH] hack/update-expected.sh

---
 k8s/crds/kops.k8s.io_clusters.yaml            | 40 ++++++++-----------
 k8s/crds/kops.k8s.io_instancegroups.yaml      |  9 ++---
 pkg/model/tests/data/bootstrapscript_0.txt    |  2 +-
 pkg/model/tests/data/bootstrapscript_1.txt    |  2 +-
 pkg/model/tests/data/bootstrapscript_2.txt    |  2 +-
 pkg/model/tests/data/bootstrapscript_3.txt    |  2 +-
 pkg/model/tests/data/bootstrapscript_4.txt    |  2 +-
 pkg/model/tests/data/bootstrapscript_5.txt    |  2 +-
 pkg/model/tests/data/nodeupconfig_0.txt       |  3 --
 pkg/model/tests/data/nodeupconfig_1.txt       |  3 --
 pkg/model/tests/data/nodeupconfig_2.txt       |  3 --
 pkg/model/tests/data/nodeupconfig_3.txt       |  3 --
 pkg/model/tests/data/nodeupconfig_4.txt       |  3 --
 pkg/model/tests/data/nodeupconfig_5.txt       |  3 --
 ...rs.additionalobjects.example.com_user_data |  2 +-
 ...es.additionalobjects.example.com_user_data |  2 +-
 ...s_s3_object_cluster-completed.spec_content |  3 --
 ...ect_nodeupconfig-master-us-test-1a_content |  3 --
 .../aws_s3_object_nodeupconfig-nodes_content  |  3 --
 ...r.apiservers.minimal.example.com_user_data |  2 +-
 ...t-1a.masters.minimal.example.com_user_data |  2 +-
 ...mplate_nodes.minimal.example.com_user_data |  2 +-
 ...s_s3_object_cluster-completed.spec_content |  3 --
 ...s_s3_object_nodeupconfig-apiserver_content |  3 --
 ...ect_nodeupconfig-master-us-test-1a_content |  3 --
 .../aws_s3_object_nodeupconfig-nodes_content  |  3 --
 ...t-1a.masters.minimal.example.com_user_data |  2 +-
 ...mplate_nodes.minimal.example.com_user_data |  2 +-
 ...s_s3_object_cluster-completed.spec_content |  3 --
 ...ect_nodeupconfig-master-us-test-1a_content |  3 --
 .../aws_s3_object_nodeupconfig-nodes_content  |  3 --
 ...ters.bastionuserdata.example.com_user_data |  2 +-
 ...odes.bastionuserdata.example.com_user_data |  2 +-
 ...s_s3_object_cluster-completed.spec_content |  3 --
 ...aws_s3_object_nodeupconfig-bastion_content |  3 --
 ...ect_nodeupconfig-master-us-test-1a_content |  3 --
 .../aws_s3_object_nodeupconfig-nodes_content  |  3 --
 ...rity-expander-custom.example.com_user_data |  2 +-
 ...rity-expander-custom.example.com_user_data |  2 +-
 ...rity-expander-custom.example.com_user_data |  2 +-
 ...rity-expander-custom.example.com_user_data |  2 +-
 ...s_s3_object_cluster-completed.spec_content |  3 --
 ...ect_nodeupconfig-master-us-test-1a_content |  3 --
 ...t_nodeupconfig-nodes-high-priority_content |  3 --
 ...ct_nodeupconfig-nodes-low-priority_content |  3 --
 .../aws_s3_object_nodeupconfig-nodes_content  |  3 --
 ...as-priority-expander.example.com_user_data |  2 +-
 ...as-priority-expander.example.com_user_data |  2 +-
 ...as-priority-expander.example.com_user_data |  2 +-
 ...as-priority-expander.example.com_user_data |  2 +-
 ...s_s3_object_cluster-completed.spec_content |  3 --
 ...ect_nodeupconfig-master-us-test-1a_content |  3 --
 ...t_nodeupconfig-nodes-high-priority_content |  3 --
 ...ct_nodeupconfig-nodes-low-priority_content |  3 --
 .../aws_s3_object_nodeupconfig-nodes_content  |  3 --
 ...t-1a.masters.complex.example.com_user_data |  2 +-
 ...mplate_nodes.complex.example.com_user_data |  2 +-
 ...s_s3_object_cluster-completed.spec_content |  3 --
 ...ect_nodeupconfig-master-us-test-1a_content |  3 --
 .../aws_s3_object_nodeupconfig-nodes_content  |  3 --
 ...-1a.masters.compress.example.com_user_data |  2 +-
 ...plate_nodes.compress.example.com_user_data |  2 +-
 ...s_s3_object_cluster-completed.spec_content |  3 --
 ...ect_nodeupconfig-master-us-test-1a_content |  3 --
 .../aws_s3_object_nodeupconfig-nodes_content  |  3 --
 ...a.masters.containerd.example.com_user_data |  2 +-
 ...ate_nodes.containerd.example.com_user_data |  2 +-
 ...s_s3_object_cluster-completed.spec_content |  3 --
 ...ect_nodeupconfig-master-us-test-1a_content |  3 --
 .../aws_s3_object_nodeupconfig-nodes_content  |  3 --
 ...a.masters.containerd.example.com_user_data |  2 +-
 ...ate_nodes.containerd.example.com_user_data |  2 +-
 ...s_s3_object_cluster-completed.spec_content |  3 --
 ...ect_nodeupconfig-master-us-test-1a_content |  3 --
 .../aws_s3_object_nodeupconfig-nodes_content  |  3 --
 ...-test-1a.masters.123.example.com_user_data |  2 +-
 ...h_template_nodes.123.example.com_user_data |  2 +-
 ...s_s3_object_cluster-completed.spec_content |  3 --
 ...ect_nodeupconfig-master-us-test-1a_content |  3 --
 .../aws_s3_object_nodeupconfig-nodes_content  |  3 --
 ...masters.existing-iam.example.com_user_data |  2 +-
 ...masters.existing-iam.example.com_user_data |  2 +-
 ...masters.existing-iam.example.com_user_data |  2 +-
 ...e_nodes.existing-iam.example.com_user_data |  2 +-
 ...s_s3_object_cluster-completed.spec_content |  3 --
 ...ect_nodeupconfig-master-us-test-1a_content |  3 --
 ...ect_nodeupconfig-master-us-test-1b_content |  3 --
 ...ect_nodeupconfig-master-us-test-1c_content |  3 --
 .../aws_s3_object_nodeupconfig-nodes_content  |  3 --
 ...a.masters.existingsg.example.com_user_data |  2 +-
 ...b.masters.existingsg.example.com_user_data |  2 +-
 ...c.masters.existingsg.example.com_user_data |  2 +-
 ...ate_nodes.existingsg.example.com_user_data |  2 +-
 ...s_s3_object_cluster-completed.spec_content |  3 --
 ...ect_nodeupconfig-master-us-test-1a_content |  3 --
 ...ect_nodeupconfig-master-us-test-1b_content |  3 --
 ...ect_nodeupconfig-master-us-test-1c_content |  3 --
 .../aws_s3_object_nodeupconfig-nodes_content  |  3 --
 ...t-1a.masters.minimal.example.com_user_data |  2 +-
 ...mplate_nodes.minimal.example.com_user_data |  2 +-
 ...s_s3_object_cluster-completed.spec_content |  3 --
 ...ect_nodeupconfig-master-us-test-1a_content |  3 --
 .../aws_s3_object_nodeupconfig-nodes_content  |  3 --
 ...t-1a.masters.minimal.example.com_user_data |  2 +-
 ...mplate_nodes.minimal.example.com_user_data |  2 +-
 ...s_s3_object_cluster-completed.spec_content |  3 --
 ...ect_nodeupconfig-master-us-test-1a_content |  3 --
 .../aws_s3_object_nodeupconfig-nodes_content  |  3 --
 ...a.masters.externallb.example.com_user_data |  2 +-
 ...ate_nodes.externallb.example.com_user_data |  2 +-
 ...s_s3_object_cluster-completed.spec_content |  3 --
 ...ect_nodeupconfig-master-us-test-1a_content |  3 --
 .../aws_s3_object_nodeupconfig-nodes_content  |  3 --
 ...ers.externalpolicies.example.com_user_data |  2 +-
 ...des.externalpolicies.example.com_user_data |  2 +-
 ...s_s3_object_cluster-completed.spec_content |  3 --
 ...ect_nodeupconfig-master-us-test-1a_content |  3 --
 .../aws_s3_object_nodeupconfig-nodes_content  |  3 --
 ...s-test-1a.masters.ha.example.com_user_data |  2 +-
 ...s-test-1b.masters.ha.example.com_user_data |  2 +-
 ...s-test-1c.masters.ha.example.com_user_data |  2 +-
 ...ch_template_nodes.ha.example.com_user_data |  2 +-
 ...s_s3_object_cluster-completed.spec_content |  3 --
 ...ect_nodeupconfig-master-us-test-1a_content |  3 --
 ...ect_nodeupconfig-master-us-test-1b_content |  3 --
 ...ect_nodeupconfig-master-us-test-1c_content |  3 --
 .../aws_s3_object_nodeupconfig-nodes_content  |  3 --
 ...s_s3_object_cluster-completed.spec_content |  3 --
 ...ect_nodeupconfig-master-us-test1-a_content |  3 --
 ...ect_nodeupconfig-master-us-test1-b_content |  3 --
 ...ect_nodeupconfig-master-us-test1-c_content |  3 --
 .../aws_s3_object_nodeupconfig-nodes_content  |  3 --
 ...t1-a-ha-gce-example-com_metadata_user-data |  2 +-
 ...t1-b-ha-gce-example-com_metadata_user-data |  2 +-
 ...t1-c-ha-gce-example-com_metadata_user-data |  2 +-
 ...odes-ha-gce-example-com_metadata_user-data |  2 +-
 ...t-1a.masters.minimal.example.com_user_data |  2 +-
 ...mplate_nodes.minimal.example.com_user_data |  2 +-
 ...s_s3_object_cluster-completed.spec_content |  3 --
 ...ect_nodeupconfig-master-us-test-1a_content |  3 --
 .../aws_s3_object_nodeupconfig-nodes_content  |  3 --
 ...odes-default.minimal.example.com_user_data |  2 +-
 ...-machinetype.minimal.example.com_user_data |  2 +-
 ...t-1a.masters.minimal.example.com_user_data |  2 +-
 ...mplate_nodes.minimal.example.com_user_data |  2 +-
 ...s_s3_object_cluster-completed.spec_content |  3 --
 ...deupconfig-karpenter-nodes-default_content |  3 --
 ...karpenter-nodes-single-machinetype_content |  3 --
 ...ect_nodeupconfig-master-us-test-1a_content |  3 --
 .../aws_s3_object_nodeupconfig-nodes_content  |  3 --
 ...t-1a.masters.minimal.example.com_user_data |  2 +-
 ...mplate_nodes.minimal.example.com_user_data |  2 +-
 ...s_s3_object_cluster-completed.spec_content |  3 --
 ...ect_nodeupconfig-master-us-test-1a_content |  3 --
 .../aws_s3_object_nodeupconfig-nodes_content  |  3 --
 ...t-1a.masters.minimal.example.com_user_data |  2 +-
 ...mplate_nodes.minimal.example.com_user_data |  2 +-
 ...s_s3_object_cluster-completed.spec_content |  3 --
 ...ect_nodeupconfig-master-us-test-1a_content |  3 --
 .../aws_s3_object_nodeupconfig-nodes_content  |  3 --
 ...t-1a.masters.minimal.example.com_user_data |  2 +-
 ...mplate_nodes.minimal.example.com_user_data |  2 +-
 ...s_s3_object_cluster-completed.spec_content |  3 --
 ...ect_nodeupconfig-master-us-test-1a_content |  3 --
 .../aws_s3_object_nodeupconfig-nodes_content  |  3 --
 ...t-1a.masters.minimal.example.com_user_data |  2 +-
 ...mplate_nodes.minimal.example.com_user_data |  2 +-
 ...s_s3_object_cluster-completed.spec_content |  3 --
 ...ect_nodeupconfig-master-us-test-1a_content |  3 --
 .../aws_s3_object_nodeupconfig-nodes_content  |  3 --
 ...t-1a.masters.minimal.example.com_user_data |  2 +-
 ...mplate_nodes.minimal.example.com_user_data |  2 +-
 ...s_s3_object_cluster-completed.spec_content |  3 --
 ...ect_nodeupconfig-master-us-test-1a_content |  3 --
 .../aws_s3_object_nodeupconfig-nodes_content  |  3 --
 ...s_s3_object_cluster-completed.spec_content |  3 --
 ...ect_nodeupconfig-master-us-test1-a_content |  3 --
 .../aws_s3_object_nodeupconfig-nodes_content  |  3 --
 ...1-a-minimal-example-com_metadata_user-data |  2 +-
 ...des-minimal-example-com_metadata_user-data |  2 +-
 ...t-1a.masters.minimal.example.com_user_data |  2 +-
 ...mplate_nodes.minimal.example.com_user_data |  2 +-
 ...s_s3_object_cluster-completed.spec_content |  3 --
 ...ect_nodeupconfig-master-us-test-1a_content |  3 --
 .../aws_s3_object_nodeupconfig-nodes_content  |  3 --
 ...t-1a.masters.minimal.example.com_user_data |  2 +-
 ...mplate_nodes.minimal.example.com_user_data |  2 +-
 ...s_s3_object_cluster-completed.spec_content |  3 --
 ...ect_nodeupconfig-master-us-test-1a_content |  3 --
 .../aws_s3_object_nodeupconfig-nodes_content  |  3 --
 ...t-1a.masters.minimal.example.com_user_data |  2 +-
 ...mplate_nodes.minimal.example.com_user_data |  2 +-
 ...s_s3_object_cluster-completed.spec_content |  3 --
 ...ect_nodeupconfig-master-us-test-1a_content |  3 --
 .../aws_s3_object_nodeupconfig-nodes_content  |  3 --
 ...t-1a.masters.minimal.example.com_user_data |  2 +-
 ...mplate_nodes.minimal.example.com_user_data |  2 +-
 ...s_s3_object_cluster-completed.spec_content |  3 --
 ...ect_nodeupconfig-master-us-test-1a_content |  3 --
 .../aws_s3_object_nodeupconfig-nodes_content  |  3 --
 ...t-1a.masters.minimal.example.com_user_data |  2 +-
 ...mplate_nodes.minimal.example.com_user_data |  2 +-
 ...s_s3_object_cluster-completed.spec_content |  3 --
 ...ect_nodeupconfig-master-us-test-1a_content |  3 --
 .../aws_s3_object_nodeupconfig-nodes_content  |  3 --
 ...t-1a.masters.minimal.example.com_user_data |  2 +-
 ...mplate_nodes.minimal.example.com_user_data |  2 +-
 ...s_s3_object_cluster-completed.spec_content |  3 --
 ...ect_nodeupconfig-master-us-test-1a_content |  3 --
 .../aws_s3_object_nodeupconfig-nodes_content  |  3 --
 ...t-1a.masters.minimal.example.com_user_data |  2 +-
 ...mplate_nodes.minimal.example.com_user_data |  2 +-
 ...s_s3_object_cluster-completed.spec_content |  3 --
 ...ect_nodeupconfig-master-us-test-1a_content |  3 --
 .../aws_s3_object_nodeupconfig-nodes_content  |  3 --
 ...t-1a.masters.minimal.example.com_user_data |  2 +-
 ...mplate_nodes.minimal.example.com_user_data |  2 +-
 ...s_s3_object_cluster-completed.spec_content |  3 --
 ...ect_nodeupconfig-master-us-test-1a_content |  3 --
 .../aws_s3_object_nodeupconfig-nodes_content  |  3 --
 ...masters.minimal-etcd.example.com_user_data |  2 +-
 ...e_nodes.minimal-etcd.example.com_user_data |  2 +-
 ...s_s3_object_cluster-completed.spec_content |  3 --
 ...ect_nodeupconfig-master-us-test-1a_content |  3 --
 .../aws_s3_object_nodeupconfig-nodes_content  |  3 --
 ...t-1a.masters.minimal.example.com_user_data |  2 +-
 ...mplate_nodes.minimal.example.com_user_data |  2 +-
 ...s_s3_object_cluster-completed.spec_content |  3 --
 ...ect_nodeupconfig-master-us-test-1a_content |  3 --
 .../aws_s3_object_nodeupconfig-nodes_content  |  3 --
 ...masters.minimal-ipv6.example.com_user_data |  2 +-
 ...e_nodes.minimal-ipv6.example.com_user_data |  2 +-
 ...s_s3_object_cluster-completed.spec_content |  3 --
 ...ect_nodeupconfig-master-us-test-1a_content |  3 --
 .../aws_s3_object_nodeupconfig-nodes_content  |  3 --
 ...masters.minimal-ipv6.example.com_user_data |  2 +-
 ...e_nodes.minimal-ipv6.example.com_user_data |  2 +-
 ...s_s3_object_cluster-completed.spec_content |  3 --
 ...ect_nodeupconfig-master-us-test-1a_content |  3 --
 .../aws_s3_object_nodeupconfig-nodes_content  |  3 --
 ...masters.minimal-ipv6.example.com_user_data |  2 +-
 ...e_nodes.minimal-ipv6.example.com_user_data |  2 +-
 ...s_s3_object_cluster-completed.spec_content |  3 --
 ...ect_nodeupconfig-master-us-test-1a_content |  3 --
 .../aws_s3_object_nodeupconfig-nodes_content  |  3 --
 ...masters.minimal-ipv6.example.com_user_data |  2 +-
 ...e_nodes.minimal-ipv6.example.com_user_data |  2 +-
 ...s_s3_object_cluster-completed.spec_content |  3 --
 ...ect_nodeupconfig-master-us-test-1a_content |  3 --
 .../aws_s3_object_nodeupconfig-nodes_content  |  3 --
 ...cluster-name.minimal.example.com_user_data |  2 +-
 ...cluster-name.minimal.example.com_user_data |  2 +-
 ...s_s3_object_cluster-completed.spec_content |  3 --
 ...ect_nodeupconfig-master-us-test-1a_content |  3 --
 .../aws_s3_object_nodeupconfig-nodes_content  |  3 --
 ...ers.minimal-warmpool.example.com_user_data |  2 +-
 ...des.minimal-warmpool.example.com_user_data |  2 +-
 ...s_s3_object_cluster-completed.spec_content |  3 --
 ...ect_nodeupconfig-master-us-test-1a_content |  3 --
 .../aws_s3_object_nodeupconfig-nodes_content  |  3 --
 ...t-1a.masters.minimal.example.com_user_data |  2 +-
 ...mplate_nodes.minimal.example.com_user_data |  2 +-
 ...s_s3_object_cluster-completed.spec_content |  3 --
 ...ect_nodeupconfig-master-us-test-1a_content |  3 --
 .../aws_s3_object_nodeupconfig-nodes_content  |  3 --
 ...s_s3_object_cluster-completed.spec_content |  3 --
 ...ect_nodeupconfig-master-us-test1-a_content |  3 --
 .../aws_s3_object_nodeupconfig-nodes_content  |  3 --
 ...minimal-gce-example-com_metadata_user-data |  2 +-
 ...minimal-gce-example-com_metadata_user-data |  2 +-
 ...s_s3_object_cluster-completed.spec_content |  3 --
 ...ect_nodeupconfig-master-us-test1-a_content |  3 --
 .../aws_s3_object_nodeupconfig-nodes_content  |  3 --
 ...minimal-gce-example-com_metadata_user-data |  2 +-
 ...minimal-gce-example-com_metadata_user-data |  2 +-
 ...s_s3_object_cluster-completed.spec_content |  3 --
 ...ect_nodeupconfig-master-us-test1-a_content |  3 --
 .../aws_s3_object_nodeupconfig-nodes_content  |  3 --
 ...mal-gce-ilb-example-com_metadata_user-data |  2 +-
 ...mal-gce-ilb-example-com_metadata_user-data |  2 +-
 ...s_s3_object_cluster-completed.spec_content |  3 --
 ...ect_nodeupconfig-master-us-test1-a_content |  3 --
 .../aws_s3_object_nodeupconfig-nodes_content  |  3 --
 ...y-long-name-example-com_metadata_user-data |  2 +-
 ...y-long-name-example-com_metadata_user-data |  2 +-
 ...s_s3_object_cluster-completed.spec_content |  3 --
 ...ect_nodeupconfig-master-us-test1-a_content |  3 --
 .../aws_s3_object_nodeupconfig-nodes_content  |  3 --
 ...y-long-name-example-com_metadata_user-data |  2 +-
 ...y-long-name-example-com_metadata_user-data |  2 +-
 ...s_s3_object_cluster-completed.spec_content |  3 --
 ...ect_nodeupconfig-master-us-test1-a_content |  3 --
 .../aws_s3_object_nodeupconfig-nodes_content  |  3 --
 ...mal-gce-plb-example-com_metadata_user-data |  2 +-
 ...mal-gce-plb-example-com_metadata_user-data |  2 +-
 ...s_s3_object_cluster-completed.spec_content |  3 --
 ...ect_nodeupconfig-master-us-test1-a_content |  3 --
 .../aws_s3_object_nodeupconfig-nodes_content  |  3 --
 ...gce-private-example-com_metadata_user-data |  2 +-
 ...gce-private-example-com_metadata_user-data |  2 +-
 ...est-1a.masters.minimal.k8s.local_user_data |  2 +-
 ...template_nodes.minimal.k8s.local_user_data |  2 +-
 ...s_s3_object_cluster-completed.spec_content |  3 --
 ...ect_nodeupconfig-master-us-test-1a_content |  3 --
 .../aws_s3_object_nodeupconfig-nodes_content  |  3 --
 ...est-1a.masters.minimal.k8s.local_user_data |  2 +-
 ...template_nodes.minimal.k8s.local_user_data |  2 +-
 ...s_s3_object_cluster-completed.spec_content |  3 --
 ...ect_nodeupconfig-master-us-test-1a_content |  3 --
 .../aws_s3_object_nodeupconfig-nodes_content  |  3 --
 ...s_s3_object_cluster-completed.spec_content |  3 --
 ...s3_object_nodeupconfig-master-fsn1_content |  3 --
 ..._s3_object_nodeupconfig-nodes-fsn1_content |  3 --
 .../data/hcloud_server_master-fsn1_user_data  |  2 +-
 .../data/hcloud_server_nodes-fsn1_user_data   |  2 +-
 ...s_s3_object_cluster-completed.spec_content |  3 --
 ...odeupconfig-control-plane-fr-par-1_content |  3 --
 ...object_nodeupconfig-nodes-fr-par-1_content |  3 --
 ...ce_server_control-plane-fr-par-1_user_data |  2 +-
 ...y_instance_server_nodes-fr-par-1_user_data |  2 +-
 ...sters.mixedinstances.example.com_user_data |  2 +-
 ...sters.mixedinstances.example.com_user_data |  2 +-
 ...sters.mixedinstances.example.com_user_data |  2 +-
 ...nodes.mixedinstances.example.com_user_data |  2 +-
 ...s_s3_object_cluster-completed.spec_content |  3 --
 ...ect_nodeupconfig-master-us-test-1a_content |  3 --
 ...ect_nodeupconfig-master-us-test-1b_content |  3 --
 ...ect_nodeupconfig-master-us-test-1c_content |  3 --
 .../aws_s3_object_nodeupconfig-nodes_content  |  3 --
 ...sters.mixedinstances.example.com_user_data |  2 +-
 ...sters.mixedinstances.example.com_user_data |  2 +-
 ...sters.mixedinstances.example.com_user_data |  2 +-
 ...nodes.mixedinstances.example.com_user_data |  2 +-
 ...s_s3_object_cluster-completed.spec_content |  3 --
 ...ect_nodeupconfig-master-us-test-1a_content |  3 --
 ...ect_nodeupconfig-master-us-test-1b_content |  3 --
 ...ect_nodeupconfig-master-us-test-1c_content |  3 --
 .../aws_s3_object_nodeupconfig-nodes_content  |  3 --
 ...ssor.longclustername.example.com_user_data |  2 +-
 ...ssor.longclustername.example.com_user_data |  2 +-
 ...s_s3_object_cluster-completed.spec_content |  3 --
 ...ect_nodeupconfig-master-us-test-1a_content |  3 --
 .../aws_s3_object_nodeupconfig-nodes_content  |  3 --
 ...ssor.longclustername.example.com_user_data |  2 +-
 ...ssor.longclustername.example.com_user_data |  2 +-
 ...s_s3_object_cluster-completed.spec_content |  3 --
 ...ect_nodeupconfig-master-us-test-1a_content |  3 --
 .../aws_s3_object_nodeupconfig-nodes_content  |  3 --
 ...t-1a.masters.minimal.example.com_user_data |  2 +-
 ...mplate_nodes.minimal.example.com_user_data |  2 +-
 ...s_s3_object_cluster-completed.spec_content |  3 --
 ...ect_nodeupconfig-master-us-test-1a_content |  3 --
 .../aws_s3_object_nodeupconfig-nodes_content  |  3 --
 ...rs.private-shared-ip.example.com_user_data |  2 +-
 ...es.private-shared-ip.example.com_user_data |  2 +-
 ...s_s3_object_cluster-completed.spec_content |  3 --
 ...ect_nodeupconfig-master-us-test-1a_content |  3 --
 .../aws_s3_object_nodeupconfig-nodes_content  |  3 --
 ...rivate-shared-subnet.example.com_user_data |  2 +-
 ...rivate-shared-subnet.example.com_user_data |  2 +-
 ...s_s3_object_cluster-completed.spec_content |  3 --
 ...ect_nodeupconfig-master-us-test-1a_content |  3 --
 .../aws_s3_object_nodeupconfig-nodes_content  |  3 --
 ...asters.privatecalico.example.com_user_data |  2 +-
 ..._nodes.privatecalico.example.com_user_data |  2 +-
 ...s_s3_object_cluster-completed.spec_content |  3 --
 ...ect_nodeupconfig-master-us-test-1a_content |  3 --
 .../aws_s3_object_nodeupconfig-nodes_content  |  3 --
 ...masters.privatecanal.example.com_user_data |  2 +-
 ...e_nodes.privatecanal.example.com_user_data |  2 +-
 ...s_s3_object_cluster-completed.spec_content |  3 --
 ...ect_nodeupconfig-master-us-test-1a_content |  3 --
 .../aws_s3_object_nodeupconfig-nodes_content  |  3 --
 ...asters.privatecilium.example.com_user_data |  2 +-
 ..._nodes.privatecilium.example.com_user_data |  2 +-
 ...s_s3_object_cluster-completed.spec_content |  3 --
 ...ect_nodeupconfig-master-us-test-1a_content |  3 --
 .../aws_s3_object_nodeupconfig-nodes_content  |  3 --
 ...asters.privatecilium.example.com_user_data |  2 +-
 ..._nodes.privatecilium.example.com_user_data |  2 +-
 ...s_s3_object_cluster-completed.spec_content |  3 --
 ...ect_nodeupconfig-master-us-test-1a_content |  3 --
 .../aws_s3_object_nodeupconfig-nodes_content  |  3 --
 ...asters.privatecilium.example.com_user_data |  2 +-
 ..._nodes.privatecilium.example.com_user_data |  2 +-
 ...s_s3_object_cluster-completed.spec_content |  3 --
 ...ect_nodeupconfig-master-us-test-1a_content |  3 --
 .../aws_s3_object_nodeupconfig-nodes_content  |  3 --
 ...rivateciliumadvanced.example.com_user_data |  2 +-
 ...rivateciliumadvanced.example.com_user_data |  2 +-
 ...s_s3_object_cluster-completed.spec_content |  3 --
 ...ect_nodeupconfig-master-us-test-1a_content |  3 --
 .../aws_s3_object_nodeupconfig-nodes_content  |  3 --
 ....masters.privatedns1.example.com_user_data |  2 +-
 ...te_nodes.privatedns1.example.com_user_data |  2 +-
 ...s_s3_object_cluster-completed.spec_content |  3 --
 ...ect_nodeupconfig-master-us-test-1a_content |  3 --
 .../aws_s3_object_nodeupconfig-nodes_content  |  3 --
 ....masters.privatedns2.example.com_user_data |  2 +-
 ...te_nodes.privatedns2.example.com_user_data |  2 +-
 ...s_s3_object_cluster-completed.spec_content |  3 --
 ...ect_nodeupconfig-master-us-test-1a_content |  3 --
 .../aws_s3_object_nodeupconfig-nodes_content  |  3 --
 ...sters.privateflannel.example.com_user_data |  2 +-
 ...nodes.privateflannel.example.com_user_data |  2 +-
 ...s_s3_object_cluster-completed.spec_content |  3 --
 ...ect_nodeupconfig-master-us-test-1a_content |  3 --
 .../aws_s3_object_nodeupconfig-nodes_content  |  3 --
 ...asters.privatekopeio.example.com_user_data |  2 +-
 ..._nodes.privatekopeio.example.com_user_data |  2 +-
 ...s_s3_object_cluster-completed.spec_content |  3 --
 ...ect_nodeupconfig-master-us-test-1a_content |  3 --
 .../aws_s3_object_nodeupconfig-nodes_content  |  3 --
 ...t-1a.masters.minimal.example.com_user_data |  2 +-
 ...mplate_nodes.minimal.example.com_user_data |  2 +-
 ...s_s3_object_cluster-completed.spec_content |  3 --
 ...ect_nodeupconfig-master-us-test-1a_content |  3 --
 .../aws_s3_object_nodeupconfig-nodes_content  |  3 --
 ...masters.sharedsubnet.example.com_user_data |  2 +-
 ...e_nodes.sharedsubnet.example.com_user_data |  2 +-
 ...s_s3_object_cluster-completed.spec_content |  3 --
 ...ect_nodeupconfig-master-us-test-1a_content |  3 --
 .../aws_s3_object_nodeupconfig-nodes_content  |  3 --
 ...1a.masters.sharedvpc.example.com_user_data |  2 +-
 ...late_nodes.sharedvpc.example.com_user_data |  2 +-
 ...s_s3_object_cluster-completed.spec_content |  3 --
 ...ect_nodeupconfig-master-us-test-1a_content |  3 --
 .../aws_s3_object_nodeupconfig-nodes_content  |  3 --
 ...masters.minimal-ipv6.example.com_user_data |  2 +-
 ...e_nodes.minimal-ipv6.example.com_user_data |  2 +-
 ...s_s3_object_cluster-completed.spec_content |  3 --
 ...ect_nodeupconfig-master-us-test-1a_content |  3 --
 .../aws_s3_object_nodeupconfig-nodes_content  |  3 --
 ...1a.masters.unmanaged.example.com_user_data |  2 +-
 ...late_nodes.unmanaged.example.com_user_data |  2 +-
 ...s_s3_object_cluster-completed.spec_content |  3 --
 ...ect_nodeupconfig-master-us-test-1a_content |  3 --
 .../aws_s3_object_nodeupconfig-nodes_content  |  3 --
 ...t-1a.masters.minimal.example.com_user_data |  2 +-
 ...mplate_nodes.minimal.example.com_user_data |  2 +-
 ...s_s3_object_cluster-completed.spec_content |  3 --
 ...ect_nodeupconfig-master-us-test-1a_content |  3 --
 .../aws_s3_object_nodeupconfig-nodes_content  |  3 --
 443 files changed, 201 insertions(+), 990 deletions(-)

diff --git a/k8s/crds/kops.k8s.io_clusters.yaml b/k8s/crds/kops.k8s.io_clusters.yaml
index dc11289a51..002312f3c3 100644
--- a/k8s/crds/kops.k8s.io_clusters.yaml
+++ b/k8s/crds/kops.k8s.io_clusters.yaml
@@ -226,8 +226,8 @@ spec:
                           type: object
                         type: array
                       image:
-                        description: Image is the AWS IAM Authenticator docker image
-                          to uses
+                        description: Image is the AWS IAM Authenticator container
+                          image to use.
                         type: string
                       memoryLimit:
                         anyOf:
@@ -299,7 +299,7 @@ spec:
                       type: string
                     type: array
                   image:
-                    description: 'Image is the docker container used. Default: the
+                    description: 'Image is the container image used. Default: the
                       latest supported image for the specified kubernetes version.'
                     type: string
                   managed:
@@ -681,7 +681,7 @@ spec:
                 description: The CloudProvider to use (aws or gce)
                 type: string
               clusterAutoscaler:
-                description: ClusterAutoscaler defines the cluaster autoscaler configuration.
+                description: ClusterAutoscaler defines the cluster autoscaler configuration.
                 properties:
                   awsUseStaticInstanceList:
                     description: 'AWSUseStaticInstanceList makes the cluster autoscaler
@@ -736,7 +736,7 @@ spec:
                       for scaling down. Default: false'
                     type: boolean
                   image:
-                    description: 'Image is the docker container used. Default: the
+                    description: 'Image is the container image used. Default: the
                       latest supported image for the specified kubernetes version.'
                     type: string
                   maxNodeProvisionTime:
@@ -805,7 +805,7 @@ spec:
                 description: ConfigStore is unused.
                 type: string
               containerRuntime:
-                description: Container runtime to use for Kubernetes
+                description: ContainerRuntime was removed.
                 type: string
               containerd:
                 description: Component configurations
@@ -1800,7 +1800,7 @@ spec:
                     format: int32
                     type: integer
                   image:
-                    description: Image is the docker container used
+                    description: Image is the container image used.
                     type: string
                   insecureBindAddress:
                     description: InsecureBindAddress is the binding address for the
@@ -2206,7 +2206,7 @@ spec:
                       metrics is enabled.
                     type: boolean
                   image:
-                    description: Image is the docker image to use
+                    description: Image is the container image to use.
                     type: string
                   kubeAPIBurst:
                     description: KubeAPIBurst Burst to use while talking with kubernetes
@@ -3507,7 +3507,7 @@ spec:
                       feature gates for alpha/experimental features.
                     type: object
                   image:
-                    description: Image is the docker image to use
+                    description: Image is the container image to use.
                     type: string
                   leaderElection:
                     description: LeaderElection defines the configuration of leader
@@ -3684,8 +3684,7 @@ spec:
                       policy of None to static
                     type: string
                   dockerDisableSharedPID:
-                    description: DockerDisableSharedPID uses a shared PID namespace
-                      for containers in a pod.
+                    description: DockerDisableSharedPID was removed.
                     type: boolean
                   enableCadvisorJsonEndpoints:
                     description: EnableCadvisorJsonEndpoints enables cAdvisor json
@@ -3947,10 +3946,8 @@ spec:
                       profiles.
                     type: string
                   serializeImagePulls:
-                    description: '// SerializeImagePulls when enabled, tells the Kubelet
-                      to pull images one // at a time. We recommend *not* changing
-                      the default value on nodes that // run docker daemon with version  <
-                      1.9 or an Aufs storage backend. // Issue #10959 has more details.'
+                    description: SerializeImagePulls when enabled, tells the Kubelet
+                      to pull images one at a time.
                     type: boolean
                   shutdownGracePeriod:
                     description: 'ShutdownGracePeriod specifies the total duration
@@ -4121,8 +4118,7 @@ spec:
                       policy of None to static
                     type: string
                   dockerDisableSharedPID:
-                    description: DockerDisableSharedPID uses a shared PID namespace
-                      for containers in a pod.
+                    description: DockerDisableSharedPID was removed.
                     type: boolean
                   enableCadvisorJsonEndpoints:
                     description: EnableCadvisorJsonEndpoints enables cAdvisor json
@@ -4384,10 +4380,8 @@ spec:
                       profiles.
                     type: string
                   serializeImagePulls:
-                    description: '// SerializeImagePulls when enabled, tells the Kubelet
-                      to pull images one // at a time. We recommend *not* changing
-                      the default value on nodes that // run docker daemon with version  <
-                      1.9 or an Aufs storage backend. // Issue #10959 has more details.'
+                    description: SerializeImagePulls when enabled, tells the Kubelet
+                      to pull images one at a time.
                     type: boolean
                   shutdownGracePeriod:
                     description: 'ShutdownGracePeriod specifies the total duration
@@ -4464,7 +4458,7 @@ spec:
                     description: 'Enabled enables the metrics server. Default: false'
                     type: boolean
                   image:
-                    description: 'Image is the docker container used. Default: the
+                    description: 'Image is the container image used. Default: the
                       latest supported image for the specified kubernetes version.'
                     type: string
                   insecure:
@@ -5423,7 +5417,7 @@ spec:
                       false'
                     type: boolean
                   image:
-                    description: Image is the NodeProblemDetector docker container
+                    description: Image is the NodeProblemDetector container image
                       used.
                     type: string
                   memoryLimit:
diff --git a/k8s/crds/kops.k8s.io_instancegroups.yaml b/k8s/crds/kops.k8s.io_instancegroups.yaml
index 8f9e4f2078..d0e3b79e39 100644
--- a/k8s/crds/kops.k8s.io_instancegroups.yaml
+++ b/k8s/crds/kops.k8s.io_instancegroups.yaml
@@ -477,8 +477,7 @@ spec:
                       policy of None to static
                     type: string
                   dockerDisableSharedPID:
-                    description: DockerDisableSharedPID uses a shared PID namespace
-                      for containers in a pod.
+                    description: DockerDisableSharedPID was removed.
                     type: boolean
                   enableCadvisorJsonEndpoints:
                     description: EnableCadvisorJsonEndpoints enables cAdvisor json
@@ -740,10 +739,8 @@ spec:
                       profiles.
                     type: string
                   serializeImagePulls:
-                    description: '// SerializeImagePulls when enabled, tells the Kubelet
-                      to pull images one // at a time. We recommend *not* changing
-                      the default value on nodes that // run docker daemon with version  <
-                      1.9 or an Aufs storage backend. // Issue #10959 has more details.'
+                    description: SerializeImagePulls when enabled, tells the Kubelet
+                      to pull images one at a time.
                     type: boolean
                   shutdownGracePeriod:
                     description: 'ShutdownGracePeriod specifies the total duration
diff --git a/pkg/model/tests/data/bootstrapscript_0.txt b/pkg/model/tests/data/bootstrapscript_0.txt
index 3c9200430a..626636afbe 100644
--- a/pkg/model/tests/data/bootstrapscript_0.txt
+++ b/pkg/model/tests/data/bootstrapscript_0.txt
@@ -142,7 +142,7 @@ cat > conf/kube_env.yaml << '__EOF_KUBE_ENV'
 CloudProvider: aws
 InstanceGroupName: testIG
 InstanceGroupRole: ControlPlane
-NodeupConfigHash: od7B+hssN4a8ZCNx8Jdg6OzS3Jt8kMr6JOj8HdREE5E=
+NodeupConfigHash: sq0FwAxnWal2+vIUsu8xUKK8Q+Vzx3V9LKkSFo/ds4M=
 
 __EOF_KUBE_ENV
 
diff --git a/pkg/model/tests/data/bootstrapscript_1.txt b/pkg/model/tests/data/bootstrapscript_1.txt
index 1df1be5e0a..a3e35d5259 100644
--- a/pkg/model/tests/data/bootstrapscript_1.txt
+++ b/pkg/model/tests/data/bootstrapscript_1.txt
@@ -142,7 +142,7 @@ cat > conf/kube_env.yaml << '__EOF_KUBE_ENV'
 CloudProvider: aws
 InstanceGroupName: testIG
 InstanceGroupRole: ControlPlane
-NodeupConfigHash: h6qKgtEtS6PGukVzhRtiCAGz6RryXvF6RDTRbDMCdlA=
+NodeupConfigHash: soFi0PS8cYVnHNTGuj1Fv1d8Q71M6D9Mgo/fjlPSkB0=
 
 __EOF_KUBE_ENV
 
diff --git a/pkg/model/tests/data/bootstrapscript_2.txt b/pkg/model/tests/data/bootstrapscript_2.txt
index 1df1be5e0a..a3e35d5259 100644
--- a/pkg/model/tests/data/bootstrapscript_2.txt
+++ b/pkg/model/tests/data/bootstrapscript_2.txt
@@ -142,7 +142,7 @@ cat > conf/kube_env.yaml << '__EOF_KUBE_ENV'
 CloudProvider: aws
 InstanceGroupName: testIG
 InstanceGroupRole: ControlPlane
-NodeupConfigHash: h6qKgtEtS6PGukVzhRtiCAGz6RryXvF6RDTRbDMCdlA=
+NodeupConfigHash: soFi0PS8cYVnHNTGuj1Fv1d8Q71M6D9Mgo/fjlPSkB0=
 
 __EOF_KUBE_ENV
 
diff --git a/pkg/model/tests/data/bootstrapscript_3.txt b/pkg/model/tests/data/bootstrapscript_3.txt
index d855ef5973..3118128f96 100644
--- a/pkg/model/tests/data/bootstrapscript_3.txt
+++ b/pkg/model/tests/data/bootstrapscript_3.txt
@@ -142,7 +142,7 @@ cat > conf/kube_env.yaml << '__EOF_KUBE_ENV'
 CloudProvider: aws
 InstanceGroupName: testIG
 InstanceGroupRole: Node
-NodeupConfigHash: SFm5o2UoW/PpcVhYaqBqAFkEPji4gdDDFA39AG2cbRY=
+NodeupConfigHash: bzOu75vonqETQp0my4RwAbbZvfTkGmwJ0uvaN5JHI5Y=
 
 __EOF_KUBE_ENV
 
diff --git a/pkg/model/tests/data/bootstrapscript_4.txt b/pkg/model/tests/data/bootstrapscript_4.txt
index 79210b7301..154d966d16 100644
--- a/pkg/model/tests/data/bootstrapscript_4.txt
+++ b/pkg/model/tests/data/bootstrapscript_4.txt
@@ -142,7 +142,7 @@ cat > conf/kube_env.yaml << '__EOF_KUBE_ENV'
 CloudProvider: aws
 InstanceGroupName: testIG
 InstanceGroupRole: Node
-NodeupConfigHash: cTeq76tVHjuRHdKj2s4F3JT3J+bTd3rm9gsEhapL3DQ=
+NodeupConfigHash: Pj5zYnkoZ3wGhph8FTN58SH0n4LL85thsUN6YE09xe0=
 
 __EOF_KUBE_ENV
 
diff --git a/pkg/model/tests/data/bootstrapscript_5.txt b/pkg/model/tests/data/bootstrapscript_5.txt
index 79210b7301..154d966d16 100644
--- a/pkg/model/tests/data/bootstrapscript_5.txt
+++ b/pkg/model/tests/data/bootstrapscript_5.txt
@@ -142,7 +142,7 @@ cat > conf/kube_env.yaml << '__EOF_KUBE_ENV'
 CloudProvider: aws
 InstanceGroupName: testIG
 InstanceGroupRole: Node
-NodeupConfigHash: cTeq76tVHjuRHdKj2s4F3JT3J+bTd3rm9gsEhapL3DQ=
+NodeupConfigHash: Pj5zYnkoZ3wGhph8FTN58SH0n4LL85thsUN6YE09xe0=
 
 __EOF_KUBE_ENV
 
diff --git a/pkg/model/tests/data/nodeupconfig_0.txt b/pkg/model/tests/data/nodeupconfig_0.txt
index 021d423c60..821a859303 100644
--- a/pkg/model/tests/data/nodeupconfig_0.txt
+++ b/pkg/model/tests/data/nodeupconfig_0.txt
@@ -5,7 +5,6 @@ APIServerConfig:
     image: CoreOS
   ServiceAccountPublicKeys: ""
 CAs: {}
-ContainerRuntime: docker
 ControlPlaneConfig:
   KubeControllerManager:
     cloudProvider: aws
@@ -42,7 +41,5 @@ UpdatePolicy: automatic
 configStore: {}
 containerdConfig:
   logLevel: info
-docker:
-  logLevel: INFO
 usesLegacyGossip: false
 usesNoneDNS: false
diff --git a/pkg/model/tests/data/nodeupconfig_1.txt b/pkg/model/tests/data/nodeupconfig_1.txt
index ba24c9791b..58c12a8c50 100644
--- a/pkg/model/tests/data/nodeupconfig_1.txt
+++ b/pkg/model/tests/data/nodeupconfig_1.txt
@@ -5,7 +5,6 @@ APIServerConfig:
     image: CoreOS
   ServiceAccountPublicKeys: ""
 CAs: {}
-ContainerRuntime: docker
 ControlPlaneConfig:
   KubeControllerManager:
     cloudProvider: aws
@@ -60,7 +59,5 @@ UpdatePolicy: automatic
 configStore: {}
 containerdConfig:
   logLevel: info
-docker:
-  logLevel: INFO
 usesLegacyGossip: false
 usesNoneDNS: false
diff --git a/pkg/model/tests/data/nodeupconfig_2.txt b/pkg/model/tests/data/nodeupconfig_2.txt
index ba24c9791b..58c12a8c50 100644
--- a/pkg/model/tests/data/nodeupconfig_2.txt
+++ b/pkg/model/tests/data/nodeupconfig_2.txt
@@ -5,7 +5,6 @@ APIServerConfig:
     image: CoreOS
   ServiceAccountPublicKeys: ""
 CAs: {}
-ContainerRuntime: docker
 ControlPlaneConfig:
   KubeControllerManager:
     cloudProvider: aws
@@ -60,7 +59,5 @@ UpdatePolicy: automatic
 configStore: {}
 containerdConfig:
   logLevel: info
-docker:
-  logLevel: INFO
 usesLegacyGossip: false
 usesNoneDNS: false
diff --git a/pkg/model/tests/data/nodeupconfig_3.txt b/pkg/model/tests/data/nodeupconfig_3.txt
index b5bf8ec119..b8ddadb3d8 100644
--- a/pkg/model/tests/data/nodeupconfig_3.txt
+++ b/pkg/model/tests/data/nodeupconfig_3.txt
@@ -1,5 +1,4 @@
 CAs: {}
-ContainerRuntime: docker
 FileAssets:
 - content: user,token
   name: tokens
@@ -26,7 +25,5 @@ Networking:
 UpdatePolicy: automatic
 containerdConfig:
   logLevel: info
-docker:
-  logLevel: INFO
 usesLegacyGossip: false
 usesNoneDNS: false
diff --git a/pkg/model/tests/data/nodeupconfig_4.txt b/pkg/model/tests/data/nodeupconfig_4.txt
index 06ad71a3e9..813787a159 100644
--- a/pkg/model/tests/data/nodeupconfig_4.txt
+++ b/pkg/model/tests/data/nodeupconfig_4.txt
@@ -1,5 +1,4 @@
 CAs: {}
-ContainerRuntime: docker
 FileAssets:
 - content: blah blah
   name: iptables-restore
@@ -44,7 +43,5 @@ Networking:
 UpdatePolicy: automatic
 containerdConfig:
   logLevel: info
-docker:
-  logLevel: INFO
 usesLegacyGossip: false
 usesNoneDNS: false
diff --git a/pkg/model/tests/data/nodeupconfig_5.txt b/pkg/model/tests/data/nodeupconfig_5.txt
index 06ad71a3e9..813787a159 100644
--- a/pkg/model/tests/data/nodeupconfig_5.txt
+++ b/pkg/model/tests/data/nodeupconfig_5.txt
@@ -1,5 +1,4 @@
 CAs: {}
-ContainerRuntime: docker
 FileAssets:
 - content: blah blah
   name: iptables-restore
@@ -44,7 +43,5 @@ Networking:
 UpdatePolicy: automatic
 containerdConfig:
   logLevel: info
-docker:
-  logLevel: INFO
 usesLegacyGossip: false
 usesNoneDNS: false
diff --git a/tests/integration/update_cluster/additionalobjects/data/aws_launch_template_master-us-test-1a.masters.additionalobjects.example.com_user_data b/tests/integration/update_cluster/additionalobjects/data/aws_launch_template_master-us-test-1a.masters.additionalobjects.example.com_user_data
index 0898256178..128fc00223 100644
--- a/tests/integration/update_cluster/additionalobjects/data/aws_launch_template_master-us-test-1a.masters.additionalobjects.example.com_user_data
+++ b/tests/integration/update_cluster/additionalobjects/data/aws_launch_template_master-us-test-1a.masters.additionalobjects.example.com_user_data
@@ -128,7 +128,7 @@ ClusterName: additionalobjects.example.com
 ConfigBase: memfs://tests/additionalobjects.example.com
 InstanceGroupName: master-us-test-1a
 InstanceGroupRole: ControlPlane
-NodeupConfigHash: FxjsWRJZOaGgNNZK0YcqMCEjT8bTvHFVsbnkE83rh+g=
+NodeupConfigHash: 4xSMLgrGaiXH5I4SKLU8S4L7Wwy0SLdUAmDBOy/nfUI=
 
 __EOF_KUBE_ENV
 
diff --git a/tests/integration/update_cluster/additionalobjects/data/aws_launch_template_nodes.additionalobjects.example.com_user_data b/tests/integration/update_cluster/additionalobjects/data/aws_launch_template_nodes.additionalobjects.example.com_user_data
index 2a1a90e716..f1fff54078 100644
--- a/tests/integration/update_cluster/additionalobjects/data/aws_launch_template_nodes.additionalobjects.example.com_user_data
+++ b/tests/integration/update_cluster/additionalobjects/data/aws_launch_template_nodes.additionalobjects.example.com_user_data
@@ -151,7 +151,7 @@ ConfigServer:
   - https://kops-controller.internal.additionalobjects.example.com:3988/
 InstanceGroupName: nodes
 InstanceGroupRole: Node
-NodeupConfigHash: BGTyfaqYUKKo9cqsKbd7zgfnReFScVOOaNSwJU9UX5s=
+NodeupConfigHash: vEMFOBLlQ53QYZunuOpXsApdeLF7EYg3Wzer4VGvbj4=
 
 __EOF_KUBE_ENV
 
diff --git a/tests/integration/update_cluster/additionalobjects/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/additionalobjects/data/aws_s3_object_cluster-completed.spec_content
index 891e955143..7186026a25 100644
--- a/tests/integration/update_cluster/additionalobjects/data/aws_s3_object_cluster-completed.spec_content
+++ b/tests/integration/update_cluster/additionalobjects/data/aws_s3_object_cluster-completed.spec_content
@@ -24,15 +24,12 @@ spec:
   cloudProvider: aws
   clusterDNSDomain: cluster.local
   configBase: memfs://tests/additionalobjects.example.com
-  containerRuntime: containerd
   containerd:
     logLevel: info
     runc:
       version: 1.1.7
     version: 1.7.2
   dnsZone: Z1AFAKE1ZON3YO
-  docker:
-    skipInstall: true
   etcdClusters:
   - backups:
       backupStore: memfs://tests/additionalobjects.example.com/backups/etcd/main
diff --git a/tests/integration/update_cluster/additionalobjects/data/aws_s3_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/additionalobjects/data/aws_s3_object_nodeupconfig-master-us-test-1a_content
index 6d27fcab14..ad686f0de6 100644
--- a/tests/integration/update_cluster/additionalobjects/data/aws_s3_object_nodeupconfig-master-us-test-1a_content
+++ b/tests/integration/update_cluster/additionalobjects/data/aws_s3_object_nodeupconfig-master-us-test-1a_content
@@ -228,7 +228,6 @@ CAs:
     9B7UD2ushcVFPtaeoL9Gfu8aY4KJBeqqg5ojl4qmRnThjw==
     -----END CERTIFICATE-----
 ClusterName: additionalobjects.example.com
-ContainerRuntime: containerd
 ControlPlaneConfig:
   KubeControllerManager:
     allocateNodeCIDRs: true
@@ -322,8 +321,6 @@ containerdConfig:
   runc:
     version: 1.1.7
   version: 1.7.2
-docker:
-  skipInstall: true
 etcdManifests:
 - memfs://tests/additionalobjects.example.com/manifests/etcd/main-master-us-test-1a.yaml
 - memfs://tests/additionalobjects.example.com/manifests/etcd/events-master-us-test-1a.yaml
diff --git a/tests/integration/update_cluster/additionalobjects/data/aws_s3_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/additionalobjects/data/aws_s3_object_nodeupconfig-nodes_content
index ef5b1d2acb..688425edec 100644
--- a/tests/integration/update_cluster/additionalobjects/data/aws_s3_object_nodeupconfig-nodes_content
+++ b/tests/integration/update_cluster/additionalobjects/data/aws_s3_object_nodeupconfig-nodes_content
@@ -15,7 +15,6 @@ Assets:
   - 1b309c4d5aa4cc7b888b2f79c385ecee26ca3d55dae0852e7c4a692196d5faab@https://github.com/opencontainers/runc/releases/download/v1.1.7/runc.arm64
 CAs: {}
 ClusterName: additionalobjects.example.com
-ContainerRuntime: containerd
 Hooks:
 - null
 - null
@@ -58,7 +57,5 @@ containerdConfig:
   runc:
     version: 1.1.7
   version: 1.7.2
-docker:
-  skipInstall: true
 usesLegacyGossip: false
 usesNoneDNS: false
diff --git a/tests/integration/update_cluster/apiservernodes/data/aws_launch_template_apiserver.apiservers.minimal.example.com_user_data b/tests/integration/update_cluster/apiservernodes/data/aws_launch_template_apiserver.apiservers.minimal.example.com_user_data
index e570fbae38..b610acdb95 100644
--- a/tests/integration/update_cluster/apiservernodes/data/aws_launch_template_apiserver.apiservers.minimal.example.com_user_data
+++ b/tests/integration/update_cluster/apiservernodes/data/aws_launch_template_apiserver.apiservers.minimal.example.com_user_data
@@ -128,7 +128,7 @@ ClusterName: minimal.example.com
 ConfigBase: memfs://clusters.example.com/minimal.example.com
 InstanceGroupName: apiserver
 InstanceGroupRole: APIServer
-NodeupConfigHash: bS7lFdrLmDdOfwplNoOz/TMaAefxZK0gfc0HLuF1cPI=
+NodeupConfigHash: crkbI9GSsfLCCHoHPVm7qF7Y3PxOY4lEpTUGjk01DqM=
 
 __EOF_KUBE_ENV
 
diff --git a/tests/integration/update_cluster/apiservernodes/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data b/tests/integration/update_cluster/apiservernodes/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data
index 2364524ea0..ef7ef3b5d3 100644
--- a/tests/integration/update_cluster/apiservernodes/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data
+++ b/tests/integration/update_cluster/apiservernodes/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data
@@ -128,7 +128,7 @@ ClusterName: minimal.example.com
 ConfigBase: memfs://clusters.example.com/minimal.example.com
 InstanceGroupName: master-us-test-1a
 InstanceGroupRole: ControlPlane
-NodeupConfigHash: 4OK/CagyQRKjTwATwaTYENGuofIuWMsLf6zxCQN5Krw=
+NodeupConfigHash: p+4hRDrqAVdnMpskXS6s111sgoDxVoAN8Ydrf2zrjRg=
 
 __EOF_KUBE_ENV
 
diff --git a/tests/integration/update_cluster/apiservernodes/data/aws_launch_template_nodes.minimal.example.com_user_data b/tests/integration/update_cluster/apiservernodes/data/aws_launch_template_nodes.minimal.example.com_user_data
index 7c44520f82..b16e07f24e 100644
--- a/tests/integration/update_cluster/apiservernodes/data/aws_launch_template_nodes.minimal.example.com_user_data
+++ b/tests/integration/update_cluster/apiservernodes/data/aws_launch_template_nodes.minimal.example.com_user_data
@@ -151,7 +151,7 @@ ConfigServer:
   - https://kops-controller.internal.minimal.example.com:3988/
 InstanceGroupName: nodes
 InstanceGroupRole: Node
-NodeupConfigHash: 6zXkldZccDbJi573eLEvEOa/mEJX/QotharCFYpwxyI=
+NodeupConfigHash: nYhTYowp3Cy5Ik9/eSn1btKwj1IX3MSZ1q1gus9GqTA=
 
 __EOF_KUBE_ENV
 
diff --git a/tests/integration/update_cluster/apiservernodes/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/apiservernodes/data/aws_s3_object_cluster-completed.spec_content
index ccdf81f14d..e70d1f4a38 100644
--- a/tests/integration/update_cluster/apiservernodes/data/aws_s3_object_cluster-completed.spec_content
+++ b/tests/integration/update_cluster/apiservernodes/data/aws_s3_object_cluster-completed.spec_content
@@ -24,15 +24,12 @@ spec:
   cloudProvider: aws
   clusterDNSDomain: cluster.local
   configBase: memfs://clusters.example.com/minimal.example.com
-  containerRuntime: containerd
   containerd:
     logLevel: info
     runc:
       version: 1.1.5
     version: 1.6.20
   dnsZone: Z1AFAKE1ZON3YO
-  docker:
-    skipInstall: true
   etcdClusters:
   - backups:
       backupStore: memfs://clusters.example.com/minimal.example.com/backups/etcd/main
diff --git a/tests/integration/update_cluster/apiservernodes/data/aws_s3_object_nodeupconfig-apiserver_content b/tests/integration/update_cluster/apiservernodes/data/aws_s3_object_nodeupconfig-apiserver_content
index a4cf629456..ab46528a96 100644
--- a/tests/integration/update_cluster/apiservernodes/data/aws_s3_object_nodeupconfig-apiserver_content
+++ b/tests/integration/update_cluster/apiservernodes/data/aws_s3_object_nodeupconfig-apiserver_content
@@ -138,7 +138,6 @@ CAs:
     9B7UD2ushcVFPtaeoL9Gfu8aY4KJBeqqg5ojl4qmRnThjw==
     -----END CERTIFICATE-----
 ClusterName: minimal.example.com
-ContainerRuntime: containerd
 FileAssets:
 - content: |
     apiVersion: kubescheduler.config.k8s.io/v1
@@ -195,8 +194,6 @@ containerdConfig:
   runc:
     version: 1.1.5
   version: 1.6.20
-docker:
-  skipInstall: true
 staticManifests:
 - key: kube-apiserver-healthcheck
   path: manifests/static/kube-apiserver-healthcheck.yaml
diff --git a/tests/integration/update_cluster/apiservernodes/data/aws_s3_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/apiservernodes/data/aws_s3_object_nodeupconfig-master-us-test-1a_content
index cba75e9680..6885d559ce 100644
--- a/tests/integration/update_cluster/apiservernodes/data/aws_s3_object_nodeupconfig-master-us-test-1a_content
+++ b/tests/integration/update_cluster/apiservernodes/data/aws_s3_object_nodeupconfig-master-us-test-1a_content
@@ -228,7 +228,6 @@ CAs:
     9B7UD2ushcVFPtaeoL9Gfu8aY4KJBeqqg5ojl4qmRnThjw==
     -----END CERTIFICATE-----
 ClusterName: minimal.example.com
-ContainerRuntime: containerd
 ControlPlaneConfig:
   KubeControllerManager:
     allocateNodeCIDRs: true
@@ -320,8 +319,6 @@ containerdConfig:
   runc:
     version: 1.1.5
   version: 1.6.20
-docker:
-  skipInstall: true
 etcdManifests:
 - memfs://clusters.example.com/minimal.example.com/manifests/etcd/main-master-us-test-1a.yaml
 - memfs://clusters.example.com/minimal.example.com/manifests/etcd/events-master-us-test-1a.yaml
diff --git a/tests/integration/update_cluster/apiservernodes/data/aws_s3_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/apiservernodes/data/aws_s3_object_nodeupconfig-nodes_content
index e55210acfe..95d5389851 100644
--- a/tests/integration/update_cluster/apiservernodes/data/aws_s3_object_nodeupconfig-nodes_content
+++ b/tests/integration/update_cluster/apiservernodes/data/aws_s3_object_nodeupconfig-nodes_content
@@ -15,7 +15,6 @@ Assets:
   - 54e79e4d48b9e191767e4abc08be1a8476a1c757e9a9f8c45c6ded001226867f@https://github.com/opencontainers/runc/releases/download/v1.1.5/runc.arm64
 CAs: {}
 ClusterName: minimal.example.com
-ContainerRuntime: containerd
 Hooks:
 - null
 - null
@@ -57,7 +56,5 @@ containerdConfig:
   runc:
     version: 1.1.5
   version: 1.6.20
-docker:
-  skipInstall: true
 usesLegacyGossip: false
 usesNoneDNS: false
diff --git a/tests/integration/update_cluster/aws-lb-controller/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data b/tests/integration/update_cluster/aws-lb-controller/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data
index 7ecad213da..8d70694d88 100644
--- a/tests/integration/update_cluster/aws-lb-controller/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data
+++ b/tests/integration/update_cluster/aws-lb-controller/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data
@@ -128,7 +128,7 @@ ClusterName: minimal.example.com
 ConfigBase: memfs://clusters.example.com/minimal.example.com
 InstanceGroupName: master-us-test-1a
 InstanceGroupRole: ControlPlane
-NodeupConfigHash: qcmONpsVF20J10Q8aBxO9+mfsTE1CZ9VyWOT+Cf3Qrw=
+NodeupConfigHash: utGE2ktbT8LJDFeHLDc54JKqFfbNF/2Q3+rBhbuIDqw=
 
 __EOF_KUBE_ENV
 
diff --git a/tests/integration/update_cluster/aws-lb-controller/data/aws_launch_template_nodes.minimal.example.com_user_data b/tests/integration/update_cluster/aws-lb-controller/data/aws_launch_template_nodes.minimal.example.com_user_data
index 0915bd9981..661841cc5b 100644
--- a/tests/integration/update_cluster/aws-lb-controller/data/aws_launch_template_nodes.minimal.example.com_user_data
+++ b/tests/integration/update_cluster/aws-lb-controller/data/aws_launch_template_nodes.minimal.example.com_user_data
@@ -151,7 +151,7 @@ ConfigServer:
   - https://kops-controller.internal.minimal.example.com:3988/
 InstanceGroupName: nodes
 InstanceGroupRole: Node
-NodeupConfigHash: q+zd9qOWcsPuVG5sYSiAcphkD0PBPRnWbw9yRz0MRLA=
+NodeupConfigHash: 1AGiv4MNUt9ZDs4jDI6wLlDP7gNbhcdFx4N5IrqMuj0=
 
 __EOF_KUBE_ENV
 
diff --git a/tests/integration/update_cluster/aws-lb-controller/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/aws-lb-controller/data/aws_s3_object_cluster-completed.spec_content
index 62341d7ae1..adffa05296 100644
--- a/tests/integration/update_cluster/aws-lb-controller/data/aws_s3_object_cluster-completed.spec_content
+++ b/tests/integration/update_cluster/aws-lb-controller/data/aws_s3_object_cluster-completed.spec_content
@@ -28,15 +28,12 @@ spec:
   cloudProvider: aws
   clusterDNSDomain: cluster.local
   configBase: memfs://clusters.example.com/minimal.example.com
-  containerRuntime: containerd
   containerd:
     logLevel: info
     runc:
       version: 1.1.5
     version: 1.6.20
   dnsZone: Z1AFAKE1ZON3YO
-  docker:
-    skipInstall: true
   etcdClusters:
   - backups:
       backupStore: memfs://clusters.example.com/minimal.example.com/backups/etcd/main
diff --git a/tests/integration/update_cluster/aws-lb-controller/data/aws_s3_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/aws-lb-controller/data/aws_s3_object_nodeupconfig-master-us-test-1a_content
index 71e4cd6fe5..1aa6180910 100644
--- a/tests/integration/update_cluster/aws-lb-controller/data/aws_s3_object_nodeupconfig-master-us-test-1a_content
+++ b/tests/integration/update_cluster/aws-lb-controller/data/aws_s3_object_nodeupconfig-master-us-test-1a_content
@@ -227,7 +227,6 @@ CAs:
     9B7UD2ushcVFPtaeoL9Gfu8aY4KJBeqqg5ojl4qmRnThjw==
     -----END CERTIFICATE-----
 ClusterName: minimal.example.com
-ContainerRuntime: containerd
 ControlPlaneConfig:
   KubeControllerManager:
     allocateNodeCIDRs: true
@@ -321,8 +320,6 @@ containerdConfig:
   runc:
     version: 1.1.5
   version: 1.6.20
-docker:
-  skipInstall: true
 etcdManifests:
 - memfs://clusters.example.com/minimal.example.com/manifests/etcd/main-master-us-test-1a.yaml
 - memfs://clusters.example.com/minimal.example.com/manifests/etcd/events-master-us-test-1a.yaml
diff --git a/tests/integration/update_cluster/aws-lb-controller/data/aws_s3_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/aws-lb-controller/data/aws_s3_object_nodeupconfig-nodes_content
index 55e7649533..552bc4ab5e 100644
--- a/tests/integration/update_cluster/aws-lb-controller/data/aws_s3_object_nodeupconfig-nodes_content
+++ b/tests/integration/update_cluster/aws-lb-controller/data/aws_s3_object_nodeupconfig-nodes_content
@@ -13,7 +13,6 @@ Assets:
   - 54e79e4d48b9e191767e4abc08be1a8476a1c757e9a9f8c45c6ded001226867f@https://github.com/opencontainers/runc/releases/download/v1.1.5/runc.arm64
 CAs: {}
 ClusterName: minimal.example.com
-ContainerRuntime: containerd
 Hooks:
 - null
 - null
@@ -56,7 +55,5 @@ containerdConfig:
   runc:
     version: 1.1.5
   version: 1.6.20
-docker:
-  skipInstall: true
 usesLegacyGossip: false
 usesNoneDNS: false
diff --git a/tests/integration/update_cluster/bastionadditional_user-data/data/aws_launch_template_master-us-test-1a.masters.bastionuserdata.example.com_user_data b/tests/integration/update_cluster/bastionadditional_user-data/data/aws_launch_template_master-us-test-1a.masters.bastionuserdata.example.com_user_data
index bf181944cc..714ee24b62 100644
--- a/tests/integration/update_cluster/bastionadditional_user-data/data/aws_launch_template_master-us-test-1a.masters.bastionuserdata.example.com_user_data
+++ b/tests/integration/update_cluster/bastionadditional_user-data/data/aws_launch_template_master-us-test-1a.masters.bastionuserdata.example.com_user_data
@@ -128,7 +128,7 @@ ClusterName: bastionuserdata.example.com
 ConfigBase: memfs://clusters.example.com/bastionuserdata.example.com
 InstanceGroupName: master-us-test-1a
 InstanceGroupRole: ControlPlane
-NodeupConfigHash: 4yogwj2V0zMKT1hDS9wU8cfgLrHoDaLkveLx5NQo4OY=
+NodeupConfigHash: /K7ao4iVucT62oqoDQy59wXUg0kFQI9v1ftmfWJIr0I=
 
 __EOF_KUBE_ENV
 
diff --git a/tests/integration/update_cluster/bastionadditional_user-data/data/aws_launch_template_nodes.bastionuserdata.example.com_user_data b/tests/integration/update_cluster/bastionadditional_user-data/data/aws_launch_template_nodes.bastionuserdata.example.com_user_data
index 25af348df8..683fe5f99b 100644
--- a/tests/integration/update_cluster/bastionadditional_user-data/data/aws_launch_template_nodes.bastionuserdata.example.com_user_data
+++ b/tests/integration/update_cluster/bastionadditional_user-data/data/aws_launch_template_nodes.bastionuserdata.example.com_user_data
@@ -160,7 +160,7 @@ ConfigServer:
   - https://kops-controller.internal.bastionuserdata.example.com:3988/
 InstanceGroupName: nodes
 InstanceGroupRole: Node
-NodeupConfigHash: F089AXZWaaI8WCcKz6jGvjkb7oGj3fnKJPUFm+gLy/A=
+NodeupConfigHash: IwPCDEfrMRdJPad6N5djCVCwHdl4mB83qQtEByxT2xo=
 
 __EOF_KUBE_ENV
 
diff --git a/tests/integration/update_cluster/bastionadditional_user-data/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/bastionadditional_user-data/data/aws_s3_object_cluster-completed.spec_content
index a7e869c665..77d60cb40c 100644
--- a/tests/integration/update_cluster/bastionadditional_user-data/data/aws_s3_object_cluster-completed.spec_content
+++ b/tests/integration/update_cluster/bastionadditional_user-data/data/aws_s3_object_cluster-completed.spec_content
@@ -26,15 +26,12 @@ spec:
   cloudProvider: aws
   clusterDNSDomain: cluster.local
   configBase: memfs://clusters.example.com/bastionuserdata.example.com
-  containerRuntime: containerd
   containerd:
     logLevel: info
     runc:
       version: 1.1.5
     version: 1.6.20
   dnsZone: Z1AFAKE1ZON3YO
-  docker:
-    skipInstall: true
   etcdClusters:
   - backups:
       backupStore: memfs://clusters.example.com/bastionuserdata.example.com/backups/etcd/main
diff --git a/tests/integration/update_cluster/bastionadditional_user-data/data/aws_s3_object_nodeupconfig-bastion_content b/tests/integration/update_cluster/bastionadditional_user-data/data/aws_s3_object_nodeupconfig-bastion_content
index 845cb978d5..cef6ef8f28 100644
--- a/tests/integration/update_cluster/bastionadditional_user-data/data/aws_s3_object_nodeupconfig-bastion_content
+++ b/tests/integration/update_cluster/bastionadditional_user-data/data/aws_s3_object_nodeupconfig-bastion_content
@@ -13,7 +13,6 @@ Assets:
   - 54e79e4d48b9e191767e4abc08be1a8476a1c757e9a9f8c45c6ded001226867f@https://github.com/opencontainers/runc/releases/download/v1.1.5/runc.arm64
 CAs: {}
 ClusterName: bastionuserdata.example.com
-ContainerRuntime: containerd
 Hooks:
 - null
 - null
@@ -53,7 +52,5 @@ containerdConfig:
   runc:
     version: 1.1.5
   version: 1.6.20
-docker:
-  skipInstall: true
 usesLegacyGossip: false
 usesNoneDNS: false
diff --git a/tests/integration/update_cluster/bastionadditional_user-data/data/aws_s3_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/bastionadditional_user-data/data/aws_s3_object_nodeupconfig-master-us-test-1a_content
index 69eb743f80..d50bad472f 100644
--- a/tests/integration/update_cluster/bastionadditional_user-data/data/aws_s3_object_nodeupconfig-master-us-test-1a_content
+++ b/tests/integration/update_cluster/bastionadditional_user-data/data/aws_s3_object_nodeupconfig-master-us-test-1a_content
@@ -226,7 +226,6 @@ CAs:
     9B7UD2ushcVFPtaeoL9Gfu8aY4KJBeqqg5ojl4qmRnThjw==
     -----END CERTIFICATE-----
 ClusterName: bastionuserdata.example.com
-ContainerRuntime: containerd
 ControlPlaneConfig:
   KubeControllerManager:
     allocateNodeCIDRs: true
@@ -320,8 +319,6 @@ containerdConfig:
   runc:
     version: 1.1.5
   version: 1.6.20
-docker:
-  skipInstall: true
 etcdManifests:
 - memfs://clusters.example.com/bastionuserdata.example.com/manifests/etcd/main-master-us-test-1a.yaml
 - memfs://clusters.example.com/bastionuserdata.example.com/manifests/etcd/events-master-us-test-1a.yaml
diff --git a/tests/integration/update_cluster/bastionadditional_user-data/data/aws_s3_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/bastionadditional_user-data/data/aws_s3_object_nodeupconfig-nodes_content
index 32b9986ceb..954afba9d2 100644
--- a/tests/integration/update_cluster/bastionadditional_user-data/data/aws_s3_object_nodeupconfig-nodes_content
+++ b/tests/integration/update_cluster/bastionadditional_user-data/data/aws_s3_object_nodeupconfig-nodes_content
@@ -13,7 +13,6 @@ Assets:
   - 54e79e4d48b9e191767e4abc08be1a8476a1c757e9a9f8c45c6ded001226867f@https://github.com/opencontainers/runc/releases/download/v1.1.5/runc.arm64
 CAs: {}
 ClusterName: bastionuserdata.example.com
-ContainerRuntime: containerd
 Hooks:
 - null
 - null
@@ -56,7 +55,5 @@ containerdConfig:
   runc:
     version: 1.1.5
   version: 1.6.20
-docker:
-  skipInstall: true
 usesLegacyGossip: false
 usesNoneDNS: false
diff --git a/tests/integration/update_cluster/cluster-autoscaler-priority-expander-custom/data/aws_launch_template_master-us-test-1a.masters.cas-priority-expander-custom.example.com_user_data b/tests/integration/update_cluster/cluster-autoscaler-priority-expander-custom/data/aws_launch_template_master-us-test-1a.masters.cas-priority-expander-custom.example.com_user_data
index 4202dab545..a1027c0a94 100644
--- a/tests/integration/update_cluster/cluster-autoscaler-priority-expander-custom/data/aws_launch_template_master-us-test-1a.masters.cas-priority-expander-custom.example.com_user_data
+++ b/tests/integration/update_cluster/cluster-autoscaler-priority-expander-custom/data/aws_launch_template_master-us-test-1a.masters.cas-priority-expander-custom.example.com_user_data
@@ -128,7 +128,7 @@ ClusterName: cas-priority-expander-custom.example.com
 ConfigBase: memfs://clusters.example.com/cas-priority-expander-custom.example.com
 InstanceGroupName: master-us-test-1a
 InstanceGroupRole: ControlPlane
-NodeupConfigHash: sg3jG9XMm0ZVnn4YoM5bMiJd7XWNUgtmchp1HndIH8s=
+NodeupConfigHash: vcZbN4cd4cvjP/FPdsM2ndo0cdCLlBoNpT46jdRA7yY=
 
 __EOF_KUBE_ENV
 
diff --git a/tests/integration/update_cluster/cluster-autoscaler-priority-expander-custom/data/aws_launch_template_nodes-high-priority.cas-priority-expander-custom.example.com_user_data b/tests/integration/update_cluster/cluster-autoscaler-priority-expander-custom/data/aws_launch_template_nodes-high-priority.cas-priority-expander-custom.example.com_user_data
index 70159702d8..1616acbba9 100644
--- a/tests/integration/update_cluster/cluster-autoscaler-priority-expander-custom/data/aws_launch_template_nodes-high-priority.cas-priority-expander-custom.example.com_user_data
+++ b/tests/integration/update_cluster/cluster-autoscaler-priority-expander-custom/data/aws_launch_template_nodes-high-priority.cas-priority-expander-custom.example.com_user_data
@@ -151,7 +151,7 @@ ConfigServer:
   - https://kops-controller.internal.cas-priority-expander-custom.example.com:3988/
 InstanceGroupName: nodes-high-priority
 InstanceGroupRole: Node
-NodeupConfigHash: ir5b1EyYklfASiXbb3ONWM+54U8dFgxCm071htriZus=
+NodeupConfigHash: gKQV0ELEuYiQLs2SpC0cNs0urVhwy0Id2pLU+dBpEI8=
 
 __EOF_KUBE_ENV
 
diff --git a/tests/integration/update_cluster/cluster-autoscaler-priority-expander-custom/data/aws_launch_template_nodes-low-priority.cas-priority-expander-custom.example.com_user_data b/tests/integration/update_cluster/cluster-autoscaler-priority-expander-custom/data/aws_launch_template_nodes-low-priority.cas-priority-expander-custom.example.com_user_data
index 458d69a9e3..401bd0eb35 100644
--- a/tests/integration/update_cluster/cluster-autoscaler-priority-expander-custom/data/aws_launch_template_nodes-low-priority.cas-priority-expander-custom.example.com_user_data
+++ b/tests/integration/update_cluster/cluster-autoscaler-priority-expander-custom/data/aws_launch_template_nodes-low-priority.cas-priority-expander-custom.example.com_user_data
@@ -151,7 +151,7 @@ ConfigServer:
   - https://kops-controller.internal.cas-priority-expander-custom.example.com:3988/
 InstanceGroupName: nodes-low-priority
 InstanceGroupRole: Node
-NodeupConfigHash: ir5b1EyYklfASiXbb3ONWM+54U8dFgxCm071htriZus=
+NodeupConfigHash: gKQV0ELEuYiQLs2SpC0cNs0urVhwy0Id2pLU+dBpEI8=
 
 __EOF_KUBE_ENV
 
diff --git a/tests/integration/update_cluster/cluster-autoscaler-priority-expander-custom/data/aws_launch_template_nodes.cas-priority-expander-custom.example.com_user_data b/tests/integration/update_cluster/cluster-autoscaler-priority-expander-custom/data/aws_launch_template_nodes.cas-priority-expander-custom.example.com_user_data
index 3e2d82598b..9e4c722feb 100644
--- a/tests/integration/update_cluster/cluster-autoscaler-priority-expander-custom/data/aws_launch_template_nodes.cas-priority-expander-custom.example.com_user_data
+++ b/tests/integration/update_cluster/cluster-autoscaler-priority-expander-custom/data/aws_launch_template_nodes.cas-priority-expander-custom.example.com_user_data
@@ -151,7 +151,7 @@ ConfigServer:
   - https://kops-controller.internal.cas-priority-expander-custom.example.com:3988/
 InstanceGroupName: nodes
 InstanceGroupRole: Node
-NodeupConfigHash: ir5b1EyYklfASiXbb3ONWM+54U8dFgxCm071htriZus=
+NodeupConfigHash: gKQV0ELEuYiQLs2SpC0cNs0urVhwy0Id2pLU+dBpEI8=
 
 __EOF_KUBE_ENV
 
diff --git a/tests/integration/update_cluster/cluster-autoscaler-priority-expander-custom/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/cluster-autoscaler-priority-expander-custom/data/aws_s3_object_cluster-completed.spec_content
index 648b36af7b..5b29fc84e4 100644
--- a/tests/integration/update_cluster/cluster-autoscaler-priority-expander-custom/data/aws_s3_object_cluster-completed.spec_content
+++ b/tests/integration/update_cluster/cluster-autoscaler-priority-expander-custom/data/aws_s3_object_cluster-completed.spec_content
@@ -48,15 +48,12 @@ spec:
     skipNodesWithSystemPods: true
   clusterDNSDomain: cluster.local
   configBase: memfs://clusters.example.com/cas-priority-expander-custom.example.com
-  containerRuntime: containerd
   containerd:
     logLevel: info
     runc:
       version: 1.1.5
     version: 1.6.20
   dnsZone: Z1AFAKE1ZON3YO
-  docker:
-    skipInstall: true
   etcdClusters:
   - backups:
       backupStore: memfs://clusters.example.com/cas-priority-expander-custom.example.com/backups/etcd/main
diff --git a/tests/integration/update_cluster/cluster-autoscaler-priority-expander-custom/data/aws_s3_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/cluster-autoscaler-priority-expander-custom/data/aws_s3_object_nodeupconfig-master-us-test-1a_content
index a9d8a199c7..83fc98e3e7 100644
--- a/tests/integration/update_cluster/cluster-autoscaler-priority-expander-custom/data/aws_s3_object_nodeupconfig-master-us-test-1a_content
+++ b/tests/integration/update_cluster/cluster-autoscaler-priority-expander-custom/data/aws_s3_object_nodeupconfig-master-us-test-1a_content
@@ -227,7 +227,6 @@ CAs:
     9B7UD2ushcVFPtaeoL9Gfu8aY4KJBeqqg5ojl4qmRnThjw==
     -----END CERTIFICATE-----
 ClusterName: cas-priority-expander-custom.example.com
-ContainerRuntime: containerd
 ControlPlaneConfig:
   KubeControllerManager:
     allocateNodeCIDRs: true
@@ -320,8 +319,6 @@ containerdConfig:
   runc:
     version: 1.1.5
   version: 1.6.20
-docker:
-  skipInstall: true
 etcdManifests:
 - memfs://clusters.example.com/cas-priority-expander-custom.example.com/manifests/etcd/main-master-us-test-1a.yaml
 - memfs://clusters.example.com/cas-priority-expander-custom.example.com/manifests/etcd/events-master-us-test-1a.yaml
diff --git a/tests/integration/update_cluster/cluster-autoscaler-priority-expander-custom/data/aws_s3_object_nodeupconfig-nodes-high-priority_content b/tests/integration/update_cluster/cluster-autoscaler-priority-expander-custom/data/aws_s3_object_nodeupconfig-nodes-high-priority_content
index 6de4ff197e..d5739540cc 100644
--- a/tests/integration/update_cluster/cluster-autoscaler-priority-expander-custom/data/aws_s3_object_nodeupconfig-nodes-high-priority_content
+++ b/tests/integration/update_cluster/cluster-autoscaler-priority-expander-custom/data/aws_s3_object_nodeupconfig-nodes-high-priority_content
@@ -13,7 +13,6 @@ Assets:
   - 54e79e4d48b9e191767e4abc08be1a8476a1c757e9a9f8c45c6ded001226867f@https://github.com/opencontainers/runc/releases/download/v1.1.5/runc.arm64
 CAs: {}
 ClusterName: cas-priority-expander-custom.example.com
-ContainerRuntime: containerd
 Hooks:
 - null
 - null
@@ -55,7 +54,5 @@ containerdConfig:
   runc:
     version: 1.1.5
   version: 1.6.20
-docker:
-  skipInstall: true
 usesLegacyGossip: false
 usesNoneDNS: false
diff --git a/tests/integration/update_cluster/cluster-autoscaler-priority-expander-custom/data/aws_s3_object_nodeupconfig-nodes-low-priority_content b/tests/integration/update_cluster/cluster-autoscaler-priority-expander-custom/data/aws_s3_object_nodeupconfig-nodes-low-priority_content
index 6de4ff197e..d5739540cc 100644
--- a/tests/integration/update_cluster/cluster-autoscaler-priority-expander-custom/data/aws_s3_object_nodeupconfig-nodes-low-priority_content
+++ b/tests/integration/update_cluster/cluster-autoscaler-priority-expander-custom/data/aws_s3_object_nodeupconfig-nodes-low-priority_content
@@ -13,7 +13,6 @@ Assets:
   - 54e79e4d48b9e191767e4abc08be1a8476a1c757e9a9f8c45c6ded001226867f@https://github.com/opencontainers/runc/releases/download/v1.1.5/runc.arm64
 CAs: {}
 ClusterName: cas-priority-expander-custom.example.com
-ContainerRuntime: containerd
 Hooks:
 - null
 - null
@@ -55,7 +54,5 @@ containerdConfig:
   runc:
     version: 1.1.5
   version: 1.6.20
-docker:
-  skipInstall: true
 usesLegacyGossip: false
 usesNoneDNS: false
diff --git a/tests/integration/update_cluster/cluster-autoscaler-priority-expander-custom/data/aws_s3_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/cluster-autoscaler-priority-expander-custom/data/aws_s3_object_nodeupconfig-nodes_content
index 6de4ff197e..d5739540cc 100644
--- a/tests/integration/update_cluster/cluster-autoscaler-priority-expander-custom/data/aws_s3_object_nodeupconfig-nodes_content
+++ b/tests/integration/update_cluster/cluster-autoscaler-priority-expander-custom/data/aws_s3_object_nodeupconfig-nodes_content
@@ -13,7 +13,6 @@ Assets:
   - 54e79e4d48b9e191767e4abc08be1a8476a1c757e9a9f8c45c6ded001226867f@https://github.com/opencontainers/runc/releases/download/v1.1.5/runc.arm64
 CAs: {}
 ClusterName: cas-priority-expander-custom.example.com
-ContainerRuntime: containerd
 Hooks:
 - null
 - null
@@ -55,7 +54,5 @@ containerdConfig:
   runc:
     version: 1.1.5
   version: 1.6.20
-docker:
-  skipInstall: true
 usesLegacyGossip: false
 usesNoneDNS: false
diff --git a/tests/integration/update_cluster/cluster-autoscaler-priority-expander/data/aws_launch_template_master-us-test-1a.masters.cas-priority-expander.example.com_user_data b/tests/integration/update_cluster/cluster-autoscaler-priority-expander/data/aws_launch_template_master-us-test-1a.masters.cas-priority-expander.example.com_user_data
index 14b5787d67..eefcc30bdc 100644
--- a/tests/integration/update_cluster/cluster-autoscaler-priority-expander/data/aws_launch_template_master-us-test-1a.masters.cas-priority-expander.example.com_user_data
+++ b/tests/integration/update_cluster/cluster-autoscaler-priority-expander/data/aws_launch_template_master-us-test-1a.masters.cas-priority-expander.example.com_user_data
@@ -128,7 +128,7 @@ ClusterName: cas-priority-expander.example.com
 ConfigBase: memfs://clusters.example.com/cas-priority-expander.example.com
 InstanceGroupName: master-us-test-1a
 InstanceGroupRole: ControlPlane
-NodeupConfigHash: 7dUsD+nRVKaekOetyglYoC1sxGl9JxX9dn48UP8T5YQ=
+NodeupConfigHash: K+P6Yc085bkcgT5H+MCLyv09GFdxEPFxh2XlUkwvdl8=
 
 __EOF_KUBE_ENV
 
diff --git a/tests/integration/update_cluster/cluster-autoscaler-priority-expander/data/aws_launch_template_nodes-high-priority.cas-priority-expander.example.com_user_data b/tests/integration/update_cluster/cluster-autoscaler-priority-expander/data/aws_launch_template_nodes-high-priority.cas-priority-expander.example.com_user_data
index 1018de431a..ef8bfdc13e 100644
--- a/tests/integration/update_cluster/cluster-autoscaler-priority-expander/data/aws_launch_template_nodes-high-priority.cas-priority-expander.example.com_user_data
+++ b/tests/integration/update_cluster/cluster-autoscaler-priority-expander/data/aws_launch_template_nodes-high-priority.cas-priority-expander.example.com_user_data
@@ -151,7 +151,7 @@ ConfigServer:
   - https://kops-controller.internal.cas-priority-expander.example.com:3988/
 InstanceGroupName: nodes-high-priority
 InstanceGroupRole: Node
-NodeupConfigHash: J0wlRPXGFKt5wsGntyz7G/Tlz0oyTeRmDf/GVIMTHJM=
+NodeupConfigHash: 6okqC1gY4fJxXCSS4uFq14XyAU2xzqQL8HG0f33nVsg=
 
 __EOF_KUBE_ENV
 
diff --git a/tests/integration/update_cluster/cluster-autoscaler-priority-expander/data/aws_launch_template_nodes-low-priority.cas-priority-expander.example.com_user_data b/tests/integration/update_cluster/cluster-autoscaler-priority-expander/data/aws_launch_template_nodes-low-priority.cas-priority-expander.example.com_user_data
index f18a29f79f..d8fc4b742f 100644
--- a/tests/integration/update_cluster/cluster-autoscaler-priority-expander/data/aws_launch_template_nodes-low-priority.cas-priority-expander.example.com_user_data
+++ b/tests/integration/update_cluster/cluster-autoscaler-priority-expander/data/aws_launch_template_nodes-low-priority.cas-priority-expander.example.com_user_data
@@ -151,7 +151,7 @@ ConfigServer:
   - https://kops-controller.internal.cas-priority-expander.example.com:3988/
 InstanceGroupName: nodes-low-priority
 InstanceGroupRole: Node
-NodeupConfigHash: J0wlRPXGFKt5wsGntyz7G/Tlz0oyTeRmDf/GVIMTHJM=
+NodeupConfigHash: 6okqC1gY4fJxXCSS4uFq14XyAU2xzqQL8HG0f33nVsg=
 
 __EOF_KUBE_ENV
 
diff --git a/tests/integration/update_cluster/cluster-autoscaler-priority-expander/data/aws_launch_template_nodes.cas-priority-expander.example.com_user_data b/tests/integration/update_cluster/cluster-autoscaler-priority-expander/data/aws_launch_template_nodes.cas-priority-expander.example.com_user_data
index 004ab2f8e2..72af983d59 100644
--- a/tests/integration/update_cluster/cluster-autoscaler-priority-expander/data/aws_launch_template_nodes.cas-priority-expander.example.com_user_data
+++ b/tests/integration/update_cluster/cluster-autoscaler-priority-expander/data/aws_launch_template_nodes.cas-priority-expander.example.com_user_data
@@ -151,7 +151,7 @@ ConfigServer:
   - https://kops-controller.internal.cas-priority-expander.example.com:3988/
 InstanceGroupName: nodes
 InstanceGroupRole: Node
-NodeupConfigHash: J0wlRPXGFKt5wsGntyz7G/Tlz0oyTeRmDf/GVIMTHJM=
+NodeupConfigHash: 6okqC1gY4fJxXCSS4uFq14XyAU2xzqQL8HG0f33nVsg=
 
 __EOF_KUBE_ENV
 
diff --git a/tests/integration/update_cluster/cluster-autoscaler-priority-expander/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/cluster-autoscaler-priority-expander/data/aws_s3_object_cluster-completed.spec_content
index 05fa6e8194..d1ec23e742 100644
--- a/tests/integration/update_cluster/cluster-autoscaler-priority-expander/data/aws_s3_object_cluster-completed.spec_content
+++ b/tests/integration/update_cluster/cluster-autoscaler-priority-expander/data/aws_s3_object_cluster-completed.spec_content
@@ -41,15 +41,12 @@ spec:
     skipNodesWithSystemPods: true
   clusterDNSDomain: cluster.local
   configBase: memfs://clusters.example.com/cas-priority-expander.example.com
-  containerRuntime: containerd
   containerd:
     logLevel: info
     runc:
       version: 1.1.5
     version: 1.6.20
   dnsZone: Z1AFAKE1ZON3YO
-  docker:
-    skipInstall: true
   etcdClusters:
   - backups:
       backupStore: memfs://clusters.example.com/cas-priority-expander.example.com/backups/etcd/main
diff --git a/tests/integration/update_cluster/cluster-autoscaler-priority-expander/data/aws_s3_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/cluster-autoscaler-priority-expander/data/aws_s3_object_nodeupconfig-master-us-test-1a_content
index aaf61e3b31..aa5cd28e22 100644
--- a/tests/integration/update_cluster/cluster-autoscaler-priority-expander/data/aws_s3_object_nodeupconfig-master-us-test-1a_content
+++ b/tests/integration/update_cluster/cluster-autoscaler-priority-expander/data/aws_s3_object_nodeupconfig-master-us-test-1a_content
@@ -227,7 +227,6 @@ CAs:
     9B7UD2ushcVFPtaeoL9Gfu8aY4KJBeqqg5ojl4qmRnThjw==
     -----END CERTIFICATE-----
 ClusterName: cas-priority-expander.example.com
-ContainerRuntime: containerd
 ControlPlaneConfig:
   KubeControllerManager:
     allocateNodeCIDRs: true
@@ -320,8 +319,6 @@ containerdConfig:
   runc:
     version: 1.1.5
   version: 1.6.20
-docker:
-  skipInstall: true
 etcdManifests:
 - memfs://clusters.example.com/cas-priority-expander.example.com/manifests/etcd/main-master-us-test-1a.yaml
 - memfs://clusters.example.com/cas-priority-expander.example.com/manifests/etcd/events-master-us-test-1a.yaml
diff --git a/tests/integration/update_cluster/cluster-autoscaler-priority-expander/data/aws_s3_object_nodeupconfig-nodes-high-priority_content b/tests/integration/update_cluster/cluster-autoscaler-priority-expander/data/aws_s3_object_nodeupconfig-nodes-high-priority_content
index 72de585495..d03d2e9511 100644
--- a/tests/integration/update_cluster/cluster-autoscaler-priority-expander/data/aws_s3_object_nodeupconfig-nodes-high-priority_content
+++ b/tests/integration/update_cluster/cluster-autoscaler-priority-expander/data/aws_s3_object_nodeupconfig-nodes-high-priority_content
@@ -13,7 +13,6 @@ Assets:
   - 54e79e4d48b9e191767e4abc08be1a8476a1c757e9a9f8c45c6ded001226867f@https://github.com/opencontainers/runc/releases/download/v1.1.5/runc.arm64
 CAs: {}
 ClusterName: cas-priority-expander.example.com
-ContainerRuntime: containerd
 Hooks:
 - null
 - null
@@ -55,7 +54,5 @@ containerdConfig:
   runc:
     version: 1.1.5
   version: 1.6.20
-docker:
-  skipInstall: true
 usesLegacyGossip: false
 usesNoneDNS: false
diff --git a/tests/integration/update_cluster/cluster-autoscaler-priority-expander/data/aws_s3_object_nodeupconfig-nodes-low-priority_content b/tests/integration/update_cluster/cluster-autoscaler-priority-expander/data/aws_s3_object_nodeupconfig-nodes-low-priority_content
index 72de585495..d03d2e9511 100644
--- a/tests/integration/update_cluster/cluster-autoscaler-priority-expander/data/aws_s3_object_nodeupconfig-nodes-low-priority_content
+++ b/tests/integration/update_cluster/cluster-autoscaler-priority-expander/data/aws_s3_object_nodeupconfig-nodes-low-priority_content
@@ -13,7 +13,6 @@ Assets:
   - 54e79e4d48b9e191767e4abc08be1a8476a1c757e9a9f8c45c6ded001226867f@https://github.com/opencontainers/runc/releases/download/v1.1.5/runc.arm64
 CAs: {}
 ClusterName: cas-priority-expander.example.com
-ContainerRuntime: containerd
 Hooks:
 - null
 - null
@@ -55,7 +54,5 @@ containerdConfig:
   runc:
     version: 1.1.5
   version: 1.6.20
-docker:
-  skipInstall: true
 usesLegacyGossip: false
 usesNoneDNS: false
diff --git a/tests/integration/update_cluster/cluster-autoscaler-priority-expander/data/aws_s3_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/cluster-autoscaler-priority-expander/data/aws_s3_object_nodeupconfig-nodes_content
index 72de585495..d03d2e9511 100644
--- a/tests/integration/update_cluster/cluster-autoscaler-priority-expander/data/aws_s3_object_nodeupconfig-nodes_content
+++ b/tests/integration/update_cluster/cluster-autoscaler-priority-expander/data/aws_s3_object_nodeupconfig-nodes_content
@@ -13,7 +13,6 @@ Assets:
   - 54e79e4d48b9e191767e4abc08be1a8476a1c757e9a9f8c45c6ded001226867f@https://github.com/opencontainers/runc/releases/download/v1.1.5/runc.arm64
 CAs: {}
 ClusterName: cas-priority-expander.example.com
-ContainerRuntime: containerd
 Hooks:
 - null
 - null
@@ -55,7 +54,5 @@ containerdConfig:
   runc:
     version: 1.1.5
   version: 1.6.20
-docker:
-  skipInstall: true
 usesLegacyGossip: false
 usesNoneDNS: false
diff --git a/tests/integration/update_cluster/complex/data/aws_launch_template_master-us-test-1a.masters.complex.example.com_user_data b/tests/integration/update_cluster/complex/data/aws_launch_template_master-us-test-1a.masters.complex.example.com_user_data
index d49ee0169c..2a5660c94e 100644
--- a/tests/integration/update_cluster/complex/data/aws_launch_template_master-us-test-1a.masters.complex.example.com_user_data
+++ b/tests/integration/update_cluster/complex/data/aws_launch_template_master-us-test-1a.masters.complex.example.com_user_data
@@ -137,7 +137,7 @@ ClusterName: complex.example.com
 ConfigBase: memfs://clusters.example.com/complex.example.com
 InstanceGroupName: master-us-test-1a
 InstanceGroupRole: ControlPlane
-NodeupConfigHash: H4IpFWHeDi9zIiRC4hhPtVgEA4sAI7UMC+Ge/n+2d2I=
+NodeupConfigHash: 8llBgMPmer0wwNgQzc6HgHOziAIsfsuBrULCqM5rJ8g=
 
 __EOF_KUBE_ENV
 
diff --git a/tests/integration/update_cluster/complex/data/aws_launch_template_nodes.complex.example.com_user_data b/tests/integration/update_cluster/complex/data/aws_launch_template_nodes.complex.example.com_user_data
index 96c7dadae2..1aa5268cc3 100644
--- a/tests/integration/update_cluster/complex/data/aws_launch_template_nodes.complex.example.com_user_data
+++ b/tests/integration/update_cluster/complex/data/aws_launch_template_nodes.complex.example.com_user_data
@@ -160,7 +160,7 @@ ConfigServer:
   - https://kops-controller.internal.complex.example.com:3988/
 InstanceGroupName: nodes
 InstanceGroupRole: Node
-NodeupConfigHash: PaJx989I3MwTS+W8DSHpl8w8J+lM9J+kpdmSfx1PAts=
+NodeupConfigHash: 9zv75Jx8cz2KERhJpSTtR9jMMEUm0ZZLCHZb220xJAo=
 
 __EOF_KUBE_ENV
 
diff --git a/tests/integration/update_cluster/complex/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/complex/data/aws_s3_object_cluster-completed.spec_content
index 021cf5dc70..416b132e86 100644
--- a/tests/integration/update_cluster/complex/data/aws_s3_object_cluster-completed.spec_content
+++ b/tests/integration/update_cluster/complex/data/aws_s3_object_cluster-completed.spec_content
@@ -46,15 +46,12 @@ spec:
   cloudProvider: aws
   clusterDNSDomain: cluster.local
   configBase: memfs://clusters.example.com/complex.example.com
-  containerRuntime: containerd
   containerd:
     logLevel: info
     runc:
       version: 1.1.5
     version: 1.6.20
   dnsZone: Z1AFAKE1ZON3YO
-  docker:
-    skipInstall: true
   etcdClusters:
   - backups:
       backupStore: memfs://clusters.example.com/complex.example.com/backups/etcd/main
diff --git a/tests/integration/update_cluster/complex/data/aws_s3_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/complex/data/aws_s3_object_nodeupconfig-master-us-test-1a_content
index 68a92de579..2ea10fd7fb 100644
--- a/tests/integration/update_cluster/complex/data/aws_s3_object_nodeupconfig-master-us-test-1a_content
+++ b/tests/integration/update_cluster/complex/data/aws_s3_object_nodeupconfig-master-us-test-1a_content
@@ -234,7 +234,6 @@ CAs:
     9B7UD2ushcVFPtaeoL9Gfu8aY4KJBeqqg5ojl4qmRnThjw==
     -----END CERTIFICATE-----
 ClusterName: complex.example.com
-ContainerRuntime: containerd
 ControlPlaneConfig:
   KubeControllerManager:
     allocateNodeCIDRs: true
@@ -329,8 +328,6 @@ containerdConfig:
   runc:
     version: 1.1.5
   version: 1.6.20
-docker:
-  skipInstall: true
 etcdManifests:
 - memfs://clusters.example.com/complex.example.com/manifests/etcd/main-master-us-test-1a.yaml
 - memfs://clusters.example.com/complex.example.com/manifests/etcd/events-master-us-test-1a.yaml
diff --git a/tests/integration/update_cluster/complex/data/aws_s3_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/complex/data/aws_s3_object_nodeupconfig-nodes_content
index 47569d4c88..bee79e92cc 100644
--- a/tests/integration/update_cluster/complex/data/aws_s3_object_nodeupconfig-nodes_content
+++ b/tests/integration/update_cluster/complex/data/aws_s3_object_nodeupconfig-nodes_content
@@ -13,7 +13,6 @@ Assets:
   - 54e79e4d48b9e191767e4abc08be1a8476a1c757e9a9f8c45c6ded001226867f@https://github.com/opencontainers/runc/releases/download/v1.1.5/runc.arm64
 CAs: {}
 ClusterName: complex.example.com
-ContainerRuntime: containerd
 Hooks:
 - null
 - null
@@ -57,8 +56,6 @@ containerdConfig:
   runc:
     version: 1.1.5
   version: 1.6.20
-docker:
-  skipInstall: true
 packages:
 - nfs-common
 usesLegacyGossip: false
diff --git a/tests/integration/update_cluster/compress/data/aws_launch_template_master-us-test-1a.masters.compress.example.com_user_data b/tests/integration/update_cluster/compress/data/aws_launch_template_master-us-test-1a.masters.compress.example.com_user_data
index cd264aa570..4f4df7b600 100644
--- a/tests/integration/update_cluster/compress/data/aws_launch_template_master-us-test-1a.masters.compress.example.com_user_data
+++ b/tests/integration/update_cluster/compress/data/aws_launch_template_master-us-test-1a.masters.compress.example.com_user_data
@@ -131,7 +131,7 @@ function download-release() {
 echo "== nodeup node config starting =="
 ensure-install-dir
 
-echo "H4sIAAAAAAAA/2zOsU7DMBDG8T1P4R2lEVMrSwzUgGEgqhAEie2wL2lVn8/4bFp4eoQyRer+/+n7TODqd5m/Dx6zVnCSxoQqBXMPhFo5ppRRZIVnoBRw5Zgaw3E8TFsQ1IqQRtFd52a1CLuL+ilKgejQZq5pXiH4t22VtqCU9hqW0QsH1MpwLJnDLkDEpmePNc1HHkH2Wt27je1LnY7vn9uvSZ7Xd6N7WF+d7PltuE3D/neQj59XS35zvGn+AAAA//8BAAD//7mLlAv3AAAA" | base64 -d | gzip -d > conf/kube_env.yaml
+echo "H4sIAAAAAAAA/2zOQWrDMBCF4b1OoQs4wlmURNCNRUkLJTEttHQ5yJMm9kgjNJLr45filaH7/+M9R1yHPvN8HzBbDT+iHFUpmM8Q0GrPIWUU2eECIRHuPAflOF7v3x0IWh0wXMUa41e1Cc2/+iVKgejxlLmmdSXAn22qNAWlNC1sozcmtNpxLJmpJ4iozjxgTeuRZ5Cb1ZdPMF18nR6W0+Gp7IU6OLbt/EX7d0fHS74dcBzNh+mX6VH9AgAA//8BAAD//310lgL3AAAA" | base64 -d | gzip -d > conf/kube_env.yaml
 
 download-release
 echo "== nodeup node config done =="
diff --git a/tests/integration/update_cluster/compress/data/aws_launch_template_nodes.compress.example.com_user_data b/tests/integration/update_cluster/compress/data/aws_launch_template_nodes.compress.example.com_user_data
index 824882008c..8fb78b4348 100644
--- a/tests/integration/update_cluster/compress/data/aws_launch_template_nodes.compress.example.com_user_data
+++ b/tests/integration/update_cluster/compress/data/aws_launch_template_nodes.compress.example.com_user_data
@@ -131,7 +131,7 @@ function download-release() {
 echo "== nodeup node config starting =="
 ensure-install-dir
 
-echo "H4sIAAAAAAAA/6yUzY6ySBiF914Fe/O1CIpg0ou3KEBQEASh6R1igSj/oKVmLn4iPcmXyXQmk0mzYHFO6lm8eXLkvLoe7ba6ZUfSLpmIdiM5v3Y9aa2oIEsmroq6JV33Ru5RUefkLa6KkVyVSZa6pL2RdjliGBlk0vZZksVRT7ol88eIYRjm1+tDiqZbjKzsPF3VZfCUIR16U9fR4SzLsMtSoDqCVDfVGqwGYdFyscjB3jWB1WS30Vz9wGNHQTLdg4nSu3qG/QBBqeUjMD0c9NOw8B+Hwmc/P8w+5BS6OsWWeVao9QTexDHdYqDBK3v+zgbIUJwhNHchVSHEvuNghU7bY2DkcTHPj5r/3ATWyVQpxU5orKtP/XSLLXAUhBzAA8SlQF0wEFiqzj9b1ruIl7YLxBs9J2b9NLZ54IjCVLhpfGhHXAOpvvBn1ZomPvvQ0+kAOffjlZDM7Am92GB7tpfsakl/iNVKUVTKykAVgMiSTQUoTkPs71gbnNUEgYMhVbSvw4KowXR/VKiCJtRRTTARJCJdOcODLUKholoa//TPXrzJDYo7YzZZS9hfrKvTHv6C/PPywCqAxCPLJyFHF8G6Trac1OicNK+vnDyLIwkyX9vWqRuLA6QvnK4R2vje8964PcxFyfb7J1vQSbz27tuLkK44WZbHj1Xy4Oj7+29vFAt/b83/tepWuBG7hTwsPtY/a5Vnct9b9Sp+zCpTFdRZ9HmsCbvb14/HJUJ1QD/lkh6S5BRqWzpOOmF33Fz3zcKRrcIoJkqzGCBBsH1mZogzXXIPcV7jseBkBmvxSlPX/v4HrdroRS3A7mxjWAnlSR93ceD3vCMdyn+1ynf8+9zc91fQCbGvtlTNp/e+9jhXUG9JJhozXb6X+ZeaElrsMXftTrGv2n1Eqo2kJVcxCmdrA5GmSefVOZ81xa70Tuf/YlU3LFn3mrJfzKnv6245mVyquvsVV2XfVnlO2res7ElbRvnbd5O45CVRnIz0suujMiZaW13rrwEtqyPp/l7sqpwsGas6ktHrd62/9nQVdaclUy5MTSV3vmBpu7Ef9p2oar65bD4bPBP9NHAD9Ki87YdhXd5HfwIAAP//AQAA//9Z3yNrvgUAAA==" | base64 -d | gzip -d > conf/kube_env.yaml
+echo "H4sIAAAAAAAA/6yUSY+yWBiF9/4K9uYrERXBpBYvo6AgM0XtkEmQ4TJ51fSP70h18qXTlU6nUyxYnJP7LN48OXzZjLHRNbc8TrodEeJ+xpdjPySdHlbJjoiaCnVJ378l97BCZfIWNdWMb+o0z+ykuyXdbkYQPPBJN+RpHoVD0u+IP2YEQRC/Xh8nyopO8KLlKJLCgyNO6dRrisKdC54HK88AKxxkiiYh0FtOYHRbYChwbQ1Imbdb2VbOK8EUOR67oHHZXSrAnSBcpnscaI7gD8ug8h7nyiM/P7QhoES8v0S6VohYf8JKEyJ8EgD7r+z5O5sgU1FAoFkBliAQPNMURLzsYl8to2pTxrL3PPr6RZMwFsxAPTSfyuUW6WCKHGeCMEFsDNgGlQNdUlbPjnSuzLXrfeaGi1RDT/VU+iZDL+mbvAqMkGohU7beujng1CMfSracIMUw39Pp2ljgqwGGYziphVjlwTR7UZQwyQMWAUKd10TAQhYInkUaYO4XHJgCZKL8dVhgZFi6sYhFboFNSQONg5TBe3N6cOK4QJR0efX0Cic6lioWenW9OLCCtz00Fxf+gvzz8kCKwDExuUoDCm/9A0pPFNsqFLtBI8Wvo5CF3JNPKLMjZoIMldm3dBfdh5Uz784bhjW84UlWeBEdnPvpSmd7iuf5+WOfPij8/v7bG1EXvrfm/1p1q+yQPEEZVB+Hn7XK0ajvrXoVP2aVJtHSOvyMUUJaLno8riGHfPzJ1/icppdAPuF52tNWfBzddmvyeqVWC7HdThDfPz1zLRByhbXPUYmEOW3mKqmvxBYhz/1Bq45KhWiwCkOAPV1flHkf+d6wMtlz/a9WeaZ332juMIKSJMZosM1meR+QQ9m0dEtzRl0r/L0uv9Rkua0rUGN/iTzJGMKkObJyOjJhsD6oXNK22aYpynVbWbVzKf6LVf20ZP1ryn4Rl2FA/W6xuDao/xU19dA1ZZl0b3k9JF0dlm/fTeJuxTLMYqbU/RDWUSJ3zYi+BrRu4qT/e2E1ZbIj9CZOZq/fiL72dB/2lx3RpB/PO+sGlmu5aRFXKjo/3FqfgzrYR/CBF8bb9boht8P6ffYnAAAA//8BAAD//yzJLZS+BQAA" | base64 -d | gzip -d > conf/kube_env.yaml
 
 download-release
 echo "== nodeup node config done =="
diff --git a/tests/integration/update_cluster/compress/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/compress/data/aws_s3_object_cluster-completed.spec_content
index dba9796cc0..0c1a56c2cc 100644
--- a/tests/integration/update_cluster/compress/data/aws_s3_object_cluster-completed.spec_content
+++ b/tests/integration/update_cluster/compress/data/aws_s3_object_cluster-completed.spec_content
@@ -24,15 +24,12 @@ spec:
   cloudProvider: aws
   clusterDNSDomain: cluster.local
   configBase: memfs://clusters.example.com/compress.example.com
-  containerRuntime: containerd
   containerd:
     logLevel: info
     runc:
       version: 1.1.5
     version: 1.6.20
   dnsZone: Z1AFAKE1ZON3YO
-  docker:
-    skipInstall: true
   etcdClusters:
   - backups:
       backupStore: memfs://clusters.example.com/compress.example.com/backups/etcd/main
diff --git a/tests/integration/update_cluster/compress/data/aws_s3_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/compress/data/aws_s3_object_nodeupconfig-master-us-test-1a_content
index 06bf8565b2..5bbddeb249 100644
--- a/tests/integration/update_cluster/compress/data/aws_s3_object_nodeupconfig-master-us-test-1a_content
+++ b/tests/integration/update_cluster/compress/data/aws_s3_object_nodeupconfig-master-us-test-1a_content
@@ -227,7 +227,6 @@ CAs:
     9B7UD2ushcVFPtaeoL9Gfu8aY4KJBeqqg5ojl4qmRnThjw==
     -----END CERTIFICATE-----
 ClusterName: compress.example.com
-ContainerRuntime: containerd
 ControlPlaneConfig:
   KubeControllerManager:
     allocateNodeCIDRs: true
@@ -321,8 +320,6 @@ containerdConfig:
   runc:
     version: 1.1.5
   version: 1.6.20
-docker:
-  skipInstall: true
 etcdManifests:
 - memfs://clusters.example.com/compress.example.com/manifests/etcd/main-master-us-test-1a.yaml
 - memfs://clusters.example.com/compress.example.com/manifests/etcd/events-master-us-test-1a.yaml
diff --git a/tests/integration/update_cluster/compress/data/aws_s3_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/compress/data/aws_s3_object_nodeupconfig-nodes_content
index 0f9ce5ab17..4d0b210d06 100644
--- a/tests/integration/update_cluster/compress/data/aws_s3_object_nodeupconfig-nodes_content
+++ b/tests/integration/update_cluster/compress/data/aws_s3_object_nodeupconfig-nodes_content
@@ -13,7 +13,6 @@ Assets:
   - 54e79e4d48b9e191767e4abc08be1a8476a1c757e9a9f8c45c6ded001226867f@https://github.com/opencontainers/runc/releases/download/v1.1.5/runc.arm64
 CAs: {}
 ClusterName: compress.example.com
-ContainerRuntime: containerd
 Hooks:
 - null
 - null
@@ -56,7 +55,5 @@ containerdConfig:
   runc:
     version: 1.1.5
   version: 1.6.20
-docker:
-  skipInstall: true
 usesLegacyGossip: false
 usesNoneDNS: false
diff --git a/tests/integration/update_cluster/containerd-custom/data/aws_launch_template_master-us-test-1a.masters.containerd.example.com_user_data b/tests/integration/update_cluster/containerd-custom/data/aws_launch_template_master-us-test-1a.masters.containerd.example.com_user_data
index 33c49102cb..2f67e45749 100644
--- a/tests/integration/update_cluster/containerd-custom/data/aws_launch_template_master-us-test-1a.masters.containerd.example.com_user_data
+++ b/tests/integration/update_cluster/containerd-custom/data/aws_launch_template_master-us-test-1a.masters.containerd.example.com_user_data
@@ -128,7 +128,7 @@ ClusterName: containerd.example.com
 ConfigBase: memfs://clusters.example.com/containerd.example.com
 InstanceGroupName: master-us-test-1a
 InstanceGroupRole: ControlPlane
-NodeupConfigHash: FUUEom6ukiK3eDYB3SkAGWRQrg5+RKpXD0T6n/1X4Jc=
+NodeupConfigHash: 1c0bdQQlv/9w/LC9ETyrH5rSYG9TDDOfG0aPpwl8avw=
 
 __EOF_KUBE_ENV
 
diff --git a/tests/integration/update_cluster/containerd-custom/data/aws_launch_template_nodes.containerd.example.com_user_data b/tests/integration/update_cluster/containerd-custom/data/aws_launch_template_nodes.containerd.example.com_user_data
index 75c7c11a21..d4632a3371 100644
--- a/tests/integration/update_cluster/containerd-custom/data/aws_launch_template_nodes.containerd.example.com_user_data
+++ b/tests/integration/update_cluster/containerd-custom/data/aws_launch_template_nodes.containerd.example.com_user_data
@@ -151,7 +151,7 @@ ConfigServer:
   - https://kops-controller.internal.containerd.example.com:3988/
 InstanceGroupName: nodes
 InstanceGroupRole: Node
-NodeupConfigHash: ahH7ZzRD9p5KxDl1kUM6jp9srjL1L1BR9jA9/gI9oX0=
+NodeupConfigHash: Yg/adzjp6tTaFbr/irCcRQc50fi0RzS0Z7u2ucKd4Xg=
 
 __EOF_KUBE_ENV
 
diff --git a/tests/integration/update_cluster/containerd-custom/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/containerd-custom/data/aws_s3_object_cluster-completed.spec_content
index 06448f4147..5f1f1f5041 100644
--- a/tests/integration/update_cluster/containerd-custom/data/aws_s3_object_cluster-completed.spec_content
+++ b/tests/integration/update_cluster/containerd-custom/data/aws_s3_object_cluster-completed.spec_content
@@ -24,7 +24,6 @@ spec:
   cloudProvider: aws
   clusterDNSDomain: cluster.local
   configBase: memfs://clusters.example.com/containerd.example.com
-  containerRuntime: containerd
   containerd:
     logLevel: info
     packages:
@@ -40,8 +39,6 @@ spec:
     skipInstall: true
     version: 1.6.20
   dnsZone: Z1AFAKE1ZON3YO
-  docker:
-    skipInstall: true
   etcdClusters:
   - backups:
       backupStore: memfs://clusters.example.com/containerd.example.com/backups/etcd/main
diff --git a/tests/integration/update_cluster/containerd-custom/data/aws_s3_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/containerd-custom/data/aws_s3_object_nodeupconfig-master-us-test-1a_content
index 2f332034c0..39ed45f9fa 100644
--- a/tests/integration/update_cluster/containerd-custom/data/aws_s3_object_nodeupconfig-master-us-test-1a_content
+++ b/tests/integration/update_cluster/containerd-custom/data/aws_s3_object_nodeupconfig-master-us-test-1a_content
@@ -223,7 +223,6 @@ CAs:
     9B7UD2ushcVFPtaeoL9Gfu8aY4KJBeqqg5ojl4qmRnThjw==
     -----END CERTIFICATE-----
 ClusterName: containerd.example.com
-ContainerRuntime: containerd
 ControlPlaneConfig:
   KubeControllerManager:
     allocateNodeCIDRs: true
@@ -326,8 +325,6 @@ containerdConfig:
     version: 1.1.5
   skipInstall: true
   version: 1.6.20
-docker:
-  skipInstall: true
 etcdManifests:
 - memfs://clusters.example.com/containerd.example.com/manifests/etcd/main-master-us-test-1a.yaml
 - memfs://clusters.example.com/containerd.example.com/manifests/etcd/events-master-us-test-1a.yaml
diff --git a/tests/integration/update_cluster/containerd-custom/data/aws_s3_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/containerd-custom/data/aws_s3_object_nodeupconfig-nodes_content
index df5ffaec19..8cf91d20ad 100644
--- a/tests/integration/update_cluster/containerd-custom/data/aws_s3_object_nodeupconfig-nodes_content
+++ b/tests/integration/update_cluster/containerd-custom/data/aws_s3_object_nodeupconfig-nodes_content
@@ -9,7 +9,6 @@ Assets:
   - ef17764ffd6cdcb16d76401bac1db6acc050c9b088f1be5efa0e094ea3b01df0@https://storage.googleapis.com/k8s-artifacts-cni/release/v0.9.1/cni-plugins-linux-arm64-v0.9.1.tgz
 CAs: {}
 ClusterName: containerd.example.com
-ContainerRuntime: containerd
 Hooks:
 - null
 - null
@@ -61,7 +60,5 @@ containerdConfig:
     version: 1.1.5
   skipInstall: true
   version: 1.6.20
-docker:
-  skipInstall: true
 usesLegacyGossip: false
 usesNoneDNS: false
diff --git a/tests/integration/update_cluster/containerd/data/aws_launch_template_master-us-test-1a.masters.containerd.example.com_user_data b/tests/integration/update_cluster/containerd/data/aws_launch_template_master-us-test-1a.masters.containerd.example.com_user_data
index 32de2812de..fd322eed77 100644
--- a/tests/integration/update_cluster/containerd/data/aws_launch_template_master-us-test-1a.masters.containerd.example.com_user_data
+++ b/tests/integration/update_cluster/containerd/data/aws_launch_template_master-us-test-1a.masters.containerd.example.com_user_data
@@ -128,7 +128,7 @@ ClusterName: containerd.example.com
 ConfigBase: memfs://clusters.example.com/containerd.example.com
 InstanceGroupName: master-us-test-1a
 InstanceGroupRole: ControlPlane
-NodeupConfigHash: 94mjtG+SfGDcu/VczjCRwM5mJHSEDtz+ol3uAl5qYd4=
+NodeupConfigHash: fz9KbLOvU9GLgVb7ZXxJhcQxz8wWI6KhFfQ3mCnreHk=
 
 __EOF_KUBE_ENV
 
diff --git a/tests/integration/update_cluster/containerd/data/aws_launch_template_nodes.containerd.example.com_user_data b/tests/integration/update_cluster/containerd/data/aws_launch_template_nodes.containerd.example.com_user_data
index 45a83f4a32..7bab9ccac7 100644
--- a/tests/integration/update_cluster/containerd/data/aws_launch_template_nodes.containerd.example.com_user_data
+++ b/tests/integration/update_cluster/containerd/data/aws_launch_template_nodes.containerd.example.com_user_data
@@ -151,7 +151,7 @@ ConfigServer:
   - https://kops-controller.internal.containerd.example.com:3988/
 InstanceGroupName: nodes
 InstanceGroupRole: Node
-NodeupConfigHash: d/PBUemSeFM+VFWLbU5jCUEBM2eWLSgkjEvWjr0R2xc=
+NodeupConfigHash: 1jg95u7GPL0HnfQJNtWL9mWdSCLUCUOA0eWhT2B22FY=
 
 __EOF_KUBE_ENV
 
diff --git a/tests/integration/update_cluster/containerd/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/containerd/data/aws_s3_object_cluster-completed.spec_content
index e215ed0f13..45f5a24e5e 100644
--- a/tests/integration/update_cluster/containerd/data/aws_s3_object_cluster-completed.spec_content
+++ b/tests/integration/update_cluster/containerd/data/aws_s3_object_cluster-completed.spec_content
@@ -24,15 +24,12 @@ spec:
   cloudProvider: aws
   clusterDNSDomain: cluster.local
   configBase: memfs://clusters.example.com/containerd.example.com
-  containerRuntime: containerd
   containerd:
     logLevel: info
     runc:
       version: 1.1.5
     version: 1.6.20
   dnsZone: Z1AFAKE1ZON3YO
-  docker:
-    skipInstall: true
   etcdClusters:
   - backups:
       backupStore: memfs://clusters.example.com/containerd.example.com/backups/etcd/main
diff --git a/tests/integration/update_cluster/containerd/data/aws_s3_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/containerd/data/aws_s3_object_nodeupconfig-master-us-test-1a_content
index 6823651dd0..556dfd176f 100644
--- a/tests/integration/update_cluster/containerd/data/aws_s3_object_nodeupconfig-master-us-test-1a_content
+++ b/tests/integration/update_cluster/containerd/data/aws_s3_object_nodeupconfig-master-us-test-1a_content
@@ -227,7 +227,6 @@ CAs:
     9B7UD2ushcVFPtaeoL9Gfu8aY4KJBeqqg5ojl4qmRnThjw==
     -----END CERTIFICATE-----
 ClusterName: containerd.example.com
-ContainerRuntime: containerd
 ControlPlaneConfig:
   KubeControllerManager:
     allocateNodeCIDRs: true
@@ -321,8 +320,6 @@ containerdConfig:
   runc:
     version: 1.1.5
   version: 1.6.20
-docker:
-  skipInstall: true
 etcdManifests:
 - memfs://clusters.example.com/containerd.example.com/manifests/etcd/main-master-us-test-1a.yaml
 - memfs://clusters.example.com/containerd.example.com/manifests/etcd/events-master-us-test-1a.yaml
diff --git a/tests/integration/update_cluster/containerd/data/aws_s3_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/containerd/data/aws_s3_object_nodeupconfig-nodes_content
index dfca0bd1b8..439448a035 100644
--- a/tests/integration/update_cluster/containerd/data/aws_s3_object_nodeupconfig-nodes_content
+++ b/tests/integration/update_cluster/containerd/data/aws_s3_object_nodeupconfig-nodes_content
@@ -13,7 +13,6 @@ Assets:
   - 54e79e4d48b9e191767e4abc08be1a8476a1c757e9a9f8c45c6ded001226867f@https://github.com/opencontainers/runc/releases/download/v1.1.5/runc.arm64
 CAs: {}
 ClusterName: containerd.example.com
-ContainerRuntime: containerd
 Hooks:
 - null
 - null
@@ -56,7 +55,5 @@ containerdConfig:
   runc:
     version: 1.1.5
   version: 1.6.20
-docker:
-  skipInstall: true
 usesLegacyGossip: false
 usesNoneDNS: false
diff --git a/tests/integration/update_cluster/digit/data/aws_launch_template_master-us-test-1a.masters.123.example.com_user_data b/tests/integration/update_cluster/digit/data/aws_launch_template_master-us-test-1a.masters.123.example.com_user_data
index a5dffa46bb..efa59a5a5d 100644
--- a/tests/integration/update_cluster/digit/data/aws_launch_template_master-us-test-1a.masters.123.example.com_user_data
+++ b/tests/integration/update_cluster/digit/data/aws_launch_template_master-us-test-1a.masters.123.example.com_user_data
@@ -128,7 +128,7 @@ ClusterName: 123.example.com
 ConfigBase: memfs://clusters.example.com/123.example.com
 InstanceGroupName: master-us-test-1a
 InstanceGroupRole: ControlPlane
-NodeupConfigHash: TqPcvl4kVvZiIl2qWDBLAVLDX69Y47lotA93yu47epU=
+NodeupConfigHash: qChgByhD5nB4lLd8HZOUfsfQ69etOiUsUMLIFzEMPVw=
 
 __EOF_KUBE_ENV
 
diff --git a/tests/integration/update_cluster/digit/data/aws_launch_template_nodes.123.example.com_user_data b/tests/integration/update_cluster/digit/data/aws_launch_template_nodes.123.example.com_user_data
index ecc8d51796..c59fe74fec 100644
--- a/tests/integration/update_cluster/digit/data/aws_launch_template_nodes.123.example.com_user_data
+++ b/tests/integration/update_cluster/digit/data/aws_launch_template_nodes.123.example.com_user_data
@@ -151,7 +151,7 @@ ConfigServer:
   - https://kops-controller.internal.123.example.com:3988/
 InstanceGroupName: nodes
 InstanceGroupRole: Node
-NodeupConfigHash: yqoUdggZMkzcgSHHZBzAWN7VK0OzLjJpONsKjw4JJ/w=
+NodeupConfigHash: GqjLoKmrWj0eWeJBo3cRomMeFPf3fZvlLtyL4NZ8EqM=
 
 __EOF_KUBE_ENV
 
diff --git a/tests/integration/update_cluster/digit/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/digit/data/aws_s3_object_cluster-completed.spec_content
index 50a22040e2..5af52f7ebb 100644
--- a/tests/integration/update_cluster/digit/data/aws_s3_object_cluster-completed.spec_content
+++ b/tests/integration/update_cluster/digit/data/aws_s3_object_cluster-completed.spec_content
@@ -24,15 +24,12 @@ spec:
   cloudProvider: aws
   clusterDNSDomain: cluster.local
   configBase: memfs://clusters.example.com/123.example.com
-  containerRuntime: containerd
   containerd:
     logLevel: info
     runc:
       version: 1.1.5
     version: 1.6.20
   dnsZone: Z1AFAKE1ZON3YO
-  docker:
-    skipInstall: true
   etcdClusters:
   - backups:
       backupStore: memfs://clusters.example.com/123.example.com/backups/etcd/main
diff --git a/tests/integration/update_cluster/digit/data/aws_s3_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/digit/data/aws_s3_object_nodeupconfig-master-us-test-1a_content
index 0dc4f4969d..ca097d0b32 100644
--- a/tests/integration/update_cluster/digit/data/aws_s3_object_nodeupconfig-master-us-test-1a_content
+++ b/tests/integration/update_cluster/digit/data/aws_s3_object_nodeupconfig-master-us-test-1a_content
@@ -227,7 +227,6 @@ CAs:
     9B7UD2ushcVFPtaeoL9Gfu8aY4KJBeqqg5ojl4qmRnThjw==
     -----END CERTIFICATE-----
 ClusterName: 123.example.com
-ContainerRuntime: containerd
 ControlPlaneConfig:
   KubeControllerManager:
     allocateNodeCIDRs: true
@@ -321,8 +320,6 @@ containerdConfig:
   runc:
     version: 1.1.5
   version: 1.6.20
-docker:
-  skipInstall: true
 etcdManifests:
 - memfs://clusters.example.com/123.example.com/manifests/etcd/main-master-us-test-1a.yaml
 - memfs://clusters.example.com/123.example.com/manifests/etcd/events-master-us-test-1a.yaml
diff --git a/tests/integration/update_cluster/digit/data/aws_s3_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/digit/data/aws_s3_object_nodeupconfig-nodes_content
index 226379641b..8a5a2fb288 100644
--- a/tests/integration/update_cluster/digit/data/aws_s3_object_nodeupconfig-nodes_content
+++ b/tests/integration/update_cluster/digit/data/aws_s3_object_nodeupconfig-nodes_content
@@ -13,7 +13,6 @@ Assets:
   - 54e79e4d48b9e191767e4abc08be1a8476a1c757e9a9f8c45c6ded001226867f@https://github.com/opencontainers/runc/releases/download/v1.1.5/runc.arm64
 CAs: {}
 ClusterName: 123.example.com
-ContainerRuntime: containerd
 Hooks:
 - null
 - null
@@ -56,7 +55,5 @@ containerdConfig:
   runc:
     version: 1.1.5
   version: 1.6.20
-docker:
-  skipInstall: true
 usesLegacyGossip: false
 usesNoneDNS: false
diff --git a/tests/integration/update_cluster/existing_iam/data/aws_launch_template_master-us-test-1a.masters.existing-iam.example.com_user_data b/tests/integration/update_cluster/existing_iam/data/aws_launch_template_master-us-test-1a.masters.existing-iam.example.com_user_data
index 42a560c89e..27cfd14662 100644
--- a/tests/integration/update_cluster/existing_iam/data/aws_launch_template_master-us-test-1a.masters.existing-iam.example.com_user_data
+++ b/tests/integration/update_cluster/existing_iam/data/aws_launch_template_master-us-test-1a.masters.existing-iam.example.com_user_data
@@ -128,7 +128,7 @@ ClusterName: existing-iam.example.com
 ConfigBase: memfs://tests/existing-iam.example.com
 InstanceGroupName: master-us-test-1a
 InstanceGroupRole: ControlPlane
-NodeupConfigHash: mAShQY9FnOUD5LiIGGWkuNiRCpZzYGe0MerDogURTN8=
+NodeupConfigHash: aLLzoBfj9paYdXPoA1HpA0xVxjzkZfxTQN+SDclzE1w=
 
 __EOF_KUBE_ENV
 
diff --git a/tests/integration/update_cluster/existing_iam/data/aws_launch_template_master-us-test-1b.masters.existing-iam.example.com_user_data b/tests/integration/update_cluster/existing_iam/data/aws_launch_template_master-us-test-1b.masters.existing-iam.example.com_user_data
index 54f382ddb9..d9298ded5f 100644
--- a/tests/integration/update_cluster/existing_iam/data/aws_launch_template_master-us-test-1b.masters.existing-iam.example.com_user_data
+++ b/tests/integration/update_cluster/existing_iam/data/aws_launch_template_master-us-test-1b.masters.existing-iam.example.com_user_data
@@ -128,7 +128,7 @@ ClusterName: existing-iam.example.com
 ConfigBase: memfs://tests/existing-iam.example.com
 InstanceGroupName: master-us-test-1b
 InstanceGroupRole: ControlPlane
-NodeupConfigHash: sPEfZDSw74UkUB1c4oh/+CVsx2+U2ypeNrXn7B1BSKQ=
+NodeupConfigHash: GbFptRJhDDhur+YthxicAk5iiUuaAzGHGYTg96lbyTI=
 
 __EOF_KUBE_ENV
 
diff --git a/tests/integration/update_cluster/existing_iam/data/aws_launch_template_master-us-test-1c.masters.existing-iam.example.com_user_data b/tests/integration/update_cluster/existing_iam/data/aws_launch_template_master-us-test-1c.masters.existing-iam.example.com_user_data
index 2b016f0c62..594abe052d 100644
--- a/tests/integration/update_cluster/existing_iam/data/aws_launch_template_master-us-test-1c.masters.existing-iam.example.com_user_data
+++ b/tests/integration/update_cluster/existing_iam/data/aws_launch_template_master-us-test-1c.masters.existing-iam.example.com_user_data
@@ -128,7 +128,7 @@ ClusterName: existing-iam.example.com
 ConfigBase: memfs://tests/existing-iam.example.com
 InstanceGroupName: master-us-test-1c
 InstanceGroupRole: ControlPlane
-NodeupConfigHash: x9DXSNLLWBc2zHETCyJWua57Ro5j5IIKZ2+YWWQ7kz0=
+NodeupConfigHash: dP9MVSeFtt7o2WnajBQ8wApWZaML1bvtROeDWeel5XE=
 
 __EOF_KUBE_ENV
 
diff --git a/tests/integration/update_cluster/existing_iam/data/aws_launch_template_nodes.existing-iam.example.com_user_data b/tests/integration/update_cluster/existing_iam/data/aws_launch_template_nodes.existing-iam.example.com_user_data
index 1b511c282c..e9b0db171a 100644
--- a/tests/integration/update_cluster/existing_iam/data/aws_launch_template_nodes.existing-iam.example.com_user_data
+++ b/tests/integration/update_cluster/existing_iam/data/aws_launch_template_nodes.existing-iam.example.com_user_data
@@ -151,7 +151,7 @@ ConfigServer:
   - https://kops-controller.internal.existing-iam.example.com:3988/
 InstanceGroupName: nodes
 InstanceGroupRole: Node
-NodeupConfigHash: d6+93SBV5h0mBkncKt1EdhObQn0t3tHJIi6Nhu/4al4=
+NodeupConfigHash: GSsBDtjQfGnMwHf+WSydfttB2ijdROTE9WkBo+K5PFo=
 
 __EOF_KUBE_ENV
 
diff --git a/tests/integration/update_cluster/existing_iam/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/existing_iam/data/aws_s3_object_cluster-completed.spec_content
index 3c64a75392..f264be59e0 100644
--- a/tests/integration/update_cluster/existing_iam/data/aws_s3_object_cluster-completed.spec_content
+++ b/tests/integration/update_cluster/existing_iam/data/aws_s3_object_cluster-completed.spec_content
@@ -24,15 +24,12 @@ spec:
   cloudProvider: aws
   clusterDNSDomain: cluster.local
   configBase: memfs://tests/existing-iam.example.com
-  containerRuntime: containerd
   containerd:
     logLevel: info
     runc:
       version: 1.1.5
     version: 1.6.20
   dnsZone: Z1AFAKE1ZON3YO
-  docker:
-    skipInstall: true
   etcdClusters:
   - backups:
       backupStore: memfs://tests/existing-iam.example.com/backups/etcd/main
diff --git a/tests/integration/update_cluster/existing_iam/data/aws_s3_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/existing_iam/data/aws_s3_object_nodeupconfig-master-us-test-1a_content
index e18a4af819..7686a75b32 100644
--- a/tests/integration/update_cluster/existing_iam/data/aws_s3_object_nodeupconfig-master-us-test-1a_content
+++ b/tests/integration/update_cluster/existing_iam/data/aws_s3_object_nodeupconfig-master-us-test-1a_content
@@ -227,7 +227,6 @@ CAs:
     9B7UD2ushcVFPtaeoL9Gfu8aY4KJBeqqg5ojl4qmRnThjw==
     -----END CERTIFICATE-----
 ClusterName: existing-iam.example.com
-ContainerRuntime: containerd
 ControlPlaneConfig:
   KubeControllerManager:
     allocateNodeCIDRs: true
@@ -321,8 +320,6 @@ containerdConfig:
   runc:
     version: 1.1.5
   version: 1.6.20
-docker:
-  skipInstall: true
 etcdManifests:
 - memfs://tests/existing-iam.example.com/manifests/etcd/main-master-us-test-1a.yaml
 - memfs://tests/existing-iam.example.com/manifests/etcd/events-master-us-test-1a.yaml
diff --git a/tests/integration/update_cluster/existing_iam/data/aws_s3_object_nodeupconfig-master-us-test-1b_content b/tests/integration/update_cluster/existing_iam/data/aws_s3_object_nodeupconfig-master-us-test-1b_content
index 785812225c..1eb3fce76e 100644
--- a/tests/integration/update_cluster/existing_iam/data/aws_s3_object_nodeupconfig-master-us-test-1b_content
+++ b/tests/integration/update_cluster/existing_iam/data/aws_s3_object_nodeupconfig-master-us-test-1b_content
@@ -227,7 +227,6 @@ CAs:
     9B7UD2ushcVFPtaeoL9Gfu8aY4KJBeqqg5ojl4qmRnThjw==
     -----END CERTIFICATE-----
 ClusterName: existing-iam.example.com
-ContainerRuntime: containerd
 ControlPlaneConfig:
   KubeControllerManager:
     allocateNodeCIDRs: true
@@ -321,8 +320,6 @@ containerdConfig:
   runc:
     version: 1.1.5
   version: 1.6.20
-docker:
-  skipInstall: true
 etcdManifests:
 - memfs://tests/existing-iam.example.com/manifests/etcd/main-master-us-test-1b.yaml
 - memfs://tests/existing-iam.example.com/manifests/etcd/events-master-us-test-1b.yaml
diff --git a/tests/integration/update_cluster/existing_iam/data/aws_s3_object_nodeupconfig-master-us-test-1c_content b/tests/integration/update_cluster/existing_iam/data/aws_s3_object_nodeupconfig-master-us-test-1c_content
index 1477369450..cd92cd136e 100644
--- a/tests/integration/update_cluster/existing_iam/data/aws_s3_object_nodeupconfig-master-us-test-1c_content
+++ b/tests/integration/update_cluster/existing_iam/data/aws_s3_object_nodeupconfig-master-us-test-1c_content
@@ -227,7 +227,6 @@ CAs:
     9B7UD2ushcVFPtaeoL9Gfu8aY4KJBeqqg5ojl4qmRnThjw==
     -----END CERTIFICATE-----
 ClusterName: existing-iam.example.com
-ContainerRuntime: containerd
 ControlPlaneConfig:
   KubeControllerManager:
     allocateNodeCIDRs: true
@@ -321,8 +320,6 @@ containerdConfig:
   runc:
     version: 1.1.5
   version: 1.6.20
-docker:
-  skipInstall: true
 etcdManifests:
 - memfs://tests/existing-iam.example.com/manifests/etcd/main-master-us-test-1c.yaml
 - memfs://tests/existing-iam.example.com/manifests/etcd/events-master-us-test-1c.yaml
diff --git a/tests/integration/update_cluster/existing_iam/data/aws_s3_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/existing_iam/data/aws_s3_object_nodeupconfig-nodes_content
index 156033ecad..b163fa53bc 100644
--- a/tests/integration/update_cluster/existing_iam/data/aws_s3_object_nodeupconfig-nodes_content
+++ b/tests/integration/update_cluster/existing_iam/data/aws_s3_object_nodeupconfig-nodes_content
@@ -13,7 +13,6 @@ Assets:
   - 54e79e4d48b9e191767e4abc08be1a8476a1c757e9a9f8c45c6ded001226867f@https://github.com/opencontainers/runc/releases/download/v1.1.5/runc.arm64
 CAs: {}
 ClusterName: existing-iam.example.com
-ContainerRuntime: containerd
 Hooks:
 - null
 - null
@@ -56,7 +55,5 @@ containerdConfig:
   runc:
     version: 1.1.5
   version: 1.6.20
-docker:
-  skipInstall: true
 usesLegacyGossip: false
 usesNoneDNS: false
diff --git a/tests/integration/update_cluster/existing_sg/data/aws_launch_template_master-us-test-1a.masters.existingsg.example.com_user_data b/tests/integration/update_cluster/existing_sg/data/aws_launch_template_master-us-test-1a.masters.existingsg.example.com_user_data
index ad97890d53..bf5150042d 100644
--- a/tests/integration/update_cluster/existing_sg/data/aws_launch_template_master-us-test-1a.masters.existingsg.example.com_user_data
+++ b/tests/integration/update_cluster/existing_sg/data/aws_launch_template_master-us-test-1a.masters.existingsg.example.com_user_data
@@ -128,7 +128,7 @@ ClusterName: existingsg.example.com
 ConfigBase: memfs://clusters.example.com/existingsg.example.com
 InstanceGroupName: master-us-test-1a
 InstanceGroupRole: ControlPlane
-NodeupConfigHash: vZTlSkCxPadc3Pd11FB0fZ8RAe7s5BraW79K0kF/ww4=
+NodeupConfigHash: 6ZIt85D3UYw83oSyzQE5BsbfcWFRyUV5A6poitV7DgQ=
 
 __EOF_KUBE_ENV
 
diff --git a/tests/integration/update_cluster/existing_sg/data/aws_launch_template_master-us-test-1b.masters.existingsg.example.com_user_data b/tests/integration/update_cluster/existing_sg/data/aws_launch_template_master-us-test-1b.masters.existingsg.example.com_user_data
index 713562dfa8..7465db435b 100644
--- a/tests/integration/update_cluster/existing_sg/data/aws_launch_template_master-us-test-1b.masters.existingsg.example.com_user_data
+++ b/tests/integration/update_cluster/existing_sg/data/aws_launch_template_master-us-test-1b.masters.existingsg.example.com_user_data
@@ -128,7 +128,7 @@ ClusterName: existingsg.example.com
 ConfigBase: memfs://clusters.example.com/existingsg.example.com
 InstanceGroupName: master-us-test-1b
 InstanceGroupRole: ControlPlane
-NodeupConfigHash: xXXVjS8P1JDouLlfzk0vdxSBgPXsdPMB3Xy4qI4FfuQ=
+NodeupConfigHash: vZ9QwtYlcfn/vYBTFk16OAJL3mehLccCkThP49I+k7M=
 
 __EOF_KUBE_ENV
 
diff --git a/tests/integration/update_cluster/existing_sg/data/aws_launch_template_master-us-test-1c.masters.existingsg.example.com_user_data b/tests/integration/update_cluster/existing_sg/data/aws_launch_template_master-us-test-1c.masters.existingsg.example.com_user_data
index 5779d93bd9..6199eda146 100644
--- a/tests/integration/update_cluster/existing_sg/data/aws_launch_template_master-us-test-1c.masters.existingsg.example.com_user_data
+++ b/tests/integration/update_cluster/existing_sg/data/aws_launch_template_master-us-test-1c.masters.existingsg.example.com_user_data
@@ -128,7 +128,7 @@ ClusterName: existingsg.example.com
 ConfigBase: memfs://clusters.example.com/existingsg.example.com
 InstanceGroupName: master-us-test-1c
 InstanceGroupRole: ControlPlane
-NodeupConfigHash: o3JR7gA6vf0pkFZn9MUB6zKJ6Q52dQeIlR0NU1sUSHk=
+NodeupConfigHash: iYqXVWBTzWgJSDg6KYtlbXrbonHrKOMg3hshVbEQVMI=
 
 __EOF_KUBE_ENV
 
diff --git a/tests/integration/update_cluster/existing_sg/data/aws_launch_template_nodes.existingsg.example.com_user_data b/tests/integration/update_cluster/existing_sg/data/aws_launch_template_nodes.existingsg.example.com_user_data
index 840c8d311b..b6cb7f5016 100644
--- a/tests/integration/update_cluster/existing_sg/data/aws_launch_template_nodes.existingsg.example.com_user_data
+++ b/tests/integration/update_cluster/existing_sg/data/aws_launch_template_nodes.existingsg.example.com_user_data
@@ -151,7 +151,7 @@ ConfigServer:
   - https://kops-controller.internal.existingsg.example.com:3988/
 InstanceGroupName: nodes
 InstanceGroupRole: Node
-NodeupConfigHash: ubSBZl2/0wFn7AQuzVmZL21hw6/dOEhSmntEdLVYfM8=
+NodeupConfigHash: NX2slUpyP9RLTCFl9wwXS67sZJ4624w9mS23zVfpxE8=
 
 __EOF_KUBE_ENV
 
diff --git a/tests/integration/update_cluster/existing_sg/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/existing_sg/data/aws_s3_object_cluster-completed.spec_content
index 6078d42537..89c89b87b3 100644
--- a/tests/integration/update_cluster/existing_sg/data/aws_s3_object_cluster-completed.spec_content
+++ b/tests/integration/update_cluster/existing_sg/data/aws_s3_object_cluster-completed.spec_content
@@ -27,15 +27,12 @@ spec:
   cloudProvider: aws
   clusterDNSDomain: cluster.local
   configBase: memfs://clusters.example.com/existingsg.example.com
-  containerRuntime: containerd
   containerd:
     logLevel: info
     runc:
       version: 1.1.5
     version: 1.6.20
   dnsZone: Z1AFAKE1ZON3YO
-  docker:
-    skipInstall: true
   etcdClusters:
   - backups:
       backupStore: memfs://clusters.example.com/existingsg.example.com/backups/etcd/main
diff --git a/tests/integration/update_cluster/existing_sg/data/aws_s3_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/existing_sg/data/aws_s3_object_nodeupconfig-master-us-test-1a_content
index e2cc2f5e5f..5180412b76 100644
--- a/tests/integration/update_cluster/existing_sg/data/aws_s3_object_nodeupconfig-master-us-test-1a_content
+++ b/tests/integration/update_cluster/existing_sg/data/aws_s3_object_nodeupconfig-master-us-test-1a_content
@@ -226,7 +226,6 @@ CAs:
     9B7UD2ushcVFPtaeoL9Gfu8aY4KJBeqqg5ojl4qmRnThjw==
     -----END CERTIFICATE-----
 ClusterName: existingsg.example.com
-ContainerRuntime: containerd
 ControlPlaneConfig:
   KubeControllerManager:
     allocateNodeCIDRs: true
@@ -320,8 +319,6 @@ containerdConfig:
   runc:
     version: 1.1.5
   version: 1.6.20
-docker:
-  skipInstall: true
 etcdManifests:
 - memfs://clusters.example.com/existingsg.example.com/manifests/etcd/main-master-us-test-1a.yaml
 - memfs://clusters.example.com/existingsg.example.com/manifests/etcd/events-master-us-test-1a.yaml
diff --git a/tests/integration/update_cluster/existing_sg/data/aws_s3_object_nodeupconfig-master-us-test-1b_content b/tests/integration/update_cluster/existing_sg/data/aws_s3_object_nodeupconfig-master-us-test-1b_content
index 06b35ecc40..d5aac993b6 100644
--- a/tests/integration/update_cluster/existing_sg/data/aws_s3_object_nodeupconfig-master-us-test-1b_content
+++ b/tests/integration/update_cluster/existing_sg/data/aws_s3_object_nodeupconfig-master-us-test-1b_content
@@ -226,7 +226,6 @@ CAs:
     9B7UD2ushcVFPtaeoL9Gfu8aY4KJBeqqg5ojl4qmRnThjw==
     -----END CERTIFICATE-----
 ClusterName: existingsg.example.com
-ContainerRuntime: containerd
 ControlPlaneConfig:
   KubeControllerManager:
     allocateNodeCIDRs: true
@@ -320,8 +319,6 @@ containerdConfig:
   runc:
     version: 1.1.5
   version: 1.6.20
-docker:
-  skipInstall: true
 etcdManifests:
 - memfs://clusters.example.com/existingsg.example.com/manifests/etcd/main-master-us-test-1b.yaml
 - memfs://clusters.example.com/existingsg.example.com/manifests/etcd/events-master-us-test-1b.yaml
diff --git a/tests/integration/update_cluster/existing_sg/data/aws_s3_object_nodeupconfig-master-us-test-1c_content b/tests/integration/update_cluster/existing_sg/data/aws_s3_object_nodeupconfig-master-us-test-1c_content
index 2d4bac6e3f..2a5490e2d9 100644
--- a/tests/integration/update_cluster/existing_sg/data/aws_s3_object_nodeupconfig-master-us-test-1c_content
+++ b/tests/integration/update_cluster/existing_sg/data/aws_s3_object_nodeupconfig-master-us-test-1c_content
@@ -226,7 +226,6 @@ CAs:
     9B7UD2ushcVFPtaeoL9Gfu8aY4KJBeqqg5ojl4qmRnThjw==
     -----END CERTIFICATE-----
 ClusterName: existingsg.example.com
-ContainerRuntime: containerd
 ControlPlaneConfig:
   KubeControllerManager:
     allocateNodeCIDRs: true
@@ -320,8 +319,6 @@ containerdConfig:
   runc:
     version: 1.1.5
   version: 1.6.20
-docker:
-  skipInstall: true
 etcdManifests:
 - memfs://clusters.example.com/existingsg.example.com/manifests/etcd/main-master-us-test-1c.yaml
 - memfs://clusters.example.com/existingsg.example.com/manifests/etcd/events-master-us-test-1c.yaml
diff --git a/tests/integration/update_cluster/existing_sg/data/aws_s3_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/existing_sg/data/aws_s3_object_nodeupconfig-nodes_content
index 672157dbc3..0a9e5f7310 100644
--- a/tests/integration/update_cluster/existing_sg/data/aws_s3_object_nodeupconfig-nodes_content
+++ b/tests/integration/update_cluster/existing_sg/data/aws_s3_object_nodeupconfig-nodes_content
@@ -13,7 +13,6 @@ Assets:
   - 54e79e4d48b9e191767e4abc08be1a8476a1c757e9a9f8c45c6ded001226867f@https://github.com/opencontainers/runc/releases/download/v1.1.5/runc.arm64
 CAs: {}
 ClusterName: existingsg.example.com
-ContainerRuntime: containerd
 Hooks:
 - null
 - null
@@ -56,7 +55,5 @@ containerdConfig:
   runc:
     version: 1.1.5
   version: 1.6.20
-docker:
-  skipInstall: true
 usesLegacyGossip: false
 usesNoneDNS: false
diff --git a/tests/integration/update_cluster/external_dns/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data b/tests/integration/update_cluster/external_dns/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data
index 43b853ee92..b3dff4adb1 100644
--- a/tests/integration/update_cluster/external_dns/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data
+++ b/tests/integration/update_cluster/external_dns/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data
@@ -128,7 +128,7 @@ ClusterName: minimal.example.com
 ConfigBase: memfs://clusters.example.com/minimal.example.com
 InstanceGroupName: master-us-test-1a
 InstanceGroupRole: ControlPlane
-NodeupConfigHash: UhWxV84/7jb2wSFze1pzEmopJrPwVIM23XQhhPc/j6A=
+NodeupConfigHash: wlwDwuGdu+VCRynnTM+pyeVEBJQXEvR7Zq116GoktwQ=
 
 __EOF_KUBE_ENV
 
diff --git a/tests/integration/update_cluster/external_dns/data/aws_launch_template_nodes.minimal.example.com_user_data b/tests/integration/update_cluster/external_dns/data/aws_launch_template_nodes.minimal.example.com_user_data
index 0915bd9981..661841cc5b 100644
--- a/tests/integration/update_cluster/external_dns/data/aws_launch_template_nodes.minimal.example.com_user_data
+++ b/tests/integration/update_cluster/external_dns/data/aws_launch_template_nodes.minimal.example.com_user_data
@@ -151,7 +151,7 @@ ConfigServer:
   - https://kops-controller.internal.minimal.example.com:3988/
 InstanceGroupName: nodes
 InstanceGroupRole: Node
-NodeupConfigHash: q+zd9qOWcsPuVG5sYSiAcphkD0PBPRnWbw9yRz0MRLA=
+NodeupConfigHash: 1AGiv4MNUt9ZDs4jDI6wLlDP7gNbhcdFx4N5IrqMuj0=
 
 __EOF_KUBE_ENV
 
diff --git a/tests/integration/update_cluster/external_dns/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/external_dns/data/aws_s3_object_cluster-completed.spec_content
index 72ec091eb0..0661d57e85 100644
--- a/tests/integration/update_cluster/external_dns/data/aws_s3_object_cluster-completed.spec_content
+++ b/tests/integration/update_cluster/external_dns/data/aws_s3_object_cluster-completed.spec_content
@@ -24,15 +24,12 @@ spec:
   cloudProvider: aws
   clusterDNSDomain: cluster.local
   configBase: memfs://clusters.example.com/minimal.example.com
-  containerRuntime: containerd
   containerd:
     logLevel: info
     runc:
       version: 1.1.5
     version: 1.6.20
   dnsZone: Z1AFAKE1ZON3YO
-  docker:
-    skipInstall: true
   etcdClusters:
   - backups:
       backupStore: memfs://clusters.example.com/minimal.example.com/backups/etcd/main
diff --git a/tests/integration/update_cluster/external_dns/data/aws_s3_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/external_dns/data/aws_s3_object_nodeupconfig-master-us-test-1a_content
index b5b35c4004..9711d0ef32 100644
--- a/tests/integration/update_cluster/external_dns/data/aws_s3_object_nodeupconfig-master-us-test-1a_content
+++ b/tests/integration/update_cluster/external_dns/data/aws_s3_object_nodeupconfig-master-us-test-1a_content
@@ -227,7 +227,6 @@ CAs:
     9B7UD2ushcVFPtaeoL9Gfu8aY4KJBeqqg5ojl4qmRnThjw==
     -----END CERTIFICATE-----
 ClusterName: minimal.example.com
-ContainerRuntime: containerd
 ControlPlaneConfig:
   KubeControllerManager:
     allocateNodeCIDRs: true
@@ -321,8 +320,6 @@ containerdConfig:
   runc:
     version: 1.1.5
   version: 1.6.20
-docker:
-  skipInstall: true
 etcdManifests:
 - memfs://clusters.example.com/minimal.example.com/manifests/etcd/main-master-us-test-1a.yaml
 - memfs://clusters.example.com/minimal.example.com/manifests/etcd/events-master-us-test-1a.yaml
diff --git a/tests/integration/update_cluster/external_dns/data/aws_s3_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/external_dns/data/aws_s3_object_nodeupconfig-nodes_content
index 55e7649533..552bc4ab5e 100644
--- a/tests/integration/update_cluster/external_dns/data/aws_s3_object_nodeupconfig-nodes_content
+++ b/tests/integration/update_cluster/external_dns/data/aws_s3_object_nodeupconfig-nodes_content
@@ -13,7 +13,6 @@ Assets:
   - 54e79e4d48b9e191767e4abc08be1a8476a1c757e9a9f8c45c6ded001226867f@https://github.com/opencontainers/runc/releases/download/v1.1.5/runc.arm64
 CAs: {}
 ClusterName: minimal.example.com
-ContainerRuntime: containerd
 Hooks:
 - null
 - null
@@ -56,7 +55,5 @@ containerdConfig:
   runc:
     version: 1.1.5
   version: 1.6.20
-docker:
-  skipInstall: true
 usesLegacyGossip: false
 usesNoneDNS: false
diff --git a/tests/integration/update_cluster/external_dns_irsa/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data b/tests/integration/update_cluster/external_dns_irsa/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data
index 7ecad213da..8d70694d88 100644
--- a/tests/integration/update_cluster/external_dns_irsa/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data
+++ b/tests/integration/update_cluster/external_dns_irsa/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data
@@ -128,7 +128,7 @@ ClusterName: minimal.example.com
 ConfigBase: memfs://clusters.example.com/minimal.example.com
 InstanceGroupName: master-us-test-1a
 InstanceGroupRole: ControlPlane
-NodeupConfigHash: qcmONpsVF20J10Q8aBxO9+mfsTE1CZ9VyWOT+Cf3Qrw=
+NodeupConfigHash: utGE2ktbT8LJDFeHLDc54JKqFfbNF/2Q3+rBhbuIDqw=
 
 __EOF_KUBE_ENV
 
diff --git a/tests/integration/update_cluster/external_dns_irsa/data/aws_launch_template_nodes.minimal.example.com_user_data b/tests/integration/update_cluster/external_dns_irsa/data/aws_launch_template_nodes.minimal.example.com_user_data
index 0915bd9981..661841cc5b 100644
--- a/tests/integration/update_cluster/external_dns_irsa/data/aws_launch_template_nodes.minimal.example.com_user_data
+++ b/tests/integration/update_cluster/external_dns_irsa/data/aws_launch_template_nodes.minimal.example.com_user_data
@@ -151,7 +151,7 @@ ConfigServer:
   - https://kops-controller.internal.minimal.example.com:3988/
 InstanceGroupName: nodes
 InstanceGroupRole: Node
-NodeupConfigHash: q+zd9qOWcsPuVG5sYSiAcphkD0PBPRnWbw9yRz0MRLA=
+NodeupConfigHash: 1AGiv4MNUt9ZDs4jDI6wLlDP7gNbhcdFx4N5IrqMuj0=
 
 __EOF_KUBE_ENV
 
diff --git a/tests/integration/update_cluster/external_dns_irsa/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/external_dns_irsa/data/aws_s3_object_cluster-completed.spec_content
index a92bc47215..bcfb41a62f 100644
--- a/tests/integration/update_cluster/external_dns_irsa/data/aws_s3_object_cluster-completed.spec_content
+++ b/tests/integration/update_cluster/external_dns_irsa/data/aws_s3_object_cluster-completed.spec_content
@@ -24,15 +24,12 @@ spec:
   cloudProvider: aws
   clusterDNSDomain: cluster.local
   configBase: memfs://clusters.example.com/minimal.example.com
-  containerRuntime: containerd
   containerd:
     logLevel: info
     runc:
       version: 1.1.5
     version: 1.6.20
   dnsZone: Z1AFAKE1ZON3YO
-  docker:
-    skipInstall: true
   etcdClusters:
   - backups:
       backupStore: memfs://clusters.example.com/minimal.example.com/backups/etcd/main
diff --git a/tests/integration/update_cluster/external_dns_irsa/data/aws_s3_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/external_dns_irsa/data/aws_s3_object_nodeupconfig-master-us-test-1a_content
index 71e4cd6fe5..1aa6180910 100644
--- a/tests/integration/update_cluster/external_dns_irsa/data/aws_s3_object_nodeupconfig-master-us-test-1a_content
+++ b/tests/integration/update_cluster/external_dns_irsa/data/aws_s3_object_nodeupconfig-master-us-test-1a_content
@@ -227,7 +227,6 @@ CAs:
     9B7UD2ushcVFPtaeoL9Gfu8aY4KJBeqqg5ojl4qmRnThjw==
     -----END CERTIFICATE-----
 ClusterName: minimal.example.com
-ContainerRuntime: containerd
 ControlPlaneConfig:
   KubeControllerManager:
     allocateNodeCIDRs: true
@@ -321,8 +320,6 @@ containerdConfig:
   runc:
     version: 1.1.5
   version: 1.6.20
-docker:
-  skipInstall: true
 etcdManifests:
 - memfs://clusters.example.com/minimal.example.com/manifests/etcd/main-master-us-test-1a.yaml
 - memfs://clusters.example.com/minimal.example.com/manifests/etcd/events-master-us-test-1a.yaml
diff --git a/tests/integration/update_cluster/external_dns_irsa/data/aws_s3_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/external_dns_irsa/data/aws_s3_object_nodeupconfig-nodes_content
index 55e7649533..552bc4ab5e 100644
--- a/tests/integration/update_cluster/external_dns_irsa/data/aws_s3_object_nodeupconfig-nodes_content
+++ b/tests/integration/update_cluster/external_dns_irsa/data/aws_s3_object_nodeupconfig-nodes_content
@@ -13,7 +13,6 @@ Assets:
   - 54e79e4d48b9e191767e4abc08be1a8476a1c757e9a9f8c45c6ded001226867f@https://github.com/opencontainers/runc/releases/download/v1.1.5/runc.arm64
 CAs: {}
 ClusterName: minimal.example.com
-ContainerRuntime: containerd
 Hooks:
 - null
 - null
@@ -56,7 +55,5 @@ containerdConfig:
   runc:
     version: 1.1.5
   version: 1.6.20
-docker:
-  skipInstall: true
 usesLegacyGossip: false
 usesNoneDNS: false
diff --git a/tests/integration/update_cluster/externallb/data/aws_launch_template_master-us-test-1a.masters.externallb.example.com_user_data b/tests/integration/update_cluster/externallb/data/aws_launch_template_master-us-test-1a.masters.externallb.example.com_user_data
index 8bb0299387..6fafd71b33 100644
--- a/tests/integration/update_cluster/externallb/data/aws_launch_template_master-us-test-1a.masters.externallb.example.com_user_data
+++ b/tests/integration/update_cluster/externallb/data/aws_launch_template_master-us-test-1a.masters.externallb.example.com_user_data
@@ -128,7 +128,7 @@ ClusterName: externallb.example.com
 ConfigBase: memfs://clusters.example.com/externallb.example.com
 InstanceGroupName: master-us-test-1a
 InstanceGroupRole: ControlPlane
-NodeupConfigHash: NKFfrDsPakmQNl2P0G0MGCsPquPVw8xFxN2SfPQUpBw=
+NodeupConfigHash: Ix29Bf9j0AzYuxgUBPZX26Yq6MxGqGL+FeMVOvIEhkQ=
 
 __EOF_KUBE_ENV
 
diff --git a/tests/integration/update_cluster/externallb/data/aws_launch_template_nodes.externallb.example.com_user_data b/tests/integration/update_cluster/externallb/data/aws_launch_template_nodes.externallb.example.com_user_data
index ee1b9e507b..4719d7b131 100644
--- a/tests/integration/update_cluster/externallb/data/aws_launch_template_nodes.externallb.example.com_user_data
+++ b/tests/integration/update_cluster/externallb/data/aws_launch_template_nodes.externallb.example.com_user_data
@@ -151,7 +151,7 @@ ConfigServer:
   - https://kops-controller.internal.externallb.example.com:3988/
 InstanceGroupName: nodes
 InstanceGroupRole: Node
-NodeupConfigHash: wGvHSpEL6UhZAckSa5EYHVRpRDpPMJX+1QnFshwq24o=
+NodeupConfigHash: YrXye+hx7uc6vtHAU6fLQOCIopFOWyfrKXVHd2ZypeM=
 
 __EOF_KUBE_ENV
 
diff --git a/tests/integration/update_cluster/externallb/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/externallb/data/aws_s3_object_cluster-completed.spec_content
index f8527aa7ae..67e0a723a9 100644
--- a/tests/integration/update_cluster/externallb/data/aws_s3_object_cluster-completed.spec_content
+++ b/tests/integration/update_cluster/externallb/data/aws_s3_object_cluster-completed.spec_content
@@ -24,15 +24,12 @@ spec:
   cloudProvider: aws
   clusterDNSDomain: cluster.local
   configBase: memfs://clusters.example.com/externallb.example.com
-  containerRuntime: containerd
   containerd:
     logLevel: info
     runc:
       version: 1.1.5
     version: 1.6.20
   dnsZone: Z1AFAKE1ZON3YO
-  docker:
-    skipInstall: true
   etcdClusters:
   - backups:
       backupStore: memfs://clusters.example.com/externallb.example.com/backups/etcd/main
diff --git a/tests/integration/update_cluster/externallb/data/aws_s3_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/externallb/data/aws_s3_object_nodeupconfig-master-us-test-1a_content
index 9297e85403..8a7b359d81 100644
--- a/tests/integration/update_cluster/externallb/data/aws_s3_object_nodeupconfig-master-us-test-1a_content
+++ b/tests/integration/update_cluster/externallb/data/aws_s3_object_nodeupconfig-master-us-test-1a_content
@@ -227,7 +227,6 @@ CAs:
     9B7UD2ushcVFPtaeoL9Gfu8aY4KJBeqqg5ojl4qmRnThjw==
     -----END CERTIFICATE-----
 ClusterName: externallb.example.com
-ContainerRuntime: containerd
 ControlPlaneConfig:
   KubeControllerManager:
     allocateNodeCIDRs: true
@@ -321,8 +320,6 @@ containerdConfig:
   runc:
     version: 1.1.5
   version: 1.6.20
-docker:
-  skipInstall: true
 etcdManifests:
 - memfs://clusters.example.com/externallb.example.com/manifests/etcd/main-master-us-test-1a.yaml
 - memfs://clusters.example.com/externallb.example.com/manifests/etcd/events-master-us-test-1a.yaml
diff --git a/tests/integration/update_cluster/externallb/data/aws_s3_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/externallb/data/aws_s3_object_nodeupconfig-nodes_content
index e6b7b53a43..128abc2c25 100644
--- a/tests/integration/update_cluster/externallb/data/aws_s3_object_nodeupconfig-nodes_content
+++ b/tests/integration/update_cluster/externallb/data/aws_s3_object_nodeupconfig-nodes_content
@@ -13,7 +13,6 @@ Assets:
   - 54e79e4d48b9e191767e4abc08be1a8476a1c757e9a9f8c45c6ded001226867f@https://github.com/opencontainers/runc/releases/download/v1.1.5/runc.arm64
 CAs: {}
 ClusterName: externallb.example.com
-ContainerRuntime: containerd
 Hooks:
 - null
 - null
@@ -56,7 +55,5 @@ containerdConfig:
   runc:
     version: 1.1.5
   version: 1.6.20
-docker:
-  skipInstall: true
 usesLegacyGossip: false
 usesNoneDNS: false
diff --git a/tests/integration/update_cluster/externalpolicies/data/aws_launch_template_master-us-test-1a.masters.externalpolicies.example.com_user_data b/tests/integration/update_cluster/externalpolicies/data/aws_launch_template_master-us-test-1a.masters.externalpolicies.example.com_user_data
index d54dd109f5..b6c2510745 100644
--- a/tests/integration/update_cluster/externalpolicies/data/aws_launch_template_master-us-test-1a.masters.externalpolicies.example.com_user_data
+++ b/tests/integration/update_cluster/externalpolicies/data/aws_launch_template_master-us-test-1a.masters.externalpolicies.example.com_user_data
@@ -128,7 +128,7 @@ ClusterName: externalpolicies.example.com
 ConfigBase: memfs://clusters.example.com/externalpolicies.example.com
 InstanceGroupName: master-us-test-1a
 InstanceGroupRole: ControlPlane
-NodeupConfigHash: JPb6+kD4luwe7oJsIzGVEX58nwKEbGbqc1g5tMc6XE4=
+NodeupConfigHash: 2zaACe5kBK/TYvlX4qMWvf9I/CWsbCcaLrHDqT6ZVks=
 
 __EOF_KUBE_ENV
 
diff --git a/tests/integration/update_cluster/externalpolicies/data/aws_launch_template_nodes.externalpolicies.example.com_user_data b/tests/integration/update_cluster/externalpolicies/data/aws_launch_template_nodes.externalpolicies.example.com_user_data
index abdffbe266..64d6766f66 100644
--- a/tests/integration/update_cluster/externalpolicies/data/aws_launch_template_nodes.externalpolicies.example.com_user_data
+++ b/tests/integration/update_cluster/externalpolicies/data/aws_launch_template_nodes.externalpolicies.example.com_user_data
@@ -151,7 +151,7 @@ ConfigServer:
   - https://kops-controller.internal.externalpolicies.example.com:3988/
 InstanceGroupName: nodes
 InstanceGroupRole: Node
-NodeupConfigHash: DykhdXWe5SMUowLFc/GxtAr4f9huuSle7KM6i8JeZZY=
+NodeupConfigHash: KCd/XqRpIxC6NnjQYOtrDIFPVEyb1gb+qu6YUbNu6tc=
 
 __EOF_KUBE_ENV
 
diff --git a/tests/integration/update_cluster/externalpolicies/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/externalpolicies/data/aws_s3_object_cluster-completed.spec_content
index ea78ea610b..c0bebb0654 100644
--- a/tests/integration/update_cluster/externalpolicies/data/aws_s3_object_cluster-completed.spec_content
+++ b/tests/integration/update_cluster/externalpolicies/data/aws_s3_object_cluster-completed.spec_content
@@ -32,15 +32,12 @@ spec:
   cloudProvider: aws
   clusterDNSDomain: cluster.local
   configBase: memfs://clusters.example.com/externalpolicies.example.com
-  containerRuntime: containerd
   containerd:
     logLevel: info
     runc:
       version: 1.1.5
     version: 1.6.20
   dnsZone: Z1AFAKE1ZON3YO
-  docker:
-    skipInstall: true
   etcdClusters:
   - backups:
       backupStore: memfs://clusters.example.com/externalpolicies.example.com/backups/etcd/main
diff --git a/tests/integration/update_cluster/externalpolicies/data/aws_s3_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/externalpolicies/data/aws_s3_object_nodeupconfig-master-us-test-1a_content
index e720b09f69..72a4a620b6 100644
--- a/tests/integration/update_cluster/externalpolicies/data/aws_s3_object_nodeupconfig-master-us-test-1a_content
+++ b/tests/integration/update_cluster/externalpolicies/data/aws_s3_object_nodeupconfig-master-us-test-1a_content
@@ -228,7 +228,6 @@ CAs:
     9B7UD2ushcVFPtaeoL9Gfu8aY4KJBeqqg5ojl4qmRnThjw==
     -----END CERTIFICATE-----
 ClusterName: externalpolicies.example.com
-ContainerRuntime: containerd
 ControlPlaneConfig:
   KubeControllerManager:
     allocateNodeCIDRs: true
@@ -323,8 +322,6 @@ containerdConfig:
   runc:
     version: 1.1.5
   version: 1.6.20
-docker:
-  skipInstall: true
 etcdManifests:
 - memfs://clusters.example.com/externalpolicies.example.com/manifests/etcd/main-master-us-test-1a.yaml
 - memfs://clusters.example.com/externalpolicies.example.com/manifests/etcd/events-master-us-test-1a.yaml
diff --git a/tests/integration/update_cluster/externalpolicies/data/aws_s3_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/externalpolicies/data/aws_s3_object_nodeupconfig-nodes_content
index bae9151aec..b1b07000bc 100644
--- a/tests/integration/update_cluster/externalpolicies/data/aws_s3_object_nodeupconfig-nodes_content
+++ b/tests/integration/update_cluster/externalpolicies/data/aws_s3_object_nodeupconfig-nodes_content
@@ -13,7 +13,6 @@ Assets:
   - 54e79e4d48b9e191767e4abc08be1a8476a1c757e9a9f8c45c6ded001226867f@https://github.com/opencontainers/runc/releases/download/v1.1.5/runc.arm64
 CAs: {}
 ClusterName: externalpolicies.example.com
-ContainerRuntime: containerd
 Hooks:
 - null
 - null
@@ -57,7 +56,5 @@ containerdConfig:
   runc:
     version: 1.1.5
   version: 1.6.20
-docker:
-  skipInstall: true
 usesLegacyGossip: false
 usesNoneDNS: false
diff --git a/tests/integration/update_cluster/ha/data/aws_launch_template_master-us-test-1a.masters.ha.example.com_user_data b/tests/integration/update_cluster/ha/data/aws_launch_template_master-us-test-1a.masters.ha.example.com_user_data
index f0cae3c433..df4ae2339f 100644
--- a/tests/integration/update_cluster/ha/data/aws_launch_template_master-us-test-1a.masters.ha.example.com_user_data
+++ b/tests/integration/update_cluster/ha/data/aws_launch_template_master-us-test-1a.masters.ha.example.com_user_data
@@ -128,7 +128,7 @@ ClusterName: ha.example.com
 ConfigBase: memfs://tests/ha.example.com
 InstanceGroupName: master-us-test-1a
 InstanceGroupRole: ControlPlane
-NodeupConfigHash: HvJISN0oq6SPcmGu7X6BnDafst8o5qlhNOSeKCzgI20=
+NodeupConfigHash: JvyJk2+uUTgZZEMU18tNHuNG39/4ac5hvxxzCvBkyB8=
 
 __EOF_KUBE_ENV
 
diff --git a/tests/integration/update_cluster/ha/data/aws_launch_template_master-us-test-1b.masters.ha.example.com_user_data b/tests/integration/update_cluster/ha/data/aws_launch_template_master-us-test-1b.masters.ha.example.com_user_data
index d879634cce..93af7f04cd 100644
--- a/tests/integration/update_cluster/ha/data/aws_launch_template_master-us-test-1b.masters.ha.example.com_user_data
+++ b/tests/integration/update_cluster/ha/data/aws_launch_template_master-us-test-1b.masters.ha.example.com_user_data
@@ -128,7 +128,7 @@ ClusterName: ha.example.com
 ConfigBase: memfs://tests/ha.example.com
 InstanceGroupName: master-us-test-1b
 InstanceGroupRole: ControlPlane
-NodeupConfigHash: LoOPXwKyP76MfmV8wiDBwKvXiyWSd8W/b6vKzLBzBR0=
+NodeupConfigHash: 9msCqHypArv4W9T0D2iZvsHujxEsS868lzegv4o37ZI=
 
 __EOF_KUBE_ENV
 
diff --git a/tests/integration/update_cluster/ha/data/aws_launch_template_master-us-test-1c.masters.ha.example.com_user_data b/tests/integration/update_cluster/ha/data/aws_launch_template_master-us-test-1c.masters.ha.example.com_user_data
index f9b284ae84..64e5e1e20e 100644
--- a/tests/integration/update_cluster/ha/data/aws_launch_template_master-us-test-1c.masters.ha.example.com_user_data
+++ b/tests/integration/update_cluster/ha/data/aws_launch_template_master-us-test-1c.masters.ha.example.com_user_data
@@ -128,7 +128,7 @@ ClusterName: ha.example.com
 ConfigBase: memfs://tests/ha.example.com
 InstanceGroupName: master-us-test-1c
 InstanceGroupRole: ControlPlane
-NodeupConfigHash: 7O/H6RibQrrFMkOFfyiAUa1Sgj9885/wn3KJWZBOojM=
+NodeupConfigHash: cL2gaVExjwRE7aPNgjG8bgUm+z5XCg2I987v07G21uw=
 
 __EOF_KUBE_ENV
 
diff --git a/tests/integration/update_cluster/ha/data/aws_launch_template_nodes.ha.example.com_user_data b/tests/integration/update_cluster/ha/data/aws_launch_template_nodes.ha.example.com_user_data
index 1d4c72ffcb..db84ab970e 100644
--- a/tests/integration/update_cluster/ha/data/aws_launch_template_nodes.ha.example.com_user_data
+++ b/tests/integration/update_cluster/ha/data/aws_launch_template_nodes.ha.example.com_user_data
@@ -151,7 +151,7 @@ ConfigServer:
   - https://kops-controller.internal.ha.example.com:3988/
 InstanceGroupName: nodes
 InstanceGroupRole: Node
-NodeupConfigHash: 7lOIpEpyKX6ecinFjXoDLzKFsAOkJQzPBKq6XYEQg+g=
+NodeupConfigHash: 1hpCuaWfc/8wobAxJ2weMeKpiP7hfwpOdGdGbBV0ND4=
 
 __EOF_KUBE_ENV
 
diff --git a/tests/integration/update_cluster/ha/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/ha/data/aws_s3_object_cluster-completed.spec_content
index 13b9327cce..96f45bfd38 100644
--- a/tests/integration/update_cluster/ha/data/aws_s3_object_cluster-completed.spec_content
+++ b/tests/integration/update_cluster/ha/data/aws_s3_object_cluster-completed.spec_content
@@ -24,15 +24,12 @@ spec:
   cloudProvider: aws
   clusterDNSDomain: cluster.local
   configBase: memfs://tests/ha.example.com
-  containerRuntime: containerd
   containerd:
     logLevel: info
     runc:
       version: 1.1.5
     version: 1.6.20
   dnsZone: Z1AFAKE1ZON3YO
-  docker:
-    skipInstall: true
   etcdClusters:
   - backups:
       backupStore: memfs://tests/ha.example.com/backups/etcd/main
diff --git a/tests/integration/update_cluster/ha/data/aws_s3_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/ha/data/aws_s3_object_nodeupconfig-master-us-test-1a_content
index 0873e0e617..cd883e93db 100644
--- a/tests/integration/update_cluster/ha/data/aws_s3_object_nodeupconfig-master-us-test-1a_content
+++ b/tests/integration/update_cluster/ha/data/aws_s3_object_nodeupconfig-master-us-test-1a_content
@@ -227,7 +227,6 @@ CAs:
     9B7UD2ushcVFPtaeoL9Gfu8aY4KJBeqqg5ojl4qmRnThjw==
     -----END CERTIFICATE-----
 ClusterName: ha.example.com
-ContainerRuntime: containerd
 ControlPlaneConfig:
   KubeControllerManager:
     allocateNodeCIDRs: true
@@ -321,8 +320,6 @@ containerdConfig:
   runc:
     version: 1.1.5
   version: 1.6.20
-docker:
-  skipInstall: true
 etcdManifests:
 - memfs://tests/ha.example.com/manifests/etcd/main-master-us-test-1a.yaml
 - memfs://tests/ha.example.com/manifests/etcd/events-master-us-test-1a.yaml
diff --git a/tests/integration/update_cluster/ha/data/aws_s3_object_nodeupconfig-master-us-test-1b_content b/tests/integration/update_cluster/ha/data/aws_s3_object_nodeupconfig-master-us-test-1b_content
index 1063c0da81..f4bae11ba9 100644
--- a/tests/integration/update_cluster/ha/data/aws_s3_object_nodeupconfig-master-us-test-1b_content
+++ b/tests/integration/update_cluster/ha/data/aws_s3_object_nodeupconfig-master-us-test-1b_content
@@ -227,7 +227,6 @@ CAs:
     9B7UD2ushcVFPtaeoL9Gfu8aY4KJBeqqg5ojl4qmRnThjw==
     -----END CERTIFICATE-----
 ClusterName: ha.example.com
-ContainerRuntime: containerd
 ControlPlaneConfig:
   KubeControllerManager:
     allocateNodeCIDRs: true
@@ -321,8 +320,6 @@ containerdConfig:
   runc:
     version: 1.1.5
   version: 1.6.20
-docker:
-  skipInstall: true
 etcdManifests:
 - memfs://tests/ha.example.com/manifests/etcd/main-master-us-test-1b.yaml
 - memfs://tests/ha.example.com/manifests/etcd/events-master-us-test-1b.yaml
diff --git a/tests/integration/update_cluster/ha/data/aws_s3_object_nodeupconfig-master-us-test-1c_content b/tests/integration/update_cluster/ha/data/aws_s3_object_nodeupconfig-master-us-test-1c_content
index 71ae2e04b9..c5a77fbfa3 100644
--- a/tests/integration/update_cluster/ha/data/aws_s3_object_nodeupconfig-master-us-test-1c_content
+++ b/tests/integration/update_cluster/ha/data/aws_s3_object_nodeupconfig-master-us-test-1c_content
@@ -227,7 +227,6 @@ CAs:
     9B7UD2ushcVFPtaeoL9Gfu8aY4KJBeqqg5ojl4qmRnThjw==
     -----END CERTIFICATE-----
 ClusterName: ha.example.com
-ContainerRuntime: containerd
 ControlPlaneConfig:
   KubeControllerManager:
     allocateNodeCIDRs: true
@@ -321,8 +320,6 @@ containerdConfig:
   runc:
     version: 1.1.5
   version: 1.6.20
-docker:
-  skipInstall: true
 etcdManifests:
 - memfs://tests/ha.example.com/manifests/etcd/main-master-us-test-1c.yaml
 - memfs://tests/ha.example.com/manifests/etcd/events-master-us-test-1c.yaml
diff --git a/tests/integration/update_cluster/ha/data/aws_s3_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/ha/data/aws_s3_object_nodeupconfig-nodes_content
index 98e2ed02a8..0a59a5179b 100644
--- a/tests/integration/update_cluster/ha/data/aws_s3_object_nodeupconfig-nodes_content
+++ b/tests/integration/update_cluster/ha/data/aws_s3_object_nodeupconfig-nodes_content
@@ -13,7 +13,6 @@ Assets:
   - 54e79e4d48b9e191767e4abc08be1a8476a1c757e9a9f8c45c6ded001226867f@https://github.com/opencontainers/runc/releases/download/v1.1.5/runc.arm64
 CAs: {}
 ClusterName: ha.example.com
-ContainerRuntime: containerd
 Hooks:
 - null
 - null
@@ -56,7 +55,5 @@ containerdConfig:
   runc:
     version: 1.1.5
   version: 1.6.20
-docker:
-  skipInstall: true
 usesLegacyGossip: false
 usesNoneDNS: false
diff --git a/tests/integration/update_cluster/ha_gce/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/ha_gce/data/aws_s3_object_cluster-completed.spec_content
index b9432f8b4c..0d98f1870b 100644
--- a/tests/integration/update_cluster/ha_gce/data/aws_s3_object_cluster-completed.spec_content
+++ b/tests/integration/update_cluster/ha_gce/data/aws_s3_object_cluster-completed.spec_content
@@ -26,15 +26,12 @@ spec:
   cloudProvider: gce
   clusterDNSDomain: cluster.local
   configBase: memfs://tests/ha-gce.example.com
-  containerRuntime: containerd
   containerd:
     logLevel: info
     runc:
       version: 1.1.5
     version: 1.6.20
   dnsZone: "1"
-  docker:
-    skipInstall: true
   etcdClusters:
   - backups:
       backupStore: memfs://tests/ha-gce.example.com/backups/etcd/main
diff --git a/tests/integration/update_cluster/ha_gce/data/aws_s3_object_nodeupconfig-master-us-test1-a_content b/tests/integration/update_cluster/ha_gce/data/aws_s3_object_nodeupconfig-master-us-test1-a_content
index 0dde7b2214..c2e64ae95f 100644
--- a/tests/integration/update_cluster/ha_gce/data/aws_s3_object_nodeupconfig-master-us-test1-a_content
+++ b/tests/integration/update_cluster/ha_gce/data/aws_s3_object_nodeupconfig-master-us-test1-a_content
@@ -226,7 +226,6 @@ CAs:
     9B7UD2ushcVFPtaeoL9Gfu8aY4KJBeqqg5ojl4qmRnThjw==
     -----END CERTIFICATE-----
 ClusterName: ha-gce.example.com
-ContainerRuntime: containerd
 ControlPlaneConfig:
   KubeControllerManager:
     allocateNodeCIDRs: true
@@ -312,8 +311,6 @@ containerdConfig:
   runc:
     version: 1.1.5
   version: 1.6.20
-docker:
-  skipInstall: true
 etcdManifests:
 - memfs://tests/ha-gce.example.com/manifests/etcd/main-master-us-test1-a.yaml
 - memfs://tests/ha-gce.example.com/manifests/etcd/events-master-us-test1-a.yaml
diff --git a/tests/integration/update_cluster/ha_gce/data/aws_s3_object_nodeupconfig-master-us-test1-b_content b/tests/integration/update_cluster/ha_gce/data/aws_s3_object_nodeupconfig-master-us-test1-b_content
index d372db7de8..e7c6e2176c 100644
--- a/tests/integration/update_cluster/ha_gce/data/aws_s3_object_nodeupconfig-master-us-test1-b_content
+++ b/tests/integration/update_cluster/ha_gce/data/aws_s3_object_nodeupconfig-master-us-test1-b_content
@@ -226,7 +226,6 @@ CAs:
     9B7UD2ushcVFPtaeoL9Gfu8aY4KJBeqqg5ojl4qmRnThjw==
     -----END CERTIFICATE-----
 ClusterName: ha-gce.example.com
-ContainerRuntime: containerd
 ControlPlaneConfig:
   KubeControllerManager:
     allocateNodeCIDRs: true
@@ -312,8 +311,6 @@ containerdConfig:
   runc:
     version: 1.1.5
   version: 1.6.20
-docker:
-  skipInstall: true
 etcdManifests:
 - memfs://tests/ha-gce.example.com/manifests/etcd/main-master-us-test1-b.yaml
 - memfs://tests/ha-gce.example.com/manifests/etcd/events-master-us-test1-b.yaml
diff --git a/tests/integration/update_cluster/ha_gce/data/aws_s3_object_nodeupconfig-master-us-test1-c_content b/tests/integration/update_cluster/ha_gce/data/aws_s3_object_nodeupconfig-master-us-test1-c_content
index 1dad3860f1..69f1297668 100644
--- a/tests/integration/update_cluster/ha_gce/data/aws_s3_object_nodeupconfig-master-us-test1-c_content
+++ b/tests/integration/update_cluster/ha_gce/data/aws_s3_object_nodeupconfig-master-us-test1-c_content
@@ -226,7 +226,6 @@ CAs:
     9B7UD2ushcVFPtaeoL9Gfu8aY4KJBeqqg5ojl4qmRnThjw==
     -----END CERTIFICATE-----
 ClusterName: ha-gce.example.com
-ContainerRuntime: containerd
 ControlPlaneConfig:
   KubeControllerManager:
     allocateNodeCIDRs: true
@@ -312,8 +311,6 @@ containerdConfig:
   runc:
     version: 1.1.5
   version: 1.6.20
-docker:
-  skipInstall: true
 etcdManifests:
 - memfs://tests/ha-gce.example.com/manifests/etcd/main-master-us-test1-c.yaml
 - memfs://tests/ha-gce.example.com/manifests/etcd/events-master-us-test1-c.yaml
diff --git a/tests/integration/update_cluster/ha_gce/data/aws_s3_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/ha_gce/data/aws_s3_object_nodeupconfig-nodes_content
index be12c82c82..95194a8858 100644
--- a/tests/integration/update_cluster/ha_gce/data/aws_s3_object_nodeupconfig-nodes_content
+++ b/tests/integration/update_cluster/ha_gce/data/aws_s3_object_nodeupconfig-nodes_content
@@ -15,7 +15,6 @@ Assets:
   - 54e79e4d48b9e191767e4abc08be1a8476a1c757e9a9f8c45c6ded001226867f@https://github.com/opencontainers/runc/releases/download/v1.1.5/runc.arm64
 CAs: {}
 ClusterName: ha-gce.example.com
-ContainerRuntime: containerd
 Hooks:
 - null
 - null
@@ -56,8 +55,6 @@ containerdConfig:
   runc:
     version: 1.1.5
   version: 1.6.20
-docker:
-  skipInstall: true
 multizone: true
 nodeTags: ha-gce-example-com-k8s-io-role-node
 usesLegacyGossip: false
diff --git a/tests/integration/update_cluster/ha_gce/data/google_compute_instance_template_master-us-test1-a-ha-gce-example-com_metadata_user-data b/tests/integration/update_cluster/ha_gce/data/google_compute_instance_template_master-us-test1-a-ha-gce-example-com_metadata_user-data
index 5fa49527d9..ebe5670bec 100644
--- a/tests/integration/update_cluster/ha_gce/data/google_compute_instance_template_master-us-test1-a-ha-gce-example-com_metadata_user-data
+++ b/tests/integration/update_cluster/ha_gce/data/google_compute_instance_template_master-us-test1-a-ha-gce-example-com_metadata_user-data
@@ -127,7 +127,7 @@ ClusterName: ha-gce.example.com
 ConfigBase: memfs://tests/ha-gce.example.com
 InstanceGroupName: master-us-test1-a
 InstanceGroupRole: ControlPlane
-NodeupConfigHash: iNWIm7I+gJqBRhGLPBvaPHwXLXmsJvKwlqAFIYiQVGE=
+NodeupConfigHash: A6XuESTLb0qZLS7irtfj/zb0fMXz5cHL71DGDSUlr6U=
 
 __EOF_KUBE_ENV
 
diff --git a/tests/integration/update_cluster/ha_gce/data/google_compute_instance_template_master-us-test1-b-ha-gce-example-com_metadata_user-data b/tests/integration/update_cluster/ha_gce/data/google_compute_instance_template_master-us-test1-b-ha-gce-example-com_metadata_user-data
index 46a3a289d0..b5a478f0f4 100644
--- a/tests/integration/update_cluster/ha_gce/data/google_compute_instance_template_master-us-test1-b-ha-gce-example-com_metadata_user-data
+++ b/tests/integration/update_cluster/ha_gce/data/google_compute_instance_template_master-us-test1-b-ha-gce-example-com_metadata_user-data
@@ -127,7 +127,7 @@ ClusterName: ha-gce.example.com
 ConfigBase: memfs://tests/ha-gce.example.com
 InstanceGroupName: master-us-test1-b
 InstanceGroupRole: ControlPlane
-NodeupConfigHash: aA2uT/PXYGJJX9HTaUj1AboZjCvhldur0SR6U+WCFuU=
+NodeupConfigHash: ZPF1EicmVMeKFnS5ae65ZdwiReadUxu5QUY+qy1cvFQ=
 
 __EOF_KUBE_ENV
 
diff --git a/tests/integration/update_cluster/ha_gce/data/google_compute_instance_template_master-us-test1-c-ha-gce-example-com_metadata_user-data b/tests/integration/update_cluster/ha_gce/data/google_compute_instance_template_master-us-test1-c-ha-gce-example-com_metadata_user-data
index f252c3f466..b6488356ca 100644
--- a/tests/integration/update_cluster/ha_gce/data/google_compute_instance_template_master-us-test1-c-ha-gce-example-com_metadata_user-data
+++ b/tests/integration/update_cluster/ha_gce/data/google_compute_instance_template_master-us-test1-c-ha-gce-example-com_metadata_user-data
@@ -127,7 +127,7 @@ ClusterName: ha-gce.example.com
 ConfigBase: memfs://tests/ha-gce.example.com
 InstanceGroupName: master-us-test1-c
 InstanceGroupRole: ControlPlane
-NodeupConfigHash: OPzK4CJzqv7NFmLGqShPLExQ9Q7aYuvOkSGzn5syELU=
+NodeupConfigHash: MPNcju6q0zaieedASkWJUPaL3HUQqbJAJfAL3zdK5cQ=
 
 __EOF_KUBE_ENV
 
diff --git a/tests/integration/update_cluster/ha_gce/data/google_compute_instance_template_nodes-ha-gce-example-com_metadata_user-data b/tests/integration/update_cluster/ha_gce/data/google_compute_instance_template_nodes-ha-gce-example-com_metadata_user-data
index 24f6d568a5..a7a2bb0a61 100644
--- a/tests/integration/update_cluster/ha_gce/data/google_compute_instance_template_nodes-ha-gce-example-com_metadata_user-data
+++ b/tests/integration/update_cluster/ha_gce/data/google_compute_instance_template_nodes-ha-gce-example-com_metadata_user-data
@@ -150,7 +150,7 @@ ConfigServer:
   - https://kops-controller.internal.ha-gce.example.com:3988/
 InstanceGroupName: nodes
 InstanceGroupRole: Node
-NodeupConfigHash: bEXGN5QM6RC+Y2XeghhTx1b7jawliynXbu4ae1OId9E=
+NodeupConfigHash: iSkB/IuVDAsBZzx1ABtIyYxGvA0r4pW7wBqtrlj0Auo=
 
 __EOF_KUBE_ENV
 
diff --git a/tests/integration/update_cluster/irsa/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data b/tests/integration/update_cluster/irsa/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data
index 7ecad213da..8d70694d88 100644
--- a/tests/integration/update_cluster/irsa/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data
+++ b/tests/integration/update_cluster/irsa/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data
@@ -128,7 +128,7 @@ ClusterName: minimal.example.com
 ConfigBase: memfs://clusters.example.com/minimal.example.com
 InstanceGroupName: master-us-test-1a
 InstanceGroupRole: ControlPlane
-NodeupConfigHash: qcmONpsVF20J10Q8aBxO9+mfsTE1CZ9VyWOT+Cf3Qrw=
+NodeupConfigHash: utGE2ktbT8LJDFeHLDc54JKqFfbNF/2Q3+rBhbuIDqw=
 
 __EOF_KUBE_ENV
 
diff --git a/tests/integration/update_cluster/irsa/data/aws_launch_template_nodes.minimal.example.com_user_data b/tests/integration/update_cluster/irsa/data/aws_launch_template_nodes.minimal.example.com_user_data
index 0915bd9981..661841cc5b 100644
--- a/tests/integration/update_cluster/irsa/data/aws_launch_template_nodes.minimal.example.com_user_data
+++ b/tests/integration/update_cluster/irsa/data/aws_launch_template_nodes.minimal.example.com_user_data
@@ -151,7 +151,7 @@ ConfigServer:
   - https://kops-controller.internal.minimal.example.com:3988/
 InstanceGroupName: nodes
 InstanceGroupRole: Node
-NodeupConfigHash: q+zd9qOWcsPuVG5sYSiAcphkD0PBPRnWbw9yRz0MRLA=
+NodeupConfigHash: 1AGiv4MNUt9ZDs4jDI6wLlDP7gNbhcdFx4N5IrqMuj0=
 
 __EOF_KUBE_ENV
 
diff --git a/tests/integration/update_cluster/irsa/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/irsa/data/aws_s3_object_cluster-completed.spec_content
index bdb3cd0039..fef5b9e29b 100644
--- a/tests/integration/update_cluster/irsa/data/aws_s3_object_cluster-completed.spec_content
+++ b/tests/integration/update_cluster/irsa/data/aws_s3_object_cluster-completed.spec_content
@@ -26,15 +26,12 @@ spec:
   cloudProvider: aws
   clusterDNSDomain: cluster.local
   configBase: memfs://clusters.example.com/minimal.example.com
-  containerRuntime: containerd
   containerd:
     logLevel: info
     runc:
       version: 1.1.5
     version: 1.6.20
   dnsZone: Z1AFAKE1ZON3YO
-  docker:
-    skipInstall: true
   etcdClusters:
   - backups:
       backupStore: memfs://clusters.example.com/minimal.example.com/backups/etcd/main
diff --git a/tests/integration/update_cluster/irsa/data/aws_s3_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/irsa/data/aws_s3_object_nodeupconfig-master-us-test-1a_content
index 71e4cd6fe5..1aa6180910 100644
--- a/tests/integration/update_cluster/irsa/data/aws_s3_object_nodeupconfig-master-us-test-1a_content
+++ b/tests/integration/update_cluster/irsa/data/aws_s3_object_nodeupconfig-master-us-test-1a_content
@@ -227,7 +227,6 @@ CAs:
     9B7UD2ushcVFPtaeoL9Gfu8aY4KJBeqqg5ojl4qmRnThjw==
     -----END CERTIFICATE-----
 ClusterName: minimal.example.com
-ContainerRuntime: containerd
 ControlPlaneConfig:
   KubeControllerManager:
     allocateNodeCIDRs: true
@@ -321,8 +320,6 @@ containerdConfig:
   runc:
     version: 1.1.5
   version: 1.6.20
-docker:
-  skipInstall: true
 etcdManifests:
 - memfs://clusters.example.com/minimal.example.com/manifests/etcd/main-master-us-test-1a.yaml
 - memfs://clusters.example.com/minimal.example.com/manifests/etcd/events-master-us-test-1a.yaml
diff --git a/tests/integration/update_cluster/irsa/data/aws_s3_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/irsa/data/aws_s3_object_nodeupconfig-nodes_content
index 55e7649533..552bc4ab5e 100644
--- a/tests/integration/update_cluster/irsa/data/aws_s3_object_nodeupconfig-nodes_content
+++ b/tests/integration/update_cluster/irsa/data/aws_s3_object_nodeupconfig-nodes_content
@@ -13,7 +13,6 @@ Assets:
   - 54e79e4d48b9e191767e4abc08be1a8476a1c757e9a9f8c45c6ded001226867f@https://github.com/opencontainers/runc/releases/download/v1.1.5/runc.arm64
 CAs: {}
 ClusterName: minimal.example.com
-ContainerRuntime: containerd
 Hooks:
 - null
 - null
@@ -56,7 +55,5 @@ containerdConfig:
   runc:
     version: 1.1.5
   version: 1.6.20
-docker:
-  skipInstall: true
 usesLegacyGossip: false
 usesNoneDNS: false
diff --git a/tests/integration/update_cluster/karpenter/data/aws_launch_template_karpenter-nodes-default.minimal.example.com_user_data b/tests/integration/update_cluster/karpenter/data/aws_launch_template_karpenter-nodes-default.minimal.example.com_user_data
index fd4532c83e..302580624a 100644
--- a/tests/integration/update_cluster/karpenter/data/aws_launch_template_karpenter-nodes-default.minimal.example.com_user_data
+++ b/tests/integration/update_cluster/karpenter/data/aws_launch_template_karpenter-nodes-default.minimal.example.com_user_data
@@ -151,7 +151,7 @@ ConfigServer:
   - https://kops-controller.internal.minimal.example.com:3988/
 InstanceGroupName: karpenter-nodes-default
 InstanceGroupRole: Node
-NodeupConfigHash: 4Qatcv8JcKnVePdJDWQ15SOS37gIhLz/x1twAtAH6q0=
+NodeupConfigHash: 5ObVUCjFv/wO/Ag2SgZA2VWEGqYj4Sz1vp0stq4d71Y=
 
 __EOF_KUBE_ENV
 
diff --git a/tests/integration/update_cluster/karpenter/data/aws_launch_template_karpenter-nodes-single-machinetype.minimal.example.com_user_data b/tests/integration/update_cluster/karpenter/data/aws_launch_template_karpenter-nodes-single-machinetype.minimal.example.com_user_data
index 6a69e3da2a..471561216a 100644
--- a/tests/integration/update_cluster/karpenter/data/aws_launch_template_karpenter-nodes-single-machinetype.minimal.example.com_user_data
+++ b/tests/integration/update_cluster/karpenter/data/aws_launch_template_karpenter-nodes-single-machinetype.minimal.example.com_user_data
@@ -151,7 +151,7 @@ ConfigServer:
   - https://kops-controller.internal.minimal.example.com:3988/
 InstanceGroupName: karpenter-nodes-single-machinetype
 InstanceGroupRole: Node
-NodeupConfigHash: Qfx0TQrsdlm5YN1NV3fSopTZppGqdt5b2EO87FVWOBo=
+NodeupConfigHash: xi6FgilLpGt9p/MB4XYD4fk6fzhhGwNqNVy0AMqphCc=
 
 __EOF_KUBE_ENV
 
diff --git a/tests/integration/update_cluster/karpenter/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data b/tests/integration/update_cluster/karpenter/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data
index 9f76984ffd..18965f1cf4 100644
--- a/tests/integration/update_cluster/karpenter/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data
+++ b/tests/integration/update_cluster/karpenter/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data
@@ -128,7 +128,7 @@ ClusterName: minimal.example.com
 ConfigBase: memfs://clusters.example.com/minimal.example.com
 InstanceGroupName: master-us-test-1a
 InstanceGroupRole: ControlPlane
-NodeupConfigHash: n//C7AdZBSeKp6jmgZzjJxWL8L1jYdCnYEYYbrFJ2+Q=
+NodeupConfigHash: fumhzgN+bCUJmJoxLKLF7l7eF/wfDeZzh52IgsU3HT8=
 
 __EOF_KUBE_ENV
 
diff --git a/tests/integration/update_cluster/karpenter/data/aws_launch_template_nodes.minimal.example.com_user_data b/tests/integration/update_cluster/karpenter/data/aws_launch_template_nodes.minimal.example.com_user_data
index 43094fffb9..688751911d 100644
--- a/tests/integration/update_cluster/karpenter/data/aws_launch_template_nodes.minimal.example.com_user_data
+++ b/tests/integration/update_cluster/karpenter/data/aws_launch_template_nodes.minimal.example.com_user_data
@@ -151,7 +151,7 @@ ConfigServer:
   - https://kops-controller.internal.minimal.example.com:3988/
 InstanceGroupName: nodes
 InstanceGroupRole: Node
-NodeupConfigHash: yTJhnBtvK9kWl4swGbFF+gcO+PyJOKwSFq09pqQaQKk=
+NodeupConfigHash: yXbe34fnvso/Bj/RFb3NspzAhAQCvvQt4oH4qi4duuY=
 
 __EOF_KUBE_ENV
 
diff --git a/tests/integration/update_cluster/karpenter/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/karpenter/data/aws_s3_object_cluster-completed.spec_content
index c2344ce075..086eab51ed 100644
--- a/tests/integration/update_cluster/karpenter/data/aws_s3_object_cluster-completed.spec_content
+++ b/tests/integration/update_cluster/karpenter/data/aws_s3_object_cluster-completed.spec_content
@@ -24,15 +24,12 @@ spec:
   cloudProvider: aws
   clusterDNSDomain: cluster.local
   configBase: memfs://clusters.example.com/minimal.example.com
-  containerRuntime: containerd
   containerd:
     logLevel: info
     runc:
       version: 1.1.5
     version: 1.6.20
   dnsZone: Z1AFAKE1ZON3YO
-  docker:
-    skipInstall: true
   etcdClusters:
   - backups:
       backupStore: memfs://clusters.example.com/minimal.example.com/backups/etcd/main
diff --git a/tests/integration/update_cluster/karpenter/data/aws_s3_object_nodeupconfig-karpenter-nodes-default_content b/tests/integration/update_cluster/karpenter/data/aws_s3_object_nodeupconfig-karpenter-nodes-default_content
index 1a1a170938..9917a82441 100644
--- a/tests/integration/update_cluster/karpenter/data/aws_s3_object_nodeupconfig-karpenter-nodes-default_content
+++ b/tests/integration/update_cluster/karpenter/data/aws_s3_object_nodeupconfig-karpenter-nodes-default_content
@@ -13,7 +13,6 @@ Assets:
   - 54e79e4d48b9e191767e4abc08be1a8476a1c757e9a9f8c45c6ded001226867f@https://github.com/opencontainers/runc/releases/download/v1.1.5/runc.arm64
 CAs: {}
 ClusterName: minimal.example.com
-ContainerRuntime: containerd
 Hooks:
 - null
 - null
@@ -64,7 +63,5 @@ containerdConfig:
   runc:
     version: 1.1.5
   version: 1.6.20
-docker:
-  skipInstall: true
 usesLegacyGossip: false
 usesNoneDNS: false
diff --git a/tests/integration/update_cluster/karpenter/data/aws_s3_object_nodeupconfig-karpenter-nodes-single-machinetype_content b/tests/integration/update_cluster/karpenter/data/aws_s3_object_nodeupconfig-karpenter-nodes-single-machinetype_content
index 2e3d32f286..2f96b16d9c 100644
--- a/tests/integration/update_cluster/karpenter/data/aws_s3_object_nodeupconfig-karpenter-nodes-single-machinetype_content
+++ b/tests/integration/update_cluster/karpenter/data/aws_s3_object_nodeupconfig-karpenter-nodes-single-machinetype_content
@@ -13,7 +13,6 @@ Assets:
   - 54e79e4d48b9e191767e4abc08be1a8476a1c757e9a9f8c45c6ded001226867f@https://github.com/opencontainers/runc/releases/download/v1.1.5/runc.arm64
 CAs: {}
 ClusterName: minimal.example.com
-ContainerRuntime: containerd
 Hooks:
 - null
 - null
@@ -57,7 +56,5 @@ containerdConfig:
   runc:
     version: 1.1.5
   version: 1.6.20
-docker:
-  skipInstall: true
 usesLegacyGossip: false
 usesNoneDNS: false
diff --git a/tests/integration/update_cluster/karpenter/data/aws_s3_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/karpenter/data/aws_s3_object_nodeupconfig-master-us-test-1a_content
index 5a96d8a9bc..bd87da76bf 100644
--- a/tests/integration/update_cluster/karpenter/data/aws_s3_object_nodeupconfig-master-us-test-1a_content
+++ b/tests/integration/update_cluster/karpenter/data/aws_s3_object_nodeupconfig-master-us-test-1a_content
@@ -227,7 +227,6 @@ CAs:
     9B7UD2ushcVFPtaeoL9Gfu8aY4KJBeqqg5ojl4qmRnThjw==
     -----END CERTIFICATE-----
 ClusterName: minimal.example.com
-ContainerRuntime: containerd
 ControlPlaneConfig:
   KubeControllerManager:
     allocateNodeCIDRs: true
@@ -321,8 +320,6 @@ containerdConfig:
   runc:
     version: 1.1.5
   version: 1.6.20
-docker:
-  skipInstall: true
 etcdManifests:
 - memfs://clusters.example.com/minimal.example.com/manifests/etcd/main-master-us-test-1a.yaml
 - memfs://clusters.example.com/minimal.example.com/manifests/etcd/events-master-us-test-1a.yaml
diff --git a/tests/integration/update_cluster/karpenter/data/aws_s3_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/karpenter/data/aws_s3_object_nodeupconfig-nodes_content
index 8b4d4da91f..4331a4a95a 100644
--- a/tests/integration/update_cluster/karpenter/data/aws_s3_object_nodeupconfig-nodes_content
+++ b/tests/integration/update_cluster/karpenter/data/aws_s3_object_nodeupconfig-nodes_content
@@ -13,7 +13,6 @@ Assets:
   - 54e79e4d48b9e191767e4abc08be1a8476a1c757e9a9f8c45c6ded001226867f@https://github.com/opencontainers/runc/releases/download/v1.1.5/runc.arm64
 CAs: {}
 ClusterName: minimal.example.com
-ContainerRuntime: containerd
 Hooks:
 - null
 - null
@@ -56,7 +55,5 @@ containerdConfig:
   runc:
     version: 1.1.5
   version: 1.6.20
-docker:
-  skipInstall: true
 usesLegacyGossip: false
 usesNoneDNS: false
diff --git a/tests/integration/update_cluster/many-addons-ccm-irsa/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data b/tests/integration/update_cluster/many-addons-ccm-irsa/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data
index 45260d95a8..5003662c4f 100644
--- a/tests/integration/update_cluster/many-addons-ccm-irsa/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data
+++ b/tests/integration/update_cluster/many-addons-ccm-irsa/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data
@@ -128,7 +128,7 @@ ClusterName: minimal.example.com
 ConfigBase: memfs://clusters.example.com/minimal.example.com
 InstanceGroupName: master-us-test-1a
 InstanceGroupRole: ControlPlane
-NodeupConfigHash: pXKKXRT5BN1xSlq52fAGGCVWdBQ3EIx0Qfyt3J7HqEY=
+NodeupConfigHash: HoYaCQsIAxO2jY2OlKD1uVCYmBEL4oGzwHTTIzDYULo=
 
 __EOF_KUBE_ENV
 
diff --git a/tests/integration/update_cluster/many-addons-ccm-irsa/data/aws_launch_template_nodes.minimal.example.com_user_data b/tests/integration/update_cluster/many-addons-ccm-irsa/data/aws_launch_template_nodes.minimal.example.com_user_data
index 1a4853a2e0..134a6f8f4c 100644
--- a/tests/integration/update_cluster/many-addons-ccm-irsa/data/aws_launch_template_nodes.minimal.example.com_user_data
+++ b/tests/integration/update_cluster/many-addons-ccm-irsa/data/aws_launch_template_nodes.minimal.example.com_user_data
@@ -151,7 +151,7 @@ ConfigServer:
   - https://kops-controller.internal.minimal.example.com:3988/
 InstanceGroupName: nodes
 InstanceGroupRole: Node
-NodeupConfigHash: s2aLnK2SpwjkSehcKOpbZ/Zmxpw9IucoZBUwvnLyitw=
+NodeupConfigHash: P1X6Xy+8U6wxivg3gwhwDhfAwULBvUYFrcUE20bA/wE=
 
 __EOF_KUBE_ENV
 
diff --git a/tests/integration/update_cluster/many-addons-ccm-irsa/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/many-addons-ccm-irsa/data/aws_s3_object_cluster-completed.spec_content
index f2535ca08b..b207975790 100644
--- a/tests/integration/update_cluster/many-addons-ccm-irsa/data/aws_s3_object_cluster-completed.spec_content
+++ b/tests/integration/update_cluster/many-addons-ccm-irsa/data/aws_s3_object_cluster-completed.spec_content
@@ -44,15 +44,12 @@ spec:
     skipNodesWithSystemPods: true
   clusterDNSDomain: cluster.local
   configBase: memfs://clusters.example.com/minimal.example.com
-  containerRuntime: containerd
   containerd:
     logLevel: info
     runc:
       version: 1.1.5
     version: 1.6.20
   dnsZone: Z1AFAKE1ZON3YO
-  docker:
-    skipInstall: true
   etcdClusters:
   - backups:
       backupStore: memfs://clusters.example.com/minimal.example.com/backups/etcd/main
diff --git a/tests/integration/update_cluster/many-addons-ccm-irsa/data/aws_s3_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/many-addons-ccm-irsa/data/aws_s3_object_nodeupconfig-master-us-test-1a_content
index f5a9f05709..d9e4b6a21f 100644
--- a/tests/integration/update_cluster/many-addons-ccm-irsa/data/aws_s3_object_nodeupconfig-master-us-test-1a_content
+++ b/tests/integration/update_cluster/many-addons-ccm-irsa/data/aws_s3_object_nodeupconfig-master-us-test-1a_content
@@ -228,7 +228,6 @@ CAs:
     9B7UD2ushcVFPtaeoL9Gfu8aY4KJBeqqg5ojl4qmRnThjw==
     -----END CERTIFICATE-----
 ClusterName: minimal.example.com
-ContainerRuntime: containerd
 ControlPlaneConfig:
   KubeControllerManager:
     allocateNodeCIDRs: true
@@ -323,8 +322,6 @@ containerdConfig:
   runc:
     version: 1.1.5
   version: 1.6.20
-docker:
-  skipInstall: true
 etcdManifests:
 - memfs://clusters.example.com/minimal.example.com/manifests/etcd/main-master-us-test-1a.yaml
 - memfs://clusters.example.com/minimal.example.com/manifests/etcd/events-master-us-test-1a.yaml
diff --git a/tests/integration/update_cluster/many-addons-ccm-irsa/data/aws_s3_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/many-addons-ccm-irsa/data/aws_s3_object_nodeupconfig-nodes_content
index ff036e1366..2c3e750556 100644
--- a/tests/integration/update_cluster/many-addons-ccm-irsa/data/aws_s3_object_nodeupconfig-nodes_content
+++ b/tests/integration/update_cluster/many-addons-ccm-irsa/data/aws_s3_object_nodeupconfig-nodes_content
@@ -13,7 +13,6 @@ Assets:
   - 54e79e4d48b9e191767e4abc08be1a8476a1c757e9a9f8c45c6ded001226867f@https://github.com/opencontainers/runc/releases/download/v1.1.5/runc.arm64
 CAs: {}
 ClusterName: minimal.example.com
-ContainerRuntime: containerd
 DefaultMachineType: t2.medium
 Hooks:
 - null
@@ -57,7 +56,5 @@ containerdConfig:
   runc:
     version: 1.1.5
   version: 1.6.20
-docker:
-  skipInstall: true
 usesLegacyGossip: false
 usesNoneDNS: false
diff --git a/tests/integration/update_cluster/many-addons-ccm-irsa24/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data b/tests/integration/update_cluster/many-addons-ccm-irsa24/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data
index 469441bb71..7708f58487 100644
--- a/tests/integration/update_cluster/many-addons-ccm-irsa24/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data
+++ b/tests/integration/update_cluster/many-addons-ccm-irsa24/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data
@@ -128,7 +128,7 @@ ClusterName: minimal.example.com
 ConfigBase: memfs://clusters.example.com/minimal.example.com
 InstanceGroupName: master-us-test-1a
 InstanceGroupRole: ControlPlane
-NodeupConfigHash: t+US5FH+ye9xJF+ArrEd31QUz8jEtVVId4LT1BWwmeE=
+NodeupConfigHash: S+4IAGZjxagXxZXGYz06lcIf9DBFb/MQrvnRgmtpUHc=
 
 __EOF_KUBE_ENV
 
diff --git a/tests/integration/update_cluster/many-addons-ccm-irsa24/data/aws_launch_template_nodes.minimal.example.com_user_data b/tests/integration/update_cluster/many-addons-ccm-irsa24/data/aws_launch_template_nodes.minimal.example.com_user_data
index cfc7d2949f..36ddf60b6f 100644
--- a/tests/integration/update_cluster/many-addons-ccm-irsa24/data/aws_launch_template_nodes.minimal.example.com_user_data
+++ b/tests/integration/update_cluster/many-addons-ccm-irsa24/data/aws_launch_template_nodes.minimal.example.com_user_data
@@ -151,7 +151,7 @@ ConfigServer:
   - https://kops-controller.internal.minimal.example.com:3988/
 InstanceGroupName: nodes
 InstanceGroupRole: Node
-NodeupConfigHash: 5O2WFmTkaNNjJB86rJSS863KiRYjWtYEUOoOB5gDCTY=
+NodeupConfigHash: I7EQmQ4CUYgB+dfGP2LHRy2xeZrryQyy3Vqxe0ZY4Dg=
 
 __EOF_KUBE_ENV
 
diff --git a/tests/integration/update_cluster/many-addons-ccm-irsa24/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/many-addons-ccm-irsa24/data/aws_s3_object_cluster-completed.spec_content
index 9a9097201b..87e7a324d8 100644
--- a/tests/integration/update_cluster/many-addons-ccm-irsa24/data/aws_s3_object_cluster-completed.spec_content
+++ b/tests/integration/update_cluster/many-addons-ccm-irsa24/data/aws_s3_object_cluster-completed.spec_content
@@ -45,15 +45,12 @@ spec:
     skipNodesWithSystemPods: true
   clusterDNSDomain: cluster.local
   configBase: memfs://clusters.example.com/minimal.example.com
-  containerRuntime: containerd
   containerd:
     logLevel: info
     runc:
       version: 1.1.5
     version: 1.6.20
   dnsZone: Z1AFAKE1ZON3YO
-  docker:
-    skipInstall: true
   etcdClusters:
   - backups:
       backupStore: memfs://clusters.example.com/minimal.example.com/backups/etcd/main
diff --git a/tests/integration/update_cluster/many-addons-ccm-irsa24/data/aws_s3_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/many-addons-ccm-irsa24/data/aws_s3_object_nodeupconfig-master-us-test-1a_content
index c59460dd99..1403e8a88e 100644
--- a/tests/integration/update_cluster/many-addons-ccm-irsa24/data/aws_s3_object_nodeupconfig-master-us-test-1a_content
+++ b/tests/integration/update_cluster/many-addons-ccm-irsa24/data/aws_s3_object_nodeupconfig-master-us-test-1a_content
@@ -228,7 +228,6 @@ CAs:
     9B7UD2ushcVFPtaeoL9Gfu8aY4KJBeqqg5ojl4qmRnThjw==
     -----END CERTIFICATE-----
 ClusterName: minimal.example.com
-ContainerRuntime: containerd
 ControlPlaneConfig:
   KubeControllerManager:
     allocateNodeCIDRs: true
@@ -323,8 +322,6 @@ containerdConfig:
   runc:
     version: 1.1.5
   version: 1.6.20
-docker:
-  skipInstall: true
 etcdManifests:
 - memfs://clusters.example.com/minimal.example.com/manifests/etcd/main-master-us-test-1a.yaml
 - memfs://clusters.example.com/minimal.example.com/manifests/etcd/events-master-us-test-1a.yaml
diff --git a/tests/integration/update_cluster/many-addons-ccm-irsa24/data/aws_s3_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/many-addons-ccm-irsa24/data/aws_s3_object_nodeupconfig-nodes_content
index 069cac0305..eb05a0a24d 100644
--- a/tests/integration/update_cluster/many-addons-ccm-irsa24/data/aws_s3_object_nodeupconfig-nodes_content
+++ b/tests/integration/update_cluster/many-addons-ccm-irsa24/data/aws_s3_object_nodeupconfig-nodes_content
@@ -13,7 +13,6 @@ Assets:
   - 54e79e4d48b9e191767e4abc08be1a8476a1c757e9a9f8c45c6ded001226867f@https://github.com/opencontainers/runc/releases/download/v1.1.5/runc.arm64
 CAs: {}
 ClusterName: minimal.example.com
-ContainerRuntime: containerd
 DefaultMachineType: t2.medium
 Hooks:
 - null
@@ -57,7 +56,5 @@ containerdConfig:
   runc:
     version: 1.1.5
   version: 1.6.20
-docker:
-  skipInstall: true
 usesLegacyGossip: false
 usesNoneDNS: false
diff --git a/tests/integration/update_cluster/many-addons-ccm-irsa25/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data b/tests/integration/update_cluster/many-addons-ccm-irsa25/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data
index 4d344d03ff..86f9113c6f 100644
--- a/tests/integration/update_cluster/many-addons-ccm-irsa25/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data
+++ b/tests/integration/update_cluster/many-addons-ccm-irsa25/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data
@@ -128,7 +128,7 @@ ClusterName: minimal.example.com
 ConfigBase: memfs://clusters.example.com/minimal.example.com
 InstanceGroupName: master-us-test-1a
 InstanceGroupRole: ControlPlane
-NodeupConfigHash: nsE2Bhq827ANpQboYjI0xnAV6NSbieaKJSk7eamlj1I=
+NodeupConfigHash: ip9nUSj3w9IjV2wjnAwdr/vFuouaVV1asNl5Cqto4W0=
 
 __EOF_KUBE_ENV
 
diff --git a/tests/integration/update_cluster/many-addons-ccm-irsa25/data/aws_launch_template_nodes.minimal.example.com_user_data b/tests/integration/update_cluster/many-addons-ccm-irsa25/data/aws_launch_template_nodes.minimal.example.com_user_data
index 4ee60ca7ac..961ee07a4a 100644
--- a/tests/integration/update_cluster/many-addons-ccm-irsa25/data/aws_launch_template_nodes.minimal.example.com_user_data
+++ b/tests/integration/update_cluster/many-addons-ccm-irsa25/data/aws_launch_template_nodes.minimal.example.com_user_data
@@ -151,7 +151,7 @@ ConfigServer:
   - https://kops-controller.internal.minimal.example.com:3988/
 InstanceGroupName: nodes
 InstanceGroupRole: Node
-NodeupConfigHash: LE5Klrzc4noP+NAk8F+PgZxXSywdfGOvlBIEIEArpqs=
+NodeupConfigHash: 6lzcInCDwE0ni+WGNW2FaxiZ66ORbIk82Pf8rfJxDnA=
 
 __EOF_KUBE_ENV
 
diff --git a/tests/integration/update_cluster/many-addons-ccm-irsa25/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/many-addons-ccm-irsa25/data/aws_s3_object_cluster-completed.spec_content
index 35ef30a3e2..7498da92ab 100644
--- a/tests/integration/update_cluster/many-addons-ccm-irsa25/data/aws_s3_object_cluster-completed.spec_content
+++ b/tests/integration/update_cluster/many-addons-ccm-irsa25/data/aws_s3_object_cluster-completed.spec_content
@@ -44,15 +44,12 @@ spec:
     skipNodesWithSystemPods: true
   clusterDNSDomain: cluster.local
   configBase: memfs://clusters.example.com/minimal.example.com
-  containerRuntime: containerd
   containerd:
     logLevel: info
     runc:
       version: 1.1.5
     version: 1.6.20
   dnsZone: Z1AFAKE1ZON3YO
-  docker:
-    skipInstall: true
   etcdClusters:
   - backups:
       backupStore: memfs://clusters.example.com/minimal.example.com/backups/etcd/main
diff --git a/tests/integration/update_cluster/many-addons-ccm-irsa25/data/aws_s3_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/many-addons-ccm-irsa25/data/aws_s3_object_nodeupconfig-master-us-test-1a_content
index 6a90056af8..5e3977d9e9 100644
--- a/tests/integration/update_cluster/many-addons-ccm-irsa25/data/aws_s3_object_nodeupconfig-master-us-test-1a_content
+++ b/tests/integration/update_cluster/many-addons-ccm-irsa25/data/aws_s3_object_nodeupconfig-master-us-test-1a_content
@@ -228,7 +228,6 @@ CAs:
     9B7UD2ushcVFPtaeoL9Gfu8aY4KJBeqqg5ojl4qmRnThjw==
     -----END CERTIFICATE-----
 ClusterName: minimal.example.com
-ContainerRuntime: containerd
 ControlPlaneConfig:
   KubeControllerManager:
     allocateNodeCIDRs: true
@@ -323,8 +322,6 @@ containerdConfig:
   runc:
     version: 1.1.5
   version: 1.6.20
-docker:
-  skipInstall: true
 etcdManifests:
 - memfs://clusters.example.com/minimal.example.com/manifests/etcd/main-master-us-test-1a.yaml
 - memfs://clusters.example.com/minimal.example.com/manifests/etcd/events-master-us-test-1a.yaml
diff --git a/tests/integration/update_cluster/many-addons-ccm-irsa25/data/aws_s3_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/many-addons-ccm-irsa25/data/aws_s3_object_nodeupconfig-nodes_content
index 595091f26e..6cb4adb43e 100644
--- a/tests/integration/update_cluster/many-addons-ccm-irsa25/data/aws_s3_object_nodeupconfig-nodes_content
+++ b/tests/integration/update_cluster/many-addons-ccm-irsa25/data/aws_s3_object_nodeupconfig-nodes_content
@@ -13,7 +13,6 @@ Assets:
   - 54e79e4d48b9e191767e4abc08be1a8476a1c757e9a9f8c45c6ded001226867f@https://github.com/opencontainers/runc/releases/download/v1.1.5/runc.arm64
 CAs: {}
 ClusterName: minimal.example.com
-ContainerRuntime: containerd
 DefaultMachineType: t2.medium
 Hooks:
 - null
@@ -57,7 +56,5 @@ containerdConfig:
   runc:
     version: 1.1.5
   version: 1.6.20
-docker:
-  skipInstall: true
 usesLegacyGossip: false
 usesNoneDNS: false
diff --git a/tests/integration/update_cluster/many-addons-ccm-irsa26/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data b/tests/integration/update_cluster/many-addons-ccm-irsa26/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data
index 7b042e6fc8..4ffb24611e 100644
--- a/tests/integration/update_cluster/many-addons-ccm-irsa26/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data
+++ b/tests/integration/update_cluster/many-addons-ccm-irsa26/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data
@@ -128,7 +128,7 @@ ClusterName: minimal.example.com
 ConfigBase: memfs://clusters.example.com/minimal.example.com
 InstanceGroupName: master-us-test-1a
 InstanceGroupRole: ControlPlane
-NodeupConfigHash: GctYnj+sbI8EMeBBvEayqpCjUPj+zJat1QcmldgTJTg=
+NodeupConfigHash: tpa5V4bqAoH+72Pe/m5SHJxQNft8al0ZS+IMjr1DAwU=
 
 __EOF_KUBE_ENV
 
diff --git a/tests/integration/update_cluster/many-addons-ccm-irsa26/data/aws_launch_template_nodes.minimal.example.com_user_data b/tests/integration/update_cluster/many-addons-ccm-irsa26/data/aws_launch_template_nodes.minimal.example.com_user_data
index 5d54d2c804..002e027370 100644
--- a/tests/integration/update_cluster/many-addons-ccm-irsa26/data/aws_launch_template_nodes.minimal.example.com_user_data
+++ b/tests/integration/update_cluster/many-addons-ccm-irsa26/data/aws_launch_template_nodes.minimal.example.com_user_data
@@ -151,7 +151,7 @@ ConfigServer:
   - https://kops-controller.internal.minimal.example.com:3988/
 InstanceGroupName: nodes
 InstanceGroupRole: Node
-NodeupConfigHash: 19yVq35GFZsE7NuOO8+4qAtCloX1VZEn+brsw3y0fTM=
+NodeupConfigHash: bdlO7z7FoznE0Rha/1kFMwibcBfeP4GaJdsLbhDFMUk=
 
 __EOF_KUBE_ENV
 
diff --git a/tests/integration/update_cluster/many-addons-ccm-irsa26/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/many-addons-ccm-irsa26/data/aws_s3_object_cluster-completed.spec_content
index bfbfee8c2f..4a26511cc1 100644
--- a/tests/integration/update_cluster/many-addons-ccm-irsa26/data/aws_s3_object_cluster-completed.spec_content
+++ b/tests/integration/update_cluster/many-addons-ccm-irsa26/data/aws_s3_object_cluster-completed.spec_content
@@ -44,15 +44,12 @@ spec:
     skipNodesWithSystemPods: true
   clusterDNSDomain: cluster.local
   configBase: memfs://clusters.example.com/minimal.example.com
-  containerRuntime: containerd
   containerd:
     logLevel: info
     runc:
       version: 1.1.5
     version: 1.6.20
   dnsZone: Z1AFAKE1ZON3YO
-  docker:
-    skipInstall: true
   etcdClusters:
   - backups:
       backupStore: memfs://clusters.example.com/minimal.example.com/backups/etcd/main
diff --git a/tests/integration/update_cluster/many-addons-ccm-irsa26/data/aws_s3_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/many-addons-ccm-irsa26/data/aws_s3_object_nodeupconfig-master-us-test-1a_content
index 95e3424eea..d97a1f7e59 100644
--- a/tests/integration/update_cluster/many-addons-ccm-irsa26/data/aws_s3_object_nodeupconfig-master-us-test-1a_content
+++ b/tests/integration/update_cluster/many-addons-ccm-irsa26/data/aws_s3_object_nodeupconfig-master-us-test-1a_content
@@ -228,7 +228,6 @@ CAs:
     9B7UD2ushcVFPtaeoL9Gfu8aY4KJBeqqg5ojl4qmRnThjw==
     -----END CERTIFICATE-----
 ClusterName: minimal.example.com
-ContainerRuntime: containerd
 ControlPlaneConfig:
   KubeControllerManager:
     allocateNodeCIDRs: true
@@ -323,8 +322,6 @@ containerdConfig:
   runc:
     version: 1.1.5
   version: 1.6.20
-docker:
-  skipInstall: true
 etcdManifests:
 - memfs://clusters.example.com/minimal.example.com/manifests/etcd/main-master-us-test-1a.yaml
 - memfs://clusters.example.com/minimal.example.com/manifests/etcd/events-master-us-test-1a.yaml
diff --git a/tests/integration/update_cluster/many-addons-ccm-irsa26/data/aws_s3_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/many-addons-ccm-irsa26/data/aws_s3_object_nodeupconfig-nodes_content
index 27611f2011..9fc3f43b2e 100644
--- a/tests/integration/update_cluster/many-addons-ccm-irsa26/data/aws_s3_object_nodeupconfig-nodes_content
+++ b/tests/integration/update_cluster/many-addons-ccm-irsa26/data/aws_s3_object_nodeupconfig-nodes_content
@@ -13,7 +13,6 @@ Assets:
   - 54e79e4d48b9e191767e4abc08be1a8476a1c757e9a9f8c45c6ded001226867f@https://github.com/opencontainers/runc/releases/download/v1.1.5/runc.arm64
 CAs: {}
 ClusterName: minimal.example.com
-ContainerRuntime: containerd
 DefaultMachineType: t2.medium
 Hooks:
 - null
@@ -57,7 +56,5 @@ containerdConfig:
   runc:
     version: 1.1.5
   version: 1.6.20
-docker:
-  skipInstall: true
 usesLegacyGossip: false
 usesNoneDNS: false
diff --git a/tests/integration/update_cluster/many-addons-ccm/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data b/tests/integration/update_cluster/many-addons-ccm/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data
index 3e80f50d85..8e12eccdf1 100644
--- a/tests/integration/update_cluster/many-addons-ccm/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data
+++ b/tests/integration/update_cluster/many-addons-ccm/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data
@@ -128,7 +128,7 @@ ClusterName: minimal.example.com
 ConfigBase: memfs://clusters.example.com/minimal.example.com
 InstanceGroupName: master-us-test-1a
 InstanceGroupRole: ControlPlane
-NodeupConfigHash: yVlRhLhdHyUMNEn8GE3h8GWZyzPWJo9T1PxEDm8HxvM=
+NodeupConfigHash: o5t5SOPaDzxKQLNBemzI/+0uZbL29aTtQMxgjc6bngM=
 
 __EOF_KUBE_ENV
 
diff --git a/tests/integration/update_cluster/many-addons-ccm/data/aws_launch_template_nodes.minimal.example.com_user_data b/tests/integration/update_cluster/many-addons-ccm/data/aws_launch_template_nodes.minimal.example.com_user_data
index 1a4853a2e0..134a6f8f4c 100644
--- a/tests/integration/update_cluster/many-addons-ccm/data/aws_launch_template_nodes.minimal.example.com_user_data
+++ b/tests/integration/update_cluster/many-addons-ccm/data/aws_launch_template_nodes.minimal.example.com_user_data
@@ -151,7 +151,7 @@ ConfigServer:
   - https://kops-controller.internal.minimal.example.com:3988/
 InstanceGroupName: nodes
 InstanceGroupRole: Node
-NodeupConfigHash: s2aLnK2SpwjkSehcKOpbZ/Zmxpw9IucoZBUwvnLyitw=
+NodeupConfigHash: P1X6Xy+8U6wxivg3gwhwDhfAwULBvUYFrcUE20bA/wE=
 
 __EOF_KUBE_ENV
 
diff --git a/tests/integration/update_cluster/many-addons-ccm/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/many-addons-ccm/data/aws_s3_object_cluster-completed.spec_content
index b77a0c6f04..9e8e85e998 100644
--- a/tests/integration/update_cluster/many-addons-ccm/data/aws_s3_object_cluster-completed.spec_content
+++ b/tests/integration/update_cluster/many-addons-ccm/data/aws_s3_object_cluster-completed.spec_content
@@ -44,15 +44,12 @@ spec:
     skipNodesWithSystemPods: true
   clusterDNSDomain: cluster.local
   configBase: memfs://clusters.example.com/minimal.example.com
-  containerRuntime: containerd
   containerd:
     logLevel: info
     runc:
       version: 1.1.5
     version: 1.6.20
   dnsZone: Z1AFAKE1ZON3YO
-  docker:
-    skipInstall: true
   etcdClusters:
   - backups:
       backupStore: memfs://clusters.example.com/minimal.example.com/backups/etcd/main
diff --git a/tests/integration/update_cluster/many-addons-ccm/data/aws_s3_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/many-addons-ccm/data/aws_s3_object_nodeupconfig-master-us-test-1a_content
index 5e5f77b531..ecd15fe2f9 100644
--- a/tests/integration/update_cluster/many-addons-ccm/data/aws_s3_object_nodeupconfig-master-us-test-1a_content
+++ b/tests/integration/update_cluster/many-addons-ccm/data/aws_s3_object_nodeupconfig-master-us-test-1a_content
@@ -228,7 +228,6 @@ CAs:
     9B7UD2ushcVFPtaeoL9Gfu8aY4KJBeqqg5ojl4qmRnThjw==
     -----END CERTIFICATE-----
 ClusterName: minimal.example.com
-ContainerRuntime: containerd
 ControlPlaneConfig:
   KubeControllerManager:
     allocateNodeCIDRs: true
@@ -323,8 +322,6 @@ containerdConfig:
   runc:
     version: 1.1.5
   version: 1.6.20
-docker:
-  skipInstall: true
 etcdManifests:
 - memfs://clusters.example.com/minimal.example.com/manifests/etcd/main-master-us-test-1a.yaml
 - memfs://clusters.example.com/minimal.example.com/manifests/etcd/events-master-us-test-1a.yaml
diff --git a/tests/integration/update_cluster/many-addons-ccm/data/aws_s3_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/many-addons-ccm/data/aws_s3_object_nodeupconfig-nodes_content
index ff036e1366..2c3e750556 100644
--- a/tests/integration/update_cluster/many-addons-ccm/data/aws_s3_object_nodeupconfig-nodes_content
+++ b/tests/integration/update_cluster/many-addons-ccm/data/aws_s3_object_nodeupconfig-nodes_content
@@ -13,7 +13,6 @@ Assets:
   - 54e79e4d48b9e191767e4abc08be1a8476a1c757e9a9f8c45c6ded001226867f@https://github.com/opencontainers/runc/releases/download/v1.1.5/runc.arm64
 CAs: {}
 ClusterName: minimal.example.com
-ContainerRuntime: containerd
 DefaultMachineType: t2.medium
 Hooks:
 - null
@@ -57,7 +56,5 @@ containerdConfig:
   runc:
     version: 1.1.5
   version: 1.6.20
-docker:
-  skipInstall: true
 usesLegacyGossip: false
 usesNoneDNS: false
diff --git a/tests/integration/update_cluster/many-addons-gce/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/many-addons-gce/data/aws_s3_object_cluster-completed.spec_content
index 6de7a471e8..c801f9c94f 100644
--- a/tests/integration/update_cluster/many-addons-gce/data/aws_s3_object_cluster-completed.spec_content
+++ b/tests/integration/update_cluster/many-addons-gce/data/aws_s3_object_cluster-completed.spec_content
@@ -43,15 +43,12 @@ spec:
     skipNodesWithSystemPods: true
   clusterDNSDomain: cluster.local
   configBase: memfs://tests/minimal.example.com
-  containerRuntime: containerd
   containerd:
     logLevel: info
     runc:
       version: 1.1.5
     version: 1.6.20
   dnsZone: "1"
-  docker:
-    skipInstall: true
   etcdClusters:
   - backups:
       backupStore: memfs://tests/minimal.example.com/backups/etcd/main
diff --git a/tests/integration/update_cluster/many-addons-gce/data/aws_s3_object_nodeupconfig-master-us-test1-a_content b/tests/integration/update_cluster/many-addons-gce/data/aws_s3_object_nodeupconfig-master-us-test1-a_content
index d1fe0f9e72..c0f5bdef58 100644
--- a/tests/integration/update_cluster/many-addons-gce/data/aws_s3_object_nodeupconfig-master-us-test1-a_content
+++ b/tests/integration/update_cluster/many-addons-gce/data/aws_s3_object_nodeupconfig-master-us-test1-a_content
@@ -227,7 +227,6 @@ CAs:
     9B7UD2ushcVFPtaeoL9Gfu8aY4KJBeqqg5ojl4qmRnThjw==
     -----END CERTIFICATE-----
 ClusterName: minimal.example.com
-ContainerRuntime: containerd
 ControlPlaneConfig:
   KubeControllerManager:
     allocateNodeCIDRs: true
@@ -313,8 +312,6 @@ containerdConfig:
   runc:
     version: 1.1.5
   version: 1.6.20
-docker:
-  skipInstall: true
 etcdManifests:
 - memfs://tests/minimal.example.com/manifests/etcd/main-master-us-test1-a.yaml
 - memfs://tests/minimal.example.com/manifests/etcd/events-master-us-test1-a.yaml
diff --git a/tests/integration/update_cluster/many-addons-gce/data/aws_s3_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/many-addons-gce/data/aws_s3_object_nodeupconfig-nodes_content
index 532dddc811..59110c61c3 100644
--- a/tests/integration/update_cluster/many-addons-gce/data/aws_s3_object_nodeupconfig-nodes_content
+++ b/tests/integration/update_cluster/many-addons-gce/data/aws_s3_object_nodeupconfig-nodes_content
@@ -15,7 +15,6 @@ Assets:
   - 54e79e4d48b9e191767e4abc08be1a8476a1c757e9a9f8c45c6ded001226867f@https://github.com/opencontainers/runc/releases/download/v1.1.5/runc.arm64
 CAs: {}
 ClusterName: minimal.example.com
-ContainerRuntime: containerd
 Hooks:
 - null
 - null
@@ -56,8 +55,6 @@ containerdConfig:
   runc:
     version: 1.1.5
   version: 1.6.20
-docker:
-  skipInstall: true
 multizone: true
 nodeTags: minimal-example-com-k8s-io-role-node
 usesLegacyGossip: false
diff --git a/tests/integration/update_cluster/many-addons-gce/data/google_compute_instance_template_master-us-test1-a-minimal-example-com_metadata_user-data b/tests/integration/update_cluster/many-addons-gce/data/google_compute_instance_template_master-us-test1-a-minimal-example-com_metadata_user-data
index 016a7ae223..e3a0d1fc9a 100644
--- a/tests/integration/update_cluster/many-addons-gce/data/google_compute_instance_template_master-us-test1-a-minimal-example-com_metadata_user-data
+++ b/tests/integration/update_cluster/many-addons-gce/data/google_compute_instance_template_master-us-test1-a-minimal-example-com_metadata_user-data
@@ -127,7 +127,7 @@ ClusterName: minimal.example.com
 ConfigBase: memfs://tests/minimal.example.com
 InstanceGroupName: master-us-test1-a
 InstanceGroupRole: ControlPlane
-NodeupConfigHash: GZuqysBPcBvXn4fOqDF+Bypdu+XvWY6u7jDCqJzjhlU=
+NodeupConfigHash: Ff2R71Cc6mZl6oWQvBHx3+4PbJ95awFaOpJlDP0MA8U=
 
 __EOF_KUBE_ENV
 
diff --git a/tests/integration/update_cluster/many-addons-gce/data/google_compute_instance_template_nodes-minimal-example-com_metadata_user-data b/tests/integration/update_cluster/many-addons-gce/data/google_compute_instance_template_nodes-minimal-example-com_metadata_user-data
index 88408994ee..8243432a8c 100644
--- a/tests/integration/update_cluster/many-addons-gce/data/google_compute_instance_template_nodes-minimal-example-com_metadata_user-data
+++ b/tests/integration/update_cluster/many-addons-gce/data/google_compute_instance_template_nodes-minimal-example-com_metadata_user-data
@@ -150,7 +150,7 @@ ConfigServer:
   - https://kops-controller.internal.minimal.example.com:3988/
 InstanceGroupName: nodes
 InstanceGroupRole: Node
-NodeupConfigHash: bYz9GZrW7E6K39ulZ+dSojy/tgJSSXkzjy1bEzJ6pRo=
+NodeupConfigHash: 4NPF72uFuWNY4+Jumyi71hHNCj8lETLpLnU4iS8sXX4=
 
 __EOF_KUBE_ENV
 
diff --git a/tests/integration/update_cluster/many-addons/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data b/tests/integration/update_cluster/many-addons/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data
index 3e80f50d85..8e12eccdf1 100644
--- a/tests/integration/update_cluster/many-addons/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data
+++ b/tests/integration/update_cluster/many-addons/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data
@@ -128,7 +128,7 @@ ClusterName: minimal.example.com
 ConfigBase: memfs://clusters.example.com/minimal.example.com
 InstanceGroupName: master-us-test-1a
 InstanceGroupRole: ControlPlane
-NodeupConfigHash: yVlRhLhdHyUMNEn8GE3h8GWZyzPWJo9T1PxEDm8HxvM=
+NodeupConfigHash: o5t5SOPaDzxKQLNBemzI/+0uZbL29aTtQMxgjc6bngM=
 
 __EOF_KUBE_ENV
 
diff --git a/tests/integration/update_cluster/many-addons/data/aws_launch_template_nodes.minimal.example.com_user_data b/tests/integration/update_cluster/many-addons/data/aws_launch_template_nodes.minimal.example.com_user_data
index 1a4853a2e0..134a6f8f4c 100644
--- a/tests/integration/update_cluster/many-addons/data/aws_launch_template_nodes.minimal.example.com_user_data
+++ b/tests/integration/update_cluster/many-addons/data/aws_launch_template_nodes.minimal.example.com_user_data
@@ -151,7 +151,7 @@ ConfigServer:
   - https://kops-controller.internal.minimal.example.com:3988/
 InstanceGroupName: nodes
 InstanceGroupRole: Node
-NodeupConfigHash: s2aLnK2SpwjkSehcKOpbZ/Zmxpw9IucoZBUwvnLyitw=
+NodeupConfigHash: P1X6Xy+8U6wxivg3gwhwDhfAwULBvUYFrcUE20bA/wE=
 
 __EOF_KUBE_ENV
 
diff --git a/tests/integration/update_cluster/many-addons/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/many-addons/data/aws_s3_object_cluster-completed.spec_content
index c14f2dd5f9..a2fa1ed2dc 100644
--- a/tests/integration/update_cluster/many-addons/data/aws_s3_object_cluster-completed.spec_content
+++ b/tests/integration/update_cluster/many-addons/data/aws_s3_object_cluster-completed.spec_content
@@ -45,15 +45,12 @@ spec:
     skipNodesWithSystemPods: true
   clusterDNSDomain: cluster.local
   configBase: memfs://clusters.example.com/minimal.example.com
-  containerRuntime: containerd
   containerd:
     logLevel: info
     runc:
       version: 1.1.5
     version: 1.6.20
   dnsZone: Z1AFAKE1ZON3YO
-  docker:
-    skipInstall: true
   etcdClusters:
   - backups:
       backupStore: memfs://clusters.example.com/minimal.example.com/backups/etcd/main
diff --git a/tests/integration/update_cluster/many-addons/data/aws_s3_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/many-addons/data/aws_s3_object_nodeupconfig-master-us-test-1a_content
index 5e5f77b531..ecd15fe2f9 100644
--- a/tests/integration/update_cluster/many-addons/data/aws_s3_object_nodeupconfig-master-us-test-1a_content
+++ b/tests/integration/update_cluster/many-addons/data/aws_s3_object_nodeupconfig-master-us-test-1a_content
@@ -228,7 +228,6 @@ CAs:
     9B7UD2ushcVFPtaeoL9Gfu8aY4KJBeqqg5ojl4qmRnThjw==
     -----END CERTIFICATE-----
 ClusterName: minimal.example.com
-ContainerRuntime: containerd
 ControlPlaneConfig:
   KubeControllerManager:
     allocateNodeCIDRs: true
@@ -323,8 +322,6 @@ containerdConfig:
   runc:
     version: 1.1.5
   version: 1.6.20
-docker:
-  skipInstall: true
 etcdManifests:
 - memfs://clusters.example.com/minimal.example.com/manifests/etcd/main-master-us-test-1a.yaml
 - memfs://clusters.example.com/minimal.example.com/manifests/etcd/events-master-us-test-1a.yaml
diff --git a/tests/integration/update_cluster/many-addons/data/aws_s3_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/many-addons/data/aws_s3_object_nodeupconfig-nodes_content
index ff036e1366..2c3e750556 100644
--- a/tests/integration/update_cluster/many-addons/data/aws_s3_object_nodeupconfig-nodes_content
+++ b/tests/integration/update_cluster/many-addons/data/aws_s3_object_nodeupconfig-nodes_content
@@ -13,7 +13,6 @@ Assets:
   - 54e79e4d48b9e191767e4abc08be1a8476a1c757e9a9f8c45c6ded001226867f@https://github.com/opencontainers/runc/releases/download/v1.1.5/runc.arm64
 CAs: {}
 ClusterName: minimal.example.com
-ContainerRuntime: containerd
 DefaultMachineType: t2.medium
 Hooks:
 - null
@@ -57,7 +56,5 @@ containerdConfig:
   runc:
     version: 1.1.5
   version: 1.6.20
-docker:
-  skipInstall: true
 usesLegacyGossip: false
 usesNoneDNS: false
diff --git a/tests/integration/update_cluster/minimal-1.24/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data b/tests/integration/update_cluster/minimal-1.24/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data
index 638d034f80..4b4a11e880 100644
--- a/tests/integration/update_cluster/minimal-1.24/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data
+++ b/tests/integration/update_cluster/minimal-1.24/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data
@@ -128,7 +128,7 @@ ClusterName: minimal.example.com
 ConfigBase: memfs://tests/minimal.example.com
 InstanceGroupName: master-us-test-1a
 InstanceGroupRole: ControlPlane
-NodeupConfigHash: uZXi5HdcyPUM82dsLy37SjCru27RSGNUct88QWGNwVw=
+NodeupConfigHash: wbhVgUAo9o4FuM2s/6cdW0Kfl1HEPJUNaq9EppkfNho=
 
 __EOF_KUBE_ENV
 
diff --git a/tests/integration/update_cluster/minimal-1.24/data/aws_launch_template_nodes.minimal.example.com_user_data b/tests/integration/update_cluster/minimal-1.24/data/aws_launch_template_nodes.minimal.example.com_user_data
index 3bd11b065c..7d92a2763b 100644
--- a/tests/integration/update_cluster/minimal-1.24/data/aws_launch_template_nodes.minimal.example.com_user_data
+++ b/tests/integration/update_cluster/minimal-1.24/data/aws_launch_template_nodes.minimal.example.com_user_data
@@ -151,7 +151,7 @@ ConfigServer:
   - https://kops-controller.internal.minimal.example.com:3988/
 InstanceGroupName: nodes
 InstanceGroupRole: Node
-NodeupConfigHash: VVz6E7d0I9IN6p3yySI2e9YurPL2rKP29GUmadod2M8=
+NodeupConfigHash: SEaAT2GJpcRCbHMBx3R/6UjGhy34Tvg1RcRWcYJZBpM=
 
 __EOF_KUBE_ENV
 
diff --git a/tests/integration/update_cluster/minimal-1.24/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/minimal-1.24/data/aws_s3_object_cluster-completed.spec_content
index 8ab9e75b2b..41fb753000 100644
--- a/tests/integration/update_cluster/minimal-1.24/data/aws_s3_object_cluster-completed.spec_content
+++ b/tests/integration/update_cluster/minimal-1.24/data/aws_s3_object_cluster-completed.spec_content
@@ -25,15 +25,12 @@ spec:
   cloudProvider: aws
   clusterDNSDomain: cluster.local
   configBase: memfs://tests/minimal.example.com
-  containerRuntime: containerd
   containerd:
     logLevel: info
     runc:
       version: 1.1.5
     version: 1.6.20
   dnsZone: Z1AFAKE1ZON3YO
-  docker:
-    skipInstall: true
   etcdClusters:
   - backups:
       backupStore: memfs://tests/minimal.example.com/backups/etcd/main
diff --git a/tests/integration/update_cluster/minimal-1.24/data/aws_s3_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/minimal-1.24/data/aws_s3_object_nodeupconfig-master-us-test-1a_content
index 83033cf2b4..e9debe2995 100644
--- a/tests/integration/update_cluster/minimal-1.24/data/aws_s3_object_nodeupconfig-master-us-test-1a_content
+++ b/tests/integration/update_cluster/minimal-1.24/data/aws_s3_object_nodeupconfig-master-us-test-1a_content
@@ -227,7 +227,6 @@ CAs:
     9B7UD2ushcVFPtaeoL9Gfu8aY4KJBeqqg5ojl4qmRnThjw==
     -----END CERTIFICATE-----
 ClusterName: minimal.example.com
-ContainerRuntime: containerd
 ControlPlaneConfig:
   KubeControllerManager:
     allocateNodeCIDRs: true
@@ -322,8 +321,6 @@ containerdConfig:
   runc:
     version: 1.1.5
   version: 1.6.20
-docker:
-  skipInstall: true
 etcdManifests:
 - memfs://tests/minimal.example.com/manifests/etcd/main-master-us-test-1a.yaml
 - memfs://tests/minimal.example.com/manifests/etcd/events-master-us-test-1a.yaml
diff --git a/tests/integration/update_cluster/minimal-1.24/data/aws_s3_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/minimal-1.24/data/aws_s3_object_nodeupconfig-nodes_content
index 718d14925d..a3de151f04 100644
--- a/tests/integration/update_cluster/minimal-1.24/data/aws_s3_object_nodeupconfig-nodes_content
+++ b/tests/integration/update_cluster/minimal-1.24/data/aws_s3_object_nodeupconfig-nodes_content
@@ -13,7 +13,6 @@ Assets:
   - 54e79e4d48b9e191767e4abc08be1a8476a1c757e9a9f8c45c6ded001226867f@https://github.com/opencontainers/runc/releases/download/v1.1.5/runc.arm64
 CAs: {}
 ClusterName: minimal.example.com
-ContainerRuntime: containerd
 Hooks:
 - null
 - null
@@ -57,7 +56,5 @@ containerdConfig:
   runc:
     version: 1.1.5
   version: 1.6.20
-docker:
-  skipInstall: true
 usesLegacyGossip: false
 usesNoneDNS: false
diff --git a/tests/integration/update_cluster/minimal-1.25/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data b/tests/integration/update_cluster/minimal-1.25/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data
index 1062f5d072..9ff85f61ee 100644
--- a/tests/integration/update_cluster/minimal-1.25/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data
+++ b/tests/integration/update_cluster/minimal-1.25/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data
@@ -128,7 +128,7 @@ ClusterName: minimal.example.com
 ConfigBase: memfs://tests/minimal.example.com
 InstanceGroupName: master-us-test-1a
 InstanceGroupRole: ControlPlane
-NodeupConfigHash: huqlXbaUsN4lqXE/VaCypdEwRIhvDjHM1RF9PFHsZA8=
+NodeupConfigHash: 7J0rSy1JJg45M3XtiG9+OTXtAKAGkhZ8mHONtTX4LIA=
 
 __EOF_KUBE_ENV
 
diff --git a/tests/integration/update_cluster/minimal-1.25/data/aws_launch_template_nodes.minimal.example.com_user_data b/tests/integration/update_cluster/minimal-1.25/data/aws_launch_template_nodes.minimal.example.com_user_data
index 712e25cac8..4bf6e8685b 100644
--- a/tests/integration/update_cluster/minimal-1.25/data/aws_launch_template_nodes.minimal.example.com_user_data
+++ b/tests/integration/update_cluster/minimal-1.25/data/aws_launch_template_nodes.minimal.example.com_user_data
@@ -151,7 +151,7 @@ ConfigServer:
   - https://kops-controller.internal.minimal.example.com:3988/
 InstanceGroupName: nodes
 InstanceGroupRole: Node
-NodeupConfigHash: eKTLi2zsGuML4rE+9oOvFZUGz1rmogFssEygiwoqXmI=
+NodeupConfigHash: 2kKq47Un+gtkbQSqQVySHanpkXDE9NApm0+7Lj3SqV8=
 
 __EOF_KUBE_ENV
 
diff --git a/tests/integration/update_cluster/minimal-1.25/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/minimal-1.25/data/aws_s3_object_cluster-completed.spec_content
index a9b80f48c5..9e69afba00 100644
--- a/tests/integration/update_cluster/minimal-1.25/data/aws_s3_object_cluster-completed.spec_content
+++ b/tests/integration/update_cluster/minimal-1.25/data/aws_s3_object_cluster-completed.spec_content
@@ -24,15 +24,12 @@ spec:
   cloudProvider: aws
   clusterDNSDomain: cluster.local
   configBase: memfs://tests/minimal.example.com
-  containerRuntime: containerd
   containerd:
     logLevel: info
     runc:
       version: 1.1.5
     version: 1.6.20
   dnsZone: Z1AFAKE1ZON3YO
-  docker:
-    skipInstall: true
   etcdClusters:
   - backups:
       backupStore: memfs://tests/minimal.example.com/backups/etcd/main
diff --git a/tests/integration/update_cluster/minimal-1.25/data/aws_s3_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/minimal-1.25/data/aws_s3_object_nodeupconfig-master-us-test-1a_content
index 203f2b5aa9..39732ae5c5 100644
--- a/tests/integration/update_cluster/minimal-1.25/data/aws_s3_object_nodeupconfig-master-us-test-1a_content
+++ b/tests/integration/update_cluster/minimal-1.25/data/aws_s3_object_nodeupconfig-master-us-test-1a_content
@@ -227,7 +227,6 @@ CAs:
     9B7UD2ushcVFPtaeoL9Gfu8aY4KJBeqqg5ojl4qmRnThjw==
     -----END CERTIFICATE-----
 ClusterName: minimal.example.com
-ContainerRuntime: containerd
 ControlPlaneConfig:
   KubeControllerManager:
     allocateNodeCIDRs: true
@@ -322,8 +321,6 @@ containerdConfig:
   runc:
     version: 1.1.5
   version: 1.6.20
-docker:
-  skipInstall: true
 etcdManifests:
 - memfs://tests/minimal.example.com/manifests/etcd/main-master-us-test-1a.yaml
 - memfs://tests/minimal.example.com/manifests/etcd/events-master-us-test-1a.yaml
diff --git a/tests/integration/update_cluster/minimal-1.25/data/aws_s3_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/minimal-1.25/data/aws_s3_object_nodeupconfig-nodes_content
index 5167f5afe4..93cff255fa 100644
--- a/tests/integration/update_cluster/minimal-1.25/data/aws_s3_object_nodeupconfig-nodes_content
+++ b/tests/integration/update_cluster/minimal-1.25/data/aws_s3_object_nodeupconfig-nodes_content
@@ -13,7 +13,6 @@ Assets:
   - 54e79e4d48b9e191767e4abc08be1a8476a1c757e9a9f8c45c6ded001226867f@https://github.com/opencontainers/runc/releases/download/v1.1.5/runc.arm64
 CAs: {}
 ClusterName: minimal.example.com
-ContainerRuntime: containerd
 Hooks:
 - null
 - null
@@ -57,7 +56,5 @@ containerdConfig:
   runc:
     version: 1.1.5
   version: 1.6.20
-docker:
-  skipInstall: true
 usesLegacyGossip: false
 usesNoneDNS: false
diff --git a/tests/integration/update_cluster/minimal-1.26/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data b/tests/integration/update_cluster/minimal-1.26/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data
index 7e62f737af..e68a7fe946 100644
--- a/tests/integration/update_cluster/minimal-1.26/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data
+++ b/tests/integration/update_cluster/minimal-1.26/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data
@@ -128,7 +128,7 @@ ClusterName: minimal.example.com
 ConfigBase: memfs://tests/minimal.example.com
 InstanceGroupName: master-us-test-1a
 InstanceGroupRole: ControlPlane
-NodeupConfigHash: JK2nIOnA5G8QVf+Y/pQJBtx+M3Lbr2KBttC33+JvusA=
+NodeupConfigHash: oPPVSu3xY4IqOaSyQ9G34Upb3gTxwkz1ulEVIdyzUoU=
 
 __EOF_KUBE_ENV
 
diff --git a/tests/integration/update_cluster/minimal-1.26/data/aws_launch_template_nodes.minimal.example.com_user_data b/tests/integration/update_cluster/minimal-1.26/data/aws_launch_template_nodes.minimal.example.com_user_data
index 2d4ae6f644..308a904d68 100644
--- a/tests/integration/update_cluster/minimal-1.26/data/aws_launch_template_nodes.minimal.example.com_user_data
+++ b/tests/integration/update_cluster/minimal-1.26/data/aws_launch_template_nodes.minimal.example.com_user_data
@@ -151,7 +151,7 @@ ConfigServer:
   - https://kops-controller.internal.minimal.example.com:3988/
 InstanceGroupName: nodes
 InstanceGroupRole: Node
-NodeupConfigHash: tlyJtTtZ8BLV6CQs08UE8At/IInzTyb6+zk2TWoGW8M=
+NodeupConfigHash: V/lSbO36iNohGh21blUNYVTkbsSxAZJN2cBRzWzrIPw=
 
 __EOF_KUBE_ENV
 
diff --git a/tests/integration/update_cluster/minimal-1.26/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/minimal-1.26/data/aws_s3_object_cluster-completed.spec_content
index 859dcb7e53..ba0c3a85ef 100644
--- a/tests/integration/update_cluster/minimal-1.26/data/aws_s3_object_cluster-completed.spec_content
+++ b/tests/integration/update_cluster/minimal-1.26/data/aws_s3_object_cluster-completed.spec_content
@@ -24,15 +24,12 @@ spec:
   cloudProvider: aws
   clusterDNSDomain: cluster.local
   configBase: memfs://tests/minimal.example.com
-  containerRuntime: containerd
   containerd:
     logLevel: info
     runc:
       version: 1.1.5
     version: 1.6.20
   dnsZone: Z1AFAKE1ZON3YO
-  docker:
-    skipInstall: true
   etcdClusters:
   - backups:
       backupStore: memfs://tests/minimal.example.com/backups/etcd/main
diff --git a/tests/integration/update_cluster/minimal-1.26/data/aws_s3_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/minimal-1.26/data/aws_s3_object_nodeupconfig-master-us-test-1a_content
index f33fdd99fe..a57e0a9739 100644
--- a/tests/integration/update_cluster/minimal-1.26/data/aws_s3_object_nodeupconfig-master-us-test-1a_content
+++ b/tests/integration/update_cluster/minimal-1.26/data/aws_s3_object_nodeupconfig-master-us-test-1a_content
@@ -227,7 +227,6 @@ CAs:
     9B7UD2ushcVFPtaeoL9Gfu8aY4KJBeqqg5ojl4qmRnThjw==
     -----END CERTIFICATE-----
 ClusterName: minimal.example.com
-ContainerRuntime: containerd
 ControlPlaneConfig:
   KubeControllerManager:
     allocateNodeCIDRs: true
@@ -322,8 +321,6 @@ containerdConfig:
   runc:
     version: 1.1.5
   version: 1.6.20
-docker:
-  skipInstall: true
 etcdManifests:
 - memfs://tests/minimal.example.com/manifests/etcd/main-master-us-test-1a.yaml
 - memfs://tests/minimal.example.com/manifests/etcd/events-master-us-test-1a.yaml
diff --git a/tests/integration/update_cluster/minimal-1.26/data/aws_s3_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/minimal-1.26/data/aws_s3_object_nodeupconfig-nodes_content
index 10a3cd1187..78b780f676 100644
--- a/tests/integration/update_cluster/minimal-1.26/data/aws_s3_object_nodeupconfig-nodes_content
+++ b/tests/integration/update_cluster/minimal-1.26/data/aws_s3_object_nodeupconfig-nodes_content
@@ -13,7 +13,6 @@ Assets:
   - 54e79e4d48b9e191767e4abc08be1a8476a1c757e9a9f8c45c6ded001226867f@https://github.com/opencontainers/runc/releases/download/v1.1.5/runc.arm64
 CAs: {}
 ClusterName: minimal.example.com
-ContainerRuntime: containerd
 Hooks:
 - null
 - null
@@ -57,7 +56,5 @@ containerdConfig:
   runc:
     version: 1.1.5
   version: 1.6.20
-docker:
-  skipInstall: true
 usesLegacyGossip: false
 usesNoneDNS: false
diff --git a/tests/integration/update_cluster/minimal-1.27/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data b/tests/integration/update_cluster/minimal-1.27/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data
index ba13e0e501..3588932cce 100644
--- a/tests/integration/update_cluster/minimal-1.27/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data
+++ b/tests/integration/update_cluster/minimal-1.27/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data
@@ -128,7 +128,7 @@ ClusterName: minimal.example.com
 ConfigBase: memfs://tests/minimal.example.com
 InstanceGroupName: master-us-test-1a
 InstanceGroupRole: ControlPlane
-NodeupConfigHash: 2HYZzqxAvsihyAXvH7/9Al65aMEfTfNM4MqXR1oG8Sg=
+NodeupConfigHash: 4GwAZ/5gKqNu8QNk/BXdrM6kWksFiJxrYyeOM6vZWwc=
 
 __EOF_KUBE_ENV
 
diff --git a/tests/integration/update_cluster/minimal-1.27/data/aws_launch_template_nodes.minimal.example.com_user_data b/tests/integration/update_cluster/minimal-1.27/data/aws_launch_template_nodes.minimal.example.com_user_data
index 580db1e866..7e36a41465 100644
--- a/tests/integration/update_cluster/minimal-1.27/data/aws_launch_template_nodes.minimal.example.com_user_data
+++ b/tests/integration/update_cluster/minimal-1.27/data/aws_launch_template_nodes.minimal.example.com_user_data
@@ -151,7 +151,7 @@ ConfigServer:
   - https://kops-controller.internal.minimal.example.com:3988/
 InstanceGroupName: nodes
 InstanceGroupRole: Node
-NodeupConfigHash: ODvOe4BkzwXd2jlNINow4SJ3kE5BEnOqsqjHBnlxUYg=
+NodeupConfigHash: M2QHO0ZICXIoL3LnUcARQP+lloAO8pHHqQJYyttRjGI=
 
 __EOF_KUBE_ENV
 
diff --git a/tests/integration/update_cluster/minimal-1.27/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/minimal-1.27/data/aws_s3_object_cluster-completed.spec_content
index 9726240659..bcfe9ce783 100644
--- a/tests/integration/update_cluster/minimal-1.27/data/aws_s3_object_cluster-completed.spec_content
+++ b/tests/integration/update_cluster/minimal-1.27/data/aws_s3_object_cluster-completed.spec_content
@@ -24,15 +24,12 @@ spec:
   cloudProvider: aws
   clusterDNSDomain: cluster.local
   configBase: memfs://tests/minimal.example.com
-  containerRuntime: containerd
   containerd:
     logLevel: info
     runc:
       version: 1.1.7
     version: 1.7.2
   dnsZone: Z1AFAKE1ZON3YO
-  docker:
-    skipInstall: true
   etcdClusters:
   - backups:
       backupStore: memfs://tests/minimal.example.com/backups/etcd/main
diff --git a/tests/integration/update_cluster/minimal-1.27/data/aws_s3_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/minimal-1.27/data/aws_s3_object_nodeupconfig-master-us-test-1a_content
index af87b84cdd..33f51d1372 100644
--- a/tests/integration/update_cluster/minimal-1.27/data/aws_s3_object_nodeupconfig-master-us-test-1a_content
+++ b/tests/integration/update_cluster/minimal-1.27/data/aws_s3_object_nodeupconfig-master-us-test-1a_content
@@ -228,7 +228,6 @@ CAs:
     9B7UD2ushcVFPtaeoL9Gfu8aY4KJBeqqg5ojl4qmRnThjw==
     -----END CERTIFICATE-----
 ClusterName: minimal.example.com
-ContainerRuntime: containerd
 ControlPlaneConfig:
   KubeControllerManager:
     allocateNodeCIDRs: true
@@ -320,8 +319,6 @@ containerdConfig:
   runc:
     version: 1.1.7
   version: 1.7.2
-docker:
-  skipInstall: true
 etcdManifests:
 - memfs://tests/minimal.example.com/manifests/etcd/main-master-us-test-1a.yaml
 - memfs://tests/minimal.example.com/manifests/etcd/events-master-us-test-1a.yaml
diff --git a/tests/integration/update_cluster/minimal-1.27/data/aws_s3_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/minimal-1.27/data/aws_s3_object_nodeupconfig-nodes_content
index fac8f659b8..5abe87a637 100644
--- a/tests/integration/update_cluster/minimal-1.27/data/aws_s3_object_nodeupconfig-nodes_content
+++ b/tests/integration/update_cluster/minimal-1.27/data/aws_s3_object_nodeupconfig-nodes_content
@@ -15,7 +15,6 @@ Assets:
   - 1b309c4d5aa4cc7b888b2f79c385ecee26ca3d55dae0852e7c4a692196d5faab@https://github.com/opencontainers/runc/releases/download/v1.1.7/runc.arm64
 CAs: {}
 ClusterName: minimal.example.com
-ContainerRuntime: containerd
 Hooks:
 - null
 - null
@@ -58,7 +57,5 @@ containerdConfig:
   runc:
     version: 1.1.7
   version: 1.7.2
-docker:
-  skipInstall: true
 usesLegacyGossip: false
 usesNoneDNS: false
diff --git a/tests/integration/update_cluster/minimal-1.28/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data b/tests/integration/update_cluster/minimal-1.28/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data
index 9ebc1f08d7..c8b2cdc84e 100644
--- a/tests/integration/update_cluster/minimal-1.28/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data
+++ b/tests/integration/update_cluster/minimal-1.28/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data
@@ -128,7 +128,7 @@ ClusterName: minimal.example.com
 ConfigBase: memfs://tests/minimal.example.com
 InstanceGroupName: master-us-test-1a
 InstanceGroupRole: ControlPlane
-NodeupConfigHash: QThNHWAIVsrg+DAcqSGJktEAp5LuDCoIxGYKn0xuHuA=
+NodeupConfigHash: xeSliqYwTJ8Lz5c3vTcVdtJe0sY5QVZtLGXk5zQYRek=
 
 __EOF_KUBE_ENV
 
diff --git a/tests/integration/update_cluster/minimal-1.28/data/aws_launch_template_nodes.minimal.example.com_user_data b/tests/integration/update_cluster/minimal-1.28/data/aws_launch_template_nodes.minimal.example.com_user_data
index 907450ac46..e66e219c5c 100644
--- a/tests/integration/update_cluster/minimal-1.28/data/aws_launch_template_nodes.minimal.example.com_user_data
+++ b/tests/integration/update_cluster/minimal-1.28/data/aws_launch_template_nodes.minimal.example.com_user_data
@@ -151,7 +151,7 @@ ConfigServer:
   - https://kops-controller.internal.minimal.example.com:3988/
 InstanceGroupName: nodes
 InstanceGroupRole: Node
-NodeupConfigHash: ovmkGY+yGD0099riDPPHShHfLgEnpR3F+YJ4QNX1TUE=
+NodeupConfigHash: hcDYZdz4nRq6Pctst49M/qxgVAvPe/n6jDHoh5nSucM=
 
 __EOF_KUBE_ENV
 
diff --git a/tests/integration/update_cluster/minimal-1.28/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/minimal-1.28/data/aws_s3_object_cluster-completed.spec_content
index 97975311f4..6f66561db9 100644
--- a/tests/integration/update_cluster/minimal-1.28/data/aws_s3_object_cluster-completed.spec_content
+++ b/tests/integration/update_cluster/minimal-1.28/data/aws_s3_object_cluster-completed.spec_content
@@ -24,15 +24,12 @@ spec:
   cloudProvider: aws
   clusterDNSDomain: cluster.local
   configBase: memfs://tests/minimal.example.com
-  containerRuntime: containerd
   containerd:
     logLevel: info
     runc:
       version: 1.1.7
     version: 1.7.2
   dnsZone: Z1AFAKE1ZON3YO
-  docker:
-    skipInstall: true
   etcdClusters:
   - backups:
       backupStore: memfs://tests/minimal.example.com/backups/etcd/main
diff --git a/tests/integration/update_cluster/minimal-1.28/data/aws_s3_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/minimal-1.28/data/aws_s3_object_nodeupconfig-master-us-test-1a_content
index c78f01fc8e..7991ca7837 100644
--- a/tests/integration/update_cluster/minimal-1.28/data/aws_s3_object_nodeupconfig-master-us-test-1a_content
+++ b/tests/integration/update_cluster/minimal-1.28/data/aws_s3_object_nodeupconfig-master-us-test-1a_content
@@ -228,7 +228,6 @@ CAs:
     9B7UD2ushcVFPtaeoL9Gfu8aY4KJBeqqg5ojl4qmRnThjw==
     -----END CERTIFICATE-----
 ClusterName: minimal.example.com
-ContainerRuntime: containerd
 ControlPlaneConfig:
   KubeControllerManager:
     allocateNodeCIDRs: true
@@ -320,8 +319,6 @@ containerdConfig:
   runc:
     version: 1.1.7
   version: 1.7.2
-docker:
-  skipInstall: true
 etcdManifests:
 - memfs://tests/minimal.example.com/manifests/etcd/main-master-us-test-1a.yaml
 - memfs://tests/minimal.example.com/manifests/etcd/events-master-us-test-1a.yaml
diff --git a/tests/integration/update_cluster/minimal-1.28/data/aws_s3_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/minimal-1.28/data/aws_s3_object_nodeupconfig-nodes_content
index 2e75dbe17c..f928c9d7e3 100644
--- a/tests/integration/update_cluster/minimal-1.28/data/aws_s3_object_nodeupconfig-nodes_content
+++ b/tests/integration/update_cluster/minimal-1.28/data/aws_s3_object_nodeupconfig-nodes_content
@@ -15,7 +15,6 @@ Assets:
   - 1b309c4d5aa4cc7b888b2f79c385ecee26ca3d55dae0852e7c4a692196d5faab@https://github.com/opencontainers/runc/releases/download/v1.1.7/runc.arm64
 CAs: {}
 ClusterName: minimal.example.com
-ContainerRuntime: containerd
 Hooks:
 - null
 - null
@@ -58,7 +57,5 @@ containerdConfig:
   runc:
     version: 1.1.7
   version: 1.7.2
-docker:
-  skipInstall: true
 usesLegacyGossip: false
 usesNoneDNS: false
diff --git a/tests/integration/update_cluster/minimal-1.29/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data b/tests/integration/update_cluster/minimal-1.29/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data
index c4c69d753a..f9ee1febe5 100644
--- a/tests/integration/update_cluster/minimal-1.29/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data
+++ b/tests/integration/update_cluster/minimal-1.29/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data
@@ -128,7 +128,7 @@ ClusterName: minimal.example.com
 ConfigBase: memfs://tests/minimal.example.com
 InstanceGroupName: master-us-test-1a
 InstanceGroupRole: ControlPlane
-NodeupConfigHash: s0MbA/AW+MscyHCFrA6IEdNrYT7EGIsuHzalOwNoumQ=
+NodeupConfigHash: G86/CQWRkRmyhEiMNG3cfUumjMr75ModEr3U433Zu64=
 
 __EOF_KUBE_ENV
 
diff --git a/tests/integration/update_cluster/minimal-1.29/data/aws_launch_template_nodes.minimal.example.com_user_data b/tests/integration/update_cluster/minimal-1.29/data/aws_launch_template_nodes.minimal.example.com_user_data
index ac8babc42b..14d8ac40b5 100644
--- a/tests/integration/update_cluster/minimal-1.29/data/aws_launch_template_nodes.minimal.example.com_user_data
+++ b/tests/integration/update_cluster/minimal-1.29/data/aws_launch_template_nodes.minimal.example.com_user_data
@@ -151,7 +151,7 @@ ConfigServer:
   - https://kops-controller.internal.minimal.example.com:3988/
 InstanceGroupName: nodes
 InstanceGroupRole: Node
-NodeupConfigHash: XAtN+JD0Bzk+bHuyGGonYVl7meigxzsuH0/wZQsj1tM=
+NodeupConfigHash: 9ukMjbbnKuTOGvCF0F/T9MgqmhDt9aCRxQcNBqv03ks=
 
 __EOF_KUBE_ENV
 
diff --git a/tests/integration/update_cluster/minimal-1.29/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/minimal-1.29/data/aws_s3_object_cluster-completed.spec_content
index e20c1fb55c..8c60ad8d34 100644
--- a/tests/integration/update_cluster/minimal-1.29/data/aws_s3_object_cluster-completed.spec_content
+++ b/tests/integration/update_cluster/minimal-1.29/data/aws_s3_object_cluster-completed.spec_content
@@ -24,15 +24,12 @@ spec:
   cloudProvider: aws
   clusterDNSDomain: cluster.local
   configBase: memfs://tests/minimal.example.com
-  containerRuntime: containerd
   containerd:
     logLevel: info
     runc:
       version: 1.1.7
     version: 1.7.2
   dnsZone: Z1AFAKE1ZON3YO
-  docker:
-    skipInstall: true
   etcdClusters:
   - backups:
       backupStore: memfs://tests/minimal.example.com/backups/etcd/main
diff --git a/tests/integration/update_cluster/minimal-1.29/data/aws_s3_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/minimal-1.29/data/aws_s3_object_nodeupconfig-master-us-test-1a_content
index 686d33cd2d..8859048386 100644
--- a/tests/integration/update_cluster/minimal-1.29/data/aws_s3_object_nodeupconfig-master-us-test-1a_content
+++ b/tests/integration/update_cluster/minimal-1.29/data/aws_s3_object_nodeupconfig-master-us-test-1a_content
@@ -228,7 +228,6 @@ CAs:
     9B7UD2ushcVFPtaeoL9Gfu8aY4KJBeqqg5ojl4qmRnThjw==
     -----END CERTIFICATE-----
 ClusterName: minimal.example.com
-ContainerRuntime: containerd
 ControlPlaneConfig:
   KubeControllerManager:
     allocateNodeCIDRs: true
@@ -320,8 +319,6 @@ containerdConfig:
   runc:
     version: 1.1.7
   version: 1.7.2
-docker:
-  skipInstall: true
 etcdManifests:
 - memfs://tests/minimal.example.com/manifests/etcd/main-master-us-test-1a.yaml
 - memfs://tests/minimal.example.com/manifests/etcd/events-master-us-test-1a.yaml
diff --git a/tests/integration/update_cluster/minimal-1.29/data/aws_s3_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/minimal-1.29/data/aws_s3_object_nodeupconfig-nodes_content
index 10de0760ba..2da36cb3da 100644
--- a/tests/integration/update_cluster/minimal-1.29/data/aws_s3_object_nodeupconfig-nodes_content
+++ b/tests/integration/update_cluster/minimal-1.29/data/aws_s3_object_nodeupconfig-nodes_content
@@ -15,7 +15,6 @@ Assets:
   - 1b309c4d5aa4cc7b888b2f79c385ecee26ca3d55dae0852e7c4a692196d5faab@https://github.com/opencontainers/runc/releases/download/v1.1.7/runc.arm64
 CAs: {}
 ClusterName: minimal.example.com
-ContainerRuntime: containerd
 Hooks:
 - null
 - null
@@ -58,7 +57,5 @@ containerdConfig:
   runc:
     version: 1.1.7
   version: 1.7.2
-docker:
-  skipInstall: true
 usesLegacyGossip: false
 usesNoneDNS: false
diff --git a/tests/integration/update_cluster/minimal-dns-none/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data b/tests/integration/update_cluster/minimal-dns-none/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data
index 0a7b482ad8..823cf087a6 100644
--- a/tests/integration/update_cluster/minimal-dns-none/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data
+++ b/tests/integration/update_cluster/minimal-dns-none/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data
@@ -128,7 +128,7 @@ ClusterName: minimal.example.com
 ConfigBase: memfs://tests/minimal.example.com
 InstanceGroupName: master-us-test-1a
 InstanceGroupRole: ControlPlane
-NodeupConfigHash: l1D39fPhK+VnZ7+neUF3y3bDwB6hLYx6/sN87xNuGyM=
+NodeupConfigHash: /F1soHZO2UIdKurpq0bi4Mt0hcLY3TmVI/nrL54rahE=
 
 __EOF_KUBE_ENV
 
diff --git a/tests/integration/update_cluster/minimal-dns-none/data/aws_launch_template_nodes.minimal.example.com_user_data b/tests/integration/update_cluster/minimal-dns-none/data/aws_launch_template_nodes.minimal.example.com_user_data
index 32490972f0..ab65954cc3 100644
--- a/tests/integration/update_cluster/minimal-dns-none/data/aws_launch_template_nodes.minimal.example.com_user_data
+++ b/tests/integration/update_cluster/minimal-dns-none/data/aws_launch_template_nodes.minimal.example.com_user_data
@@ -151,7 +151,7 @@ ConfigServer:
   - https://kops-controller.internal.minimal.example.com:3988/
 InstanceGroupName: nodes
 InstanceGroupRole: Node
-NodeupConfigHash: K0NwZAO+HGuZkQ2DjXW+hm5CJema2DVlqTVggJSuZuw=
+NodeupConfigHash: 6M1Xz8GBNgiSVpMh9ynmwkjstacOEy9PWeHTTZPn/dA=
 
 __EOF_KUBE_ENV
 
diff --git a/tests/integration/update_cluster/minimal-dns-none/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/minimal-dns-none/data/aws_s3_object_cluster-completed.spec_content
index c3a7c81bf9..8f5d7231b4 100644
--- a/tests/integration/update_cluster/minimal-dns-none/data/aws_s3_object_cluster-completed.spec_content
+++ b/tests/integration/update_cluster/minimal-dns-none/data/aws_s3_object_cluster-completed.spec_content
@@ -26,14 +26,11 @@ spec:
   cloudProvider: aws
   clusterDNSDomain: cluster.local
   configBase: memfs://tests/minimal.example.com
-  containerRuntime: containerd
   containerd:
     logLevel: info
     runc:
       version: 1.1.5
     version: 1.6.20
-  docker:
-    skipInstall: true
   etcdClusters:
   - backups:
       backupStore: memfs://tests/minimal.example.com/backups/etcd/main
diff --git a/tests/integration/update_cluster/minimal-dns-none/data/aws_s3_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/minimal-dns-none/data/aws_s3_object_nodeupconfig-master-us-test-1a_content
index b2acc85e0f..e218c6f7a6 100644
--- a/tests/integration/update_cluster/minimal-dns-none/data/aws_s3_object_nodeupconfig-master-us-test-1a_content
+++ b/tests/integration/update_cluster/minimal-dns-none/data/aws_s3_object_nodeupconfig-master-us-test-1a_content
@@ -226,7 +226,6 @@ CAs:
     9B7UD2ushcVFPtaeoL9Gfu8aY4KJBeqqg5ojl4qmRnThjw==
     -----END CERTIFICATE-----
 ClusterName: minimal.example.com
-ContainerRuntime: containerd
 ControlPlaneConfig:
   KubeControllerManager:
     allocateNodeCIDRs: true
@@ -320,8 +319,6 @@ containerdConfig:
   runc:
     version: 1.1.5
   version: 1.6.20
-docker:
-  skipInstall: true
 etcdManifests:
 - memfs://tests/minimal.example.com/manifests/etcd/main-master-us-test-1a.yaml
 - memfs://tests/minimal.example.com/manifests/etcd/events-master-us-test-1a.yaml
diff --git a/tests/integration/update_cluster/minimal-dns-none/data/aws_s3_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/minimal-dns-none/data/aws_s3_object_nodeupconfig-nodes_content
index 2b4c8395e7..6fca082593 100644
--- a/tests/integration/update_cluster/minimal-dns-none/data/aws_s3_object_nodeupconfig-nodes_content
+++ b/tests/integration/update_cluster/minimal-dns-none/data/aws_s3_object_nodeupconfig-nodes_content
@@ -13,7 +13,6 @@ Assets:
   - 54e79e4d48b9e191767e4abc08be1a8476a1c757e9a9f8c45c6ded001226867f@https://github.com/opencontainers/runc/releases/download/v1.1.5/runc.arm64
 CAs: {}
 ClusterName: minimal.example.com
-ContainerRuntime: containerd
 Hooks:
 - null
 - null
@@ -57,7 +56,5 @@ containerdConfig:
   runc:
     version: 1.1.5
   version: 1.6.20
-docker:
-  skipInstall: true
 usesLegacyGossip: false
 usesNoneDNS: true
diff --git a/tests/integration/update_cluster/minimal-etcd/data/aws_launch_template_master-us-test-1a.masters.minimal-etcd.example.com_user_data b/tests/integration/update_cluster/minimal-etcd/data/aws_launch_template_master-us-test-1a.masters.minimal-etcd.example.com_user_data
index 16ce6808e7..9aec9f1dd0 100644
--- a/tests/integration/update_cluster/minimal-etcd/data/aws_launch_template_master-us-test-1a.masters.minimal-etcd.example.com_user_data
+++ b/tests/integration/update_cluster/minimal-etcd/data/aws_launch_template_master-us-test-1a.masters.minimal-etcd.example.com_user_data
@@ -128,7 +128,7 @@ ClusterName: minimal-etcd.example.com
 ConfigBase: memfs://clusters.example.com/minimal-etcd.example.com
 InstanceGroupName: master-us-test-1a
 InstanceGroupRole: ControlPlane
-NodeupConfigHash: YmcsXGsY49DuIOhzlCILkKqaf4/3EvOc/5u5trXb/pw=
+NodeupConfigHash: v3mYgDeZ32KWjpXEBUPe1wjxK4UDkpVH4UY2Heh+V0w=
 
 __EOF_KUBE_ENV
 
diff --git a/tests/integration/update_cluster/minimal-etcd/data/aws_launch_template_nodes.minimal-etcd.example.com_user_data b/tests/integration/update_cluster/minimal-etcd/data/aws_launch_template_nodes.minimal-etcd.example.com_user_data
index a77935f26c..d6d3709cf4 100644
--- a/tests/integration/update_cluster/minimal-etcd/data/aws_launch_template_nodes.minimal-etcd.example.com_user_data
+++ b/tests/integration/update_cluster/minimal-etcd/data/aws_launch_template_nodes.minimal-etcd.example.com_user_data
@@ -151,7 +151,7 @@ ConfigServer:
   - https://kops-controller.internal.minimal-etcd.example.com:3988/
 InstanceGroupName: nodes
 InstanceGroupRole: Node
-NodeupConfigHash: usyEuNFh6bW6Y7mdTwX7Io1K3C+6NZcfe9i2iMvMZY0=
+NodeupConfigHash: 6vI5w7O10gjwhWEcq0znvqATIMrdWwaLTe+ALX3ezt8=
 
 __EOF_KUBE_ENV
 
diff --git a/tests/integration/update_cluster/minimal-etcd/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/minimal-etcd/data/aws_s3_object_cluster-completed.spec_content
index b020c03720..1e73a6cc1e 100644
--- a/tests/integration/update_cluster/minimal-etcd/data/aws_s3_object_cluster-completed.spec_content
+++ b/tests/integration/update_cluster/minimal-etcd/data/aws_s3_object_cluster-completed.spec_content
@@ -24,15 +24,12 @@ spec:
   cloudProvider: aws
   clusterDNSDomain: cluster.local
   configBase: memfs://clusters.example.com/minimal-etcd.example.com
-  containerRuntime: containerd
   containerd:
     logLevel: info
     runc:
       version: 1.1.5
     version: 1.6.20
   dnsZone: Z1AFAKE1ZON3YO
-  docker:
-    skipInstall: true
   etcdClusters:
   - backups:
       backupStore: memfs://clusters.example.com/minimal-etcd.example.com/backups/etcd/main
diff --git a/tests/integration/update_cluster/minimal-etcd/data/aws_s3_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/minimal-etcd/data/aws_s3_object_nodeupconfig-master-us-test-1a_content
index 3b035864fd..3b04062c10 100644
--- a/tests/integration/update_cluster/minimal-etcd/data/aws_s3_object_nodeupconfig-master-us-test-1a_content
+++ b/tests/integration/update_cluster/minimal-etcd/data/aws_s3_object_nodeupconfig-master-us-test-1a_content
@@ -227,7 +227,6 @@ CAs:
     9B7UD2ushcVFPtaeoL9Gfu8aY4KJBeqqg5ojl4qmRnThjw==
     -----END CERTIFICATE-----
 ClusterName: minimal-etcd.example.com
-ContainerRuntime: containerd
 ControlPlaneConfig:
   KubeControllerManager:
     allocateNodeCIDRs: true
@@ -321,8 +320,6 @@ containerdConfig:
   runc:
     version: 1.1.5
   version: 1.6.20
-docker:
-  skipInstall: true
 etcdManifests:
 - memfs://clusters.example.com/minimal-etcd.example.com/manifests/etcd/main-master-us-test-1a.yaml
 - memfs://clusters.example.com/minimal-etcd.example.com/manifests/etcd/events-master-us-test-1a.yaml
diff --git a/tests/integration/update_cluster/minimal-etcd/data/aws_s3_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/minimal-etcd/data/aws_s3_object_nodeupconfig-nodes_content
index e8846e61fd..8f21494fbc 100644
--- a/tests/integration/update_cluster/minimal-etcd/data/aws_s3_object_nodeupconfig-nodes_content
+++ b/tests/integration/update_cluster/minimal-etcd/data/aws_s3_object_nodeupconfig-nodes_content
@@ -13,7 +13,6 @@ Assets:
   - 54e79e4d48b9e191767e4abc08be1a8476a1c757e9a9f8c45c6ded001226867f@https://github.com/opencontainers/runc/releases/download/v1.1.5/runc.arm64
 CAs: {}
 ClusterName: minimal-etcd.example.com
-ContainerRuntime: containerd
 Hooks:
 - null
 - null
@@ -56,7 +55,5 @@ containerdConfig:
   runc:
     version: 1.1.5
   version: 1.6.20
-docker:
-  skipInstall: true
 usesLegacyGossip: false
 usesNoneDNS: false
diff --git a/tests/integration/update_cluster/minimal-gp3/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data b/tests/integration/update_cluster/minimal-gp3/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data
index 43b853ee92..b3dff4adb1 100644
--- a/tests/integration/update_cluster/minimal-gp3/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data
+++ b/tests/integration/update_cluster/minimal-gp3/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data
@@ -128,7 +128,7 @@ ClusterName: minimal.example.com
 ConfigBase: memfs://clusters.example.com/minimal.example.com
 InstanceGroupName: master-us-test-1a
 InstanceGroupRole: ControlPlane
-NodeupConfigHash: UhWxV84/7jb2wSFze1pzEmopJrPwVIM23XQhhPc/j6A=
+NodeupConfigHash: wlwDwuGdu+VCRynnTM+pyeVEBJQXEvR7Zq116GoktwQ=
 
 __EOF_KUBE_ENV
 
diff --git a/tests/integration/update_cluster/minimal-gp3/data/aws_launch_template_nodes.minimal.example.com_user_data b/tests/integration/update_cluster/minimal-gp3/data/aws_launch_template_nodes.minimal.example.com_user_data
index 0915bd9981..661841cc5b 100644
--- a/tests/integration/update_cluster/minimal-gp3/data/aws_launch_template_nodes.minimal.example.com_user_data
+++ b/tests/integration/update_cluster/minimal-gp3/data/aws_launch_template_nodes.minimal.example.com_user_data
@@ -151,7 +151,7 @@ ConfigServer:
   - https://kops-controller.internal.minimal.example.com:3988/
 InstanceGroupName: nodes
 InstanceGroupRole: Node
-NodeupConfigHash: q+zd9qOWcsPuVG5sYSiAcphkD0PBPRnWbw9yRz0MRLA=
+NodeupConfigHash: 1AGiv4MNUt9ZDs4jDI6wLlDP7gNbhcdFx4N5IrqMuj0=
 
 __EOF_KUBE_ENV
 
diff --git a/tests/integration/update_cluster/minimal-gp3/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/minimal-gp3/data/aws_s3_object_cluster-completed.spec_content
index 92acbcef07..ec9b91dd59 100644
--- a/tests/integration/update_cluster/minimal-gp3/data/aws_s3_object_cluster-completed.spec_content
+++ b/tests/integration/update_cluster/minimal-gp3/data/aws_s3_object_cluster-completed.spec_content
@@ -24,15 +24,12 @@ spec:
   cloudProvider: aws
   clusterDNSDomain: cluster.local
   configBase: memfs://clusters.example.com/minimal.example.com
-  containerRuntime: containerd
   containerd:
     logLevel: info
     runc:
       version: 1.1.5
     version: 1.6.20
   dnsZone: Z1AFAKE1ZON3YO
-  docker:
-    skipInstall: true
   etcdClusters:
   - backups:
       backupStore: memfs://clusters.example.com/minimal.example.com/backups/etcd/main
diff --git a/tests/integration/update_cluster/minimal-gp3/data/aws_s3_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/minimal-gp3/data/aws_s3_object_nodeupconfig-master-us-test-1a_content
index b5b35c4004..9711d0ef32 100644
--- a/tests/integration/update_cluster/minimal-gp3/data/aws_s3_object_nodeupconfig-master-us-test-1a_content
+++ b/tests/integration/update_cluster/minimal-gp3/data/aws_s3_object_nodeupconfig-master-us-test-1a_content
@@ -227,7 +227,6 @@ CAs:
     9B7UD2ushcVFPtaeoL9Gfu8aY4KJBeqqg5ojl4qmRnThjw==
     -----END CERTIFICATE-----
 ClusterName: minimal.example.com
-ContainerRuntime: containerd
 ControlPlaneConfig:
   KubeControllerManager:
     allocateNodeCIDRs: true
@@ -321,8 +320,6 @@ containerdConfig:
   runc:
     version: 1.1.5
   version: 1.6.20
-docker:
-  skipInstall: true
 etcdManifests:
 - memfs://clusters.example.com/minimal.example.com/manifests/etcd/main-master-us-test-1a.yaml
 - memfs://clusters.example.com/minimal.example.com/manifests/etcd/events-master-us-test-1a.yaml
diff --git a/tests/integration/update_cluster/minimal-gp3/data/aws_s3_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/minimal-gp3/data/aws_s3_object_nodeupconfig-nodes_content
index 55e7649533..552bc4ab5e 100644
--- a/tests/integration/update_cluster/minimal-gp3/data/aws_s3_object_nodeupconfig-nodes_content
+++ b/tests/integration/update_cluster/minimal-gp3/data/aws_s3_object_nodeupconfig-nodes_content
@@ -13,7 +13,6 @@ Assets:
   - 54e79e4d48b9e191767e4abc08be1a8476a1c757e9a9f8c45c6ded001226867f@https://github.com/opencontainers/runc/releases/download/v1.1.5/runc.arm64
 CAs: {}
 ClusterName: minimal.example.com
-ContainerRuntime: containerd
 Hooks:
 - null
 - null
@@ -56,7 +55,5 @@ containerdConfig:
   runc:
     version: 1.1.5
   version: 1.6.20
-docker:
-  skipInstall: true
 usesLegacyGossip: false
 usesNoneDNS: false
diff --git a/tests/integration/update_cluster/minimal-ipv6-calico/data/aws_launch_template_master-us-test-1a.masters.minimal-ipv6.example.com_user_data b/tests/integration/update_cluster/minimal-ipv6-calico/data/aws_launch_template_master-us-test-1a.masters.minimal-ipv6.example.com_user_data
index 39bd24cca2..b4edd42c6a 100644
--- a/tests/integration/update_cluster/minimal-ipv6-calico/data/aws_launch_template_master-us-test-1a.masters.minimal-ipv6.example.com_user_data
+++ b/tests/integration/update_cluster/minimal-ipv6-calico/data/aws_launch_template_master-us-test-1a.masters.minimal-ipv6.example.com_user_data
@@ -128,7 +128,7 @@ ClusterName: minimal-ipv6.example.com
 ConfigBase: memfs://clusters.example.com/minimal-ipv6.example.com
 InstanceGroupName: master-us-test-1a
 InstanceGroupRole: ControlPlane
-NodeupConfigHash: KZCMz0CUNlNHjLZsYUBm3lPSi/IubPoM3XRYK5curaI=
+NodeupConfigHash: Yx6idKhq1OQyD3antZiPlPttgw1h6MMZcX1/gCpwh7I=
 
 __EOF_KUBE_ENV
 
diff --git a/tests/integration/update_cluster/minimal-ipv6-calico/data/aws_launch_template_nodes.minimal-ipv6.example.com_user_data b/tests/integration/update_cluster/minimal-ipv6-calico/data/aws_launch_template_nodes.minimal-ipv6.example.com_user_data
index 175641ccf0..fae25fa5da 100644
--- a/tests/integration/update_cluster/minimal-ipv6-calico/data/aws_launch_template_nodes.minimal-ipv6.example.com_user_data
+++ b/tests/integration/update_cluster/minimal-ipv6-calico/data/aws_launch_template_nodes.minimal-ipv6.example.com_user_data
@@ -151,7 +151,7 @@ ConfigServer:
   - https://kops-controller.internal.minimal-ipv6.example.com:3988/
 InstanceGroupName: nodes
 InstanceGroupRole: Node
-NodeupConfigHash: PUmA9wHC+e+u0bm6y8qKpm5qLlm1hkc6Dn0hSZ+PoQY=
+NodeupConfigHash: uaqnHQdeEcjkos1QeaRqYhMcwb5/+0Bvvb5BrNm1mKM=
 
 __EOF_KUBE_ENV
 
diff --git a/tests/integration/update_cluster/minimal-ipv6-calico/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/minimal-ipv6-calico/data/aws_s3_object_cluster-completed.spec_content
index 3ffcbfb0ee..2530b33222 100644
--- a/tests/integration/update_cluster/minimal-ipv6-calico/data/aws_s3_object_cluster-completed.spec_content
+++ b/tests/integration/update_cluster/minimal-ipv6-calico/data/aws_s3_object_cluster-completed.spec_content
@@ -28,15 +28,12 @@ spec:
   cloudProvider: aws
   clusterDNSDomain: cluster.local
   configBase: memfs://clusters.example.com/minimal-ipv6.example.com
-  containerRuntime: containerd
   containerd:
     logLevel: info
     runc:
       version: 1.1.5
     version: 1.6.20
   dnsZone: Z1AFAKE1ZON3YO
-  docker:
-    skipInstall: true
   etcdClusters:
   - backups:
       backupStore: memfs://clusters.example.com/minimal-ipv6.example.com/backups/etcd/main
diff --git a/tests/integration/update_cluster/minimal-ipv6-calico/data/aws_s3_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/minimal-ipv6-calico/data/aws_s3_object_nodeupconfig-master-us-test-1a_content
index 63af5fe6ef..cf091cb9b3 100644
--- a/tests/integration/update_cluster/minimal-ipv6-calico/data/aws_s3_object_nodeupconfig-master-us-test-1a_content
+++ b/tests/integration/update_cluster/minimal-ipv6-calico/data/aws_s3_object_nodeupconfig-master-us-test-1a_content
@@ -226,7 +226,6 @@ CAs:
     9B7UD2ushcVFPtaeoL9Gfu8aY4KJBeqqg5ojl4qmRnThjw==
     -----END CERTIFICATE-----
 ClusterName: minimal-ipv6.example.com
-ContainerRuntime: containerd
 ControlPlaneConfig:
   KubeControllerManager:
     allocateNodeCIDRs: false
@@ -322,8 +321,6 @@ containerdConfig:
   runc:
     version: 1.1.5
   version: 1.6.20
-docker:
-  skipInstall: true
 etcdManifests:
 - memfs://clusters.example.com/minimal-ipv6.example.com/manifests/etcd/main-master-us-test-1a.yaml
 - memfs://clusters.example.com/minimal-ipv6.example.com/manifests/etcd/events-master-us-test-1a.yaml
diff --git a/tests/integration/update_cluster/minimal-ipv6-calico/data/aws_s3_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/minimal-ipv6-calico/data/aws_s3_object_nodeupconfig-nodes_content
index 9d4dc197d6..abbee1be8f 100644
--- a/tests/integration/update_cluster/minimal-ipv6-calico/data/aws_s3_object_nodeupconfig-nodes_content
+++ b/tests/integration/update_cluster/minimal-ipv6-calico/data/aws_s3_object_nodeupconfig-nodes_content
@@ -13,7 +13,6 @@ Assets:
   - 54e79e4d48b9e191767e4abc08be1a8476a1c757e9a9f8c45c6ded001226867f@https://github.com/opencontainers/runc/releases/download/v1.1.5/runc.arm64
 CAs: {}
 ClusterName: minimal-ipv6.example.com
-ContainerRuntime: containerd
 Hooks:
 - null
 - null
@@ -56,7 +55,5 @@ containerdConfig:
   runc:
     version: 1.1.5
   version: 1.6.20
-docker:
-  skipInstall: true
 usesLegacyGossip: false
 usesNoneDNS: false
diff --git a/tests/integration/update_cluster/minimal-ipv6-cilium/data/aws_launch_template_master-us-test-1a.masters.minimal-ipv6.example.com_user_data b/tests/integration/update_cluster/minimal-ipv6-cilium/data/aws_launch_template_master-us-test-1a.masters.minimal-ipv6.example.com_user_data
index 46b489fb74..fbf48e1b05 100644
--- a/tests/integration/update_cluster/minimal-ipv6-cilium/data/aws_launch_template_master-us-test-1a.masters.minimal-ipv6.example.com_user_data
+++ b/tests/integration/update_cluster/minimal-ipv6-cilium/data/aws_launch_template_master-us-test-1a.masters.minimal-ipv6.example.com_user_data
@@ -128,7 +128,7 @@ ClusterName: minimal-ipv6.example.com
 ConfigBase: memfs://clusters.example.com/minimal-ipv6.example.com
 InstanceGroupName: master-us-test-1a
 InstanceGroupRole: ControlPlane
-NodeupConfigHash: pWu4UvFCxiR6ltORUwpbawpQlgsS6MDrz6FEJHvNERE=
+NodeupConfigHash: AXh8SkkK78DHAtIPu5BKCZKRj8unLn7jy2qyBkzXsxk=
 
 __EOF_KUBE_ENV
 
diff --git a/tests/integration/update_cluster/minimal-ipv6-cilium/data/aws_launch_template_nodes.minimal-ipv6.example.com_user_data b/tests/integration/update_cluster/minimal-ipv6-cilium/data/aws_launch_template_nodes.minimal-ipv6.example.com_user_data
index ae94cbdf31..86673c2cd7 100644
--- a/tests/integration/update_cluster/minimal-ipv6-cilium/data/aws_launch_template_nodes.minimal-ipv6.example.com_user_data
+++ b/tests/integration/update_cluster/minimal-ipv6-cilium/data/aws_launch_template_nodes.minimal-ipv6.example.com_user_data
@@ -151,7 +151,7 @@ ConfigServer:
   - https://kops-controller.internal.minimal-ipv6.example.com:3988/
 InstanceGroupName: nodes
 InstanceGroupRole: Node
-NodeupConfigHash: jJxQXCKy9Rh+574L2ORJByI5CTKA+rqVUmrdFEuBdXE=
+NodeupConfigHash: mb581ngfjjsrGpEbmnIJJvIcY4tCppCbbLiEW8P06wo=
 
 __EOF_KUBE_ENV
 
diff --git a/tests/integration/update_cluster/minimal-ipv6-cilium/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/minimal-ipv6-cilium/data/aws_s3_object_cluster-completed.spec_content
index 0c8fc351ea..3b29adebbc 100644
--- a/tests/integration/update_cluster/minimal-ipv6-cilium/data/aws_s3_object_cluster-completed.spec_content
+++ b/tests/integration/update_cluster/minimal-ipv6-cilium/data/aws_s3_object_cluster-completed.spec_content
@@ -28,15 +28,12 @@ spec:
   cloudProvider: aws
   clusterDNSDomain: cluster.local
   configBase: memfs://clusters.example.com/minimal-ipv6.example.com
-  containerRuntime: containerd
   containerd:
     logLevel: info
     runc:
       version: 1.1.5
     version: 1.6.20
   dnsZone: Z1AFAKE1ZON3YO
-  docker:
-    skipInstall: true
   etcdClusters:
   - backups:
       backupStore: memfs://clusters.example.com/minimal-ipv6.example.com/backups/etcd/main
diff --git a/tests/integration/update_cluster/minimal-ipv6-cilium/data/aws_s3_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/minimal-ipv6-cilium/data/aws_s3_object_nodeupconfig-master-us-test-1a_content
index f757b07789..aefaaed281 100644
--- a/tests/integration/update_cluster/minimal-ipv6-cilium/data/aws_s3_object_nodeupconfig-master-us-test-1a_content
+++ b/tests/integration/update_cluster/minimal-ipv6-cilium/data/aws_s3_object_nodeupconfig-master-us-test-1a_content
@@ -226,7 +226,6 @@ CAs:
     9B7UD2ushcVFPtaeoL9Gfu8aY4KJBeqqg5ojl4qmRnThjw==
     -----END CERTIFICATE-----
 ClusterName: minimal-ipv6.example.com
-ContainerRuntime: containerd
 ControlPlaneConfig:
   KubeControllerManager:
     allocateNodeCIDRs: false
@@ -322,8 +321,6 @@ containerdConfig:
   runc:
     version: 1.1.5
   version: 1.6.20
-docker:
-  skipInstall: true
 etcdManifests:
 - memfs://clusters.example.com/minimal-ipv6.example.com/manifests/etcd/main-master-us-test-1a.yaml
 - memfs://clusters.example.com/minimal-ipv6.example.com/manifests/etcd/events-master-us-test-1a.yaml
diff --git a/tests/integration/update_cluster/minimal-ipv6-cilium/data/aws_s3_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/minimal-ipv6-cilium/data/aws_s3_object_nodeupconfig-nodes_content
index 58e0f3191a..8706688527 100644
--- a/tests/integration/update_cluster/minimal-ipv6-cilium/data/aws_s3_object_nodeupconfig-nodes_content
+++ b/tests/integration/update_cluster/minimal-ipv6-cilium/data/aws_s3_object_nodeupconfig-nodes_content
@@ -13,7 +13,6 @@ Assets:
   - 54e79e4d48b9e191767e4abc08be1a8476a1c757e9a9f8c45c6ded001226867f@https://github.com/opencontainers/runc/releases/download/v1.1.5/runc.arm64
 CAs: {}
 ClusterName: minimal-ipv6.example.com
-ContainerRuntime: containerd
 Hooks:
 - null
 - null
@@ -56,7 +55,5 @@ containerdConfig:
   runc:
     version: 1.1.5
   version: 1.6.20
-docker:
-  skipInstall: true
 usesLegacyGossip: false
 usesNoneDNS: false
diff --git a/tests/integration/update_cluster/minimal-ipv6-no-subnet-prefix/data/aws_launch_template_master-us-test-1a.masters.minimal-ipv6.example.com_user_data b/tests/integration/update_cluster/minimal-ipv6-no-subnet-prefix/data/aws_launch_template_master-us-test-1a.masters.minimal-ipv6.example.com_user_data
index b3e65e1aa5..6ea78e043c 100644
--- a/tests/integration/update_cluster/minimal-ipv6-no-subnet-prefix/data/aws_launch_template_master-us-test-1a.masters.minimal-ipv6.example.com_user_data
+++ b/tests/integration/update_cluster/minimal-ipv6-no-subnet-prefix/data/aws_launch_template_master-us-test-1a.masters.minimal-ipv6.example.com_user_data
@@ -128,7 +128,7 @@ ClusterName: minimal-ipv6.example.com
 ConfigBase: memfs://clusters.example.com/minimal-ipv6.example.com
 InstanceGroupName: master-us-test-1a
 InstanceGroupRole: ControlPlane
-NodeupConfigHash: G7OfePOaOKHX1n1TdUcLJud8xoaPruBJVetp6J/OIqw=
+NodeupConfigHash: +TtM1FR2/n+SRvoQxZTMOK9el4NBwjQ1NkkqbqT8yhk=
 
 __EOF_KUBE_ENV
 
diff --git a/tests/integration/update_cluster/minimal-ipv6-no-subnet-prefix/data/aws_launch_template_nodes.minimal-ipv6.example.com_user_data b/tests/integration/update_cluster/minimal-ipv6-no-subnet-prefix/data/aws_launch_template_nodes.minimal-ipv6.example.com_user_data
index cef5f36d8f..cd1134d8ba 100644
--- a/tests/integration/update_cluster/minimal-ipv6-no-subnet-prefix/data/aws_launch_template_nodes.minimal-ipv6.example.com_user_data
+++ b/tests/integration/update_cluster/minimal-ipv6-no-subnet-prefix/data/aws_launch_template_nodes.minimal-ipv6.example.com_user_data
@@ -151,7 +151,7 @@ ConfigServer:
   - https://kops-controller.internal.minimal-ipv6.example.com:3988/
 InstanceGroupName: nodes
 InstanceGroupRole: Node
-NodeupConfigHash: Fyq1nPHVX1gVN9zblQQINjkgrZKVNmERUCa0x5v7Il8=
+NodeupConfigHash: GP8MRP/yUD7ZRbDc6COSxQV3j90Xk4S7+RPvdqETYfo=
 
 __EOF_KUBE_ENV
 
diff --git a/tests/integration/update_cluster/minimal-ipv6-no-subnet-prefix/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/minimal-ipv6-no-subnet-prefix/data/aws_s3_object_cluster-completed.spec_content
index 0f6eb6e8ff..20f037b968 100644
--- a/tests/integration/update_cluster/minimal-ipv6-no-subnet-prefix/data/aws_s3_object_cluster-completed.spec_content
+++ b/tests/integration/update_cluster/minimal-ipv6-no-subnet-prefix/data/aws_s3_object_cluster-completed.spec_content
@@ -28,15 +28,12 @@ spec:
   cloudProvider: aws
   clusterDNSDomain: cluster.local
   configBase: memfs://clusters.example.com/minimal-ipv6.example.com
-  containerRuntime: containerd
   containerd:
     logLevel: info
     runc:
       version: 1.1.5
     version: 1.6.20
   dnsZone: Z1AFAKE1ZON3YO
-  docker:
-    skipInstall: true
   etcdClusters:
   - backups:
       backupStore: memfs://clusters.example.com/minimal-ipv6.example.com/backups/etcd/main
diff --git a/tests/integration/update_cluster/minimal-ipv6-no-subnet-prefix/data/aws_s3_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/minimal-ipv6-no-subnet-prefix/data/aws_s3_object_nodeupconfig-master-us-test-1a_content
index 43e6217b26..4def1257ab 100644
--- a/tests/integration/update_cluster/minimal-ipv6-no-subnet-prefix/data/aws_s3_object_nodeupconfig-master-us-test-1a_content
+++ b/tests/integration/update_cluster/minimal-ipv6-no-subnet-prefix/data/aws_s3_object_nodeupconfig-master-us-test-1a_content
@@ -226,7 +226,6 @@ CAs:
     9B7UD2ushcVFPtaeoL9Gfu8aY4KJBeqqg5ojl4qmRnThjw==
     -----END CERTIFICATE-----
 ClusterName: minimal-ipv6.example.com
-ContainerRuntime: containerd
 ControlPlaneConfig:
   KubeControllerManager:
     allocateNodeCIDRs: false
@@ -321,8 +320,6 @@ containerdConfig:
   runc:
     version: 1.1.5
   version: 1.6.20
-docker:
-  skipInstall: true
 etcdManifests:
 - memfs://clusters.example.com/minimal-ipv6.example.com/manifests/etcd/main-master-us-test-1a.yaml
 - memfs://clusters.example.com/minimal-ipv6.example.com/manifests/etcd/events-master-us-test-1a.yaml
diff --git a/tests/integration/update_cluster/minimal-ipv6-no-subnet-prefix/data/aws_s3_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/minimal-ipv6-no-subnet-prefix/data/aws_s3_object_nodeupconfig-nodes_content
index 53610796b9..34d4b27f27 100644
--- a/tests/integration/update_cluster/minimal-ipv6-no-subnet-prefix/data/aws_s3_object_nodeupconfig-nodes_content
+++ b/tests/integration/update_cluster/minimal-ipv6-no-subnet-prefix/data/aws_s3_object_nodeupconfig-nodes_content
@@ -13,7 +13,6 @@ Assets:
   - 54e79e4d48b9e191767e4abc08be1a8476a1c757e9a9f8c45c6ded001226867f@https://github.com/opencontainers/runc/releases/download/v1.1.5/runc.arm64
 CAs: {}
 ClusterName: minimal-ipv6.example.com
-ContainerRuntime: containerd
 Hooks:
 - null
 - null
@@ -55,7 +54,5 @@ containerdConfig:
   runc:
     version: 1.1.5
   version: 1.6.20
-docker:
-  skipInstall: true
 usesLegacyGossip: false
 usesNoneDNS: false
diff --git a/tests/integration/update_cluster/minimal-ipv6/data/aws_launch_template_master-us-test-1a.masters.minimal-ipv6.example.com_user_data b/tests/integration/update_cluster/minimal-ipv6/data/aws_launch_template_master-us-test-1a.masters.minimal-ipv6.example.com_user_data
index b3e65e1aa5..6ea78e043c 100644
--- a/tests/integration/update_cluster/minimal-ipv6/data/aws_launch_template_master-us-test-1a.masters.minimal-ipv6.example.com_user_data
+++ b/tests/integration/update_cluster/minimal-ipv6/data/aws_launch_template_master-us-test-1a.masters.minimal-ipv6.example.com_user_data
@@ -128,7 +128,7 @@ ClusterName: minimal-ipv6.example.com
 ConfigBase: memfs://clusters.example.com/minimal-ipv6.example.com
 InstanceGroupName: master-us-test-1a
 InstanceGroupRole: ControlPlane
-NodeupConfigHash: G7OfePOaOKHX1n1TdUcLJud8xoaPruBJVetp6J/OIqw=
+NodeupConfigHash: +TtM1FR2/n+SRvoQxZTMOK9el4NBwjQ1NkkqbqT8yhk=
 
 __EOF_KUBE_ENV
 
diff --git a/tests/integration/update_cluster/minimal-ipv6/data/aws_launch_template_nodes.minimal-ipv6.example.com_user_data b/tests/integration/update_cluster/minimal-ipv6/data/aws_launch_template_nodes.minimal-ipv6.example.com_user_data
index cef5f36d8f..cd1134d8ba 100644
--- a/tests/integration/update_cluster/minimal-ipv6/data/aws_launch_template_nodes.minimal-ipv6.example.com_user_data
+++ b/tests/integration/update_cluster/minimal-ipv6/data/aws_launch_template_nodes.minimal-ipv6.example.com_user_data
@@ -151,7 +151,7 @@ ConfigServer:
   - https://kops-controller.internal.minimal-ipv6.example.com:3988/
 InstanceGroupName: nodes
 InstanceGroupRole: Node
-NodeupConfigHash: Fyq1nPHVX1gVN9zblQQINjkgrZKVNmERUCa0x5v7Il8=
+NodeupConfigHash: GP8MRP/yUD7ZRbDc6COSxQV3j90Xk4S7+RPvdqETYfo=
 
 __EOF_KUBE_ENV
 
diff --git a/tests/integration/update_cluster/minimal-ipv6/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/minimal-ipv6/data/aws_s3_object_cluster-completed.spec_content
index a55e2acdb3..bb5c7a2c90 100644
--- a/tests/integration/update_cluster/minimal-ipv6/data/aws_s3_object_cluster-completed.spec_content
+++ b/tests/integration/update_cluster/minimal-ipv6/data/aws_s3_object_cluster-completed.spec_content
@@ -28,15 +28,12 @@ spec:
   cloudProvider: aws
   clusterDNSDomain: cluster.local
   configBase: memfs://clusters.example.com/minimal-ipv6.example.com
-  containerRuntime: containerd
   containerd:
     logLevel: info
     runc:
       version: 1.1.5
     version: 1.6.20
   dnsZone: Z1AFAKE1ZON3YO
-  docker:
-    skipInstall: true
   etcdClusters:
   - backups:
       backupStore: memfs://clusters.example.com/minimal-ipv6.example.com/backups/etcd/main
diff --git a/tests/integration/update_cluster/minimal-ipv6/data/aws_s3_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/minimal-ipv6/data/aws_s3_object_nodeupconfig-master-us-test-1a_content
index 43e6217b26..4def1257ab 100644
--- a/tests/integration/update_cluster/minimal-ipv6/data/aws_s3_object_nodeupconfig-master-us-test-1a_content
+++ b/tests/integration/update_cluster/minimal-ipv6/data/aws_s3_object_nodeupconfig-master-us-test-1a_content
@@ -226,7 +226,6 @@ CAs:
     9B7UD2ushcVFPtaeoL9Gfu8aY4KJBeqqg5ojl4qmRnThjw==
     -----END CERTIFICATE-----
 ClusterName: minimal-ipv6.example.com
-ContainerRuntime: containerd
 ControlPlaneConfig:
   KubeControllerManager:
     allocateNodeCIDRs: false
@@ -321,8 +320,6 @@ containerdConfig:
   runc:
     version: 1.1.5
   version: 1.6.20
-docker:
-  skipInstall: true
 etcdManifests:
 - memfs://clusters.example.com/minimal-ipv6.example.com/manifests/etcd/main-master-us-test-1a.yaml
 - memfs://clusters.example.com/minimal-ipv6.example.com/manifests/etcd/events-master-us-test-1a.yaml
diff --git a/tests/integration/update_cluster/minimal-ipv6/data/aws_s3_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/minimal-ipv6/data/aws_s3_object_nodeupconfig-nodes_content
index 53610796b9..34d4b27f27 100644
--- a/tests/integration/update_cluster/minimal-ipv6/data/aws_s3_object_nodeupconfig-nodes_content
+++ b/tests/integration/update_cluster/minimal-ipv6/data/aws_s3_object_nodeupconfig-nodes_content
@@ -13,7 +13,6 @@ Assets:
   - 54e79e4d48b9e191767e4abc08be1a8476a1c757e9a9f8c45c6ded001226867f@https://github.com/opencontainers/runc/releases/download/v1.1.5/runc.arm64
 CAs: {}
 ClusterName: minimal-ipv6.example.com
-ContainerRuntime: containerd
 Hooks:
 - null
 - null
@@ -55,7 +54,5 @@ containerdConfig:
   runc:
     version: 1.1.5
   version: 1.6.20
-docker:
-  skipInstall: true
 usesLegacyGossip: false
 usesNoneDNS: false
diff --git a/tests/integration/update_cluster/minimal-longclustername/data/aws_launch_template_master-us-test-1a.masters.this.is.truly.a.really.really.long.cluster-name.minimal.example.com_user_data b/tests/integration/update_cluster/minimal-longclustername/data/aws_launch_template_master-us-test-1a.masters.this.is.truly.a.really.really.long.cluster-name.minimal.example.com_user_data
index 79c8f80313..16d276a443 100644
--- a/tests/integration/update_cluster/minimal-longclustername/data/aws_launch_template_master-us-test-1a.masters.this.is.truly.a.really.really.long.cluster-name.minimal.example.com_user_data
+++ b/tests/integration/update_cluster/minimal-longclustername/data/aws_launch_template_master-us-test-1a.masters.this.is.truly.a.really.really.long.cluster-name.minimal.example.com_user_data
@@ -128,7 +128,7 @@ ClusterName: this.is.truly.a.really.really.long.cluster-name.minimal.example.com
 ConfigBase: memfs://clusters.example.com/this.is.truly.a.really.really.long.cluster-name.minimal.example.com
 InstanceGroupName: master-us-test-1a
 InstanceGroupRole: ControlPlane
-NodeupConfigHash: f29ufGsPnN76WHiwTjnQK1GfYT329crMUGg64zOKi/Q=
+NodeupConfigHash: v8zLeAqmaUT5gfPbkZozmxs61SY9/zoH2UdlZ776feA=
 
 __EOF_KUBE_ENV
 
diff --git a/tests/integration/update_cluster/minimal-longclustername/data/aws_launch_template_nodes.this.is.truly.a.really.really.long.cluster-name.minimal.example.com_user_data b/tests/integration/update_cluster/minimal-longclustername/data/aws_launch_template_nodes.this.is.truly.a.really.really.long.cluster-name.minimal.example.com_user_data
index 7d6f3ff971..6991f14c71 100644
--- a/tests/integration/update_cluster/minimal-longclustername/data/aws_launch_template_nodes.this.is.truly.a.really.really.long.cluster-name.minimal.example.com_user_data
+++ b/tests/integration/update_cluster/minimal-longclustername/data/aws_launch_template_nodes.this.is.truly.a.really.really.long.cluster-name.minimal.example.com_user_data
@@ -151,7 +151,7 @@ ConfigServer:
   - https://kops-controller.internal.this.is.truly.a.really.really.long.cluster-name.minimal.example.com:3988/
 InstanceGroupName: nodes
 InstanceGroupRole: Node
-NodeupConfigHash: a/yGtqV6chYOltu1G5+uw6q5D7nXd4lXIiRh3dqbyqo=
+NodeupConfigHash: h8tvtadRRvuW/e/HUs5lCkAEey7oP2xvXd/ILcJIVss=
 
 __EOF_KUBE_ENV
 
diff --git a/tests/integration/update_cluster/minimal-longclustername/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/minimal-longclustername/data/aws_s3_object_cluster-completed.spec_content
index b9e0315331..3065338399 100644
--- a/tests/integration/update_cluster/minimal-longclustername/data/aws_s3_object_cluster-completed.spec_content
+++ b/tests/integration/update_cluster/minimal-longclustername/data/aws_s3_object_cluster-completed.spec_content
@@ -24,15 +24,12 @@ spec:
   cloudProvider: aws
   clusterDNSDomain: cluster.local
   configBase: memfs://clusters.example.com/this.is.truly.a.really.really.long.cluster-name.minimal.example.com
-  containerRuntime: containerd
   containerd:
     logLevel: info
     runc:
       version: 1.1.5
     version: 1.6.20
   dnsZone: Z1AFAKE1ZON3YO
-  docker:
-    skipInstall: true
   etcdClusters:
   - backups:
       backupStore: memfs://clusters.example.com/this.is.truly.a.really.really.long.cluster-name.minimal.example.com/backups/etcd/main
diff --git a/tests/integration/update_cluster/minimal-longclustername/data/aws_s3_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/minimal-longclustername/data/aws_s3_object_nodeupconfig-master-us-test-1a_content
index 32aeff88f2..ea318f1bc9 100644
--- a/tests/integration/update_cluster/minimal-longclustername/data/aws_s3_object_nodeupconfig-master-us-test-1a_content
+++ b/tests/integration/update_cluster/minimal-longclustername/data/aws_s3_object_nodeupconfig-master-us-test-1a_content
@@ -227,7 +227,6 @@ CAs:
     9B7UD2ushcVFPtaeoL9Gfu8aY4KJBeqqg5ojl4qmRnThjw==
     -----END CERTIFICATE-----
 ClusterName: this.is.truly.a.really.really.long.cluster-name.minimal.example.com
-ContainerRuntime: containerd
 ControlPlaneConfig:
   KubeControllerManager:
     allocateNodeCIDRs: true
@@ -320,8 +319,6 @@ containerdConfig:
   runc:
     version: 1.1.5
   version: 1.6.20
-docker:
-  skipInstall: true
 etcdManifests:
 - memfs://clusters.example.com/this.is.truly.a.really.really.long.cluster-name.minimal.example.com/manifests/etcd/main-master-us-test-1a.yaml
 - memfs://clusters.example.com/this.is.truly.a.really.really.long.cluster-name.minimal.example.com/manifests/etcd/events-master-us-test-1a.yaml
diff --git a/tests/integration/update_cluster/minimal-longclustername/data/aws_s3_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/minimal-longclustername/data/aws_s3_object_nodeupconfig-nodes_content
index c5f1918383..d96555c8ec 100644
--- a/tests/integration/update_cluster/minimal-longclustername/data/aws_s3_object_nodeupconfig-nodes_content
+++ b/tests/integration/update_cluster/minimal-longclustername/data/aws_s3_object_nodeupconfig-nodes_content
@@ -13,7 +13,6 @@ Assets:
   - 54e79e4d48b9e191767e4abc08be1a8476a1c757e9a9f8c45c6ded001226867f@https://github.com/opencontainers/runc/releases/download/v1.1.5/runc.arm64
 CAs: {}
 ClusterName: this.is.truly.a.really.really.long.cluster-name.minimal.example.com
-ContainerRuntime: containerd
 Hooks:
 - null
 - null
@@ -55,7 +54,5 @@ containerdConfig:
   runc:
     version: 1.1.5
   version: 1.6.20
-docker:
-  skipInstall: true
 usesLegacyGossip: false
 usesNoneDNS: false
diff --git a/tests/integration/update_cluster/minimal-warmpool/data/aws_launch_template_master-us-test-1a.masters.minimal-warmpool.example.com_user_data b/tests/integration/update_cluster/minimal-warmpool/data/aws_launch_template_master-us-test-1a.masters.minimal-warmpool.example.com_user_data
index 80f7ade91d..eea1668693 100644
--- a/tests/integration/update_cluster/minimal-warmpool/data/aws_launch_template_master-us-test-1a.masters.minimal-warmpool.example.com_user_data
+++ b/tests/integration/update_cluster/minimal-warmpool/data/aws_launch_template_master-us-test-1a.masters.minimal-warmpool.example.com_user_data
@@ -128,7 +128,7 @@ ClusterName: minimal-warmpool.example.com
 ConfigBase: memfs://clusters.example.com/minimal-warmpool.example.com
 InstanceGroupName: master-us-test-1a
 InstanceGroupRole: ControlPlane
-NodeupConfigHash: RPsI3heT3YuSwN5jrgUgaL1goqbbYNveJose+VzWL9A=
+NodeupConfigHash: 0EsoRsiNpVhjJYFAuwctNxu9VBIBV/TIMNvxcvfJGAM=
 
 __EOF_KUBE_ENV
 
diff --git a/tests/integration/update_cluster/minimal-warmpool/data/aws_launch_template_nodes.minimal-warmpool.example.com_user_data b/tests/integration/update_cluster/minimal-warmpool/data/aws_launch_template_nodes.minimal-warmpool.example.com_user_data
index 092642a600..c43b43a3d0 100644
--- a/tests/integration/update_cluster/minimal-warmpool/data/aws_launch_template_nodes.minimal-warmpool.example.com_user_data
+++ b/tests/integration/update_cluster/minimal-warmpool/data/aws_launch_template_nodes.minimal-warmpool.example.com_user_data
@@ -151,7 +151,7 @@ ConfigServer:
   - https://kops-controller.internal.minimal-warmpool.example.com:3988/
 InstanceGroupName: nodes
 InstanceGroupRole: Node
-NodeupConfigHash: ZBgc1hl+oGkpW+j/LFlffh0VP5X2yCWj/jMm05iYZjs=
+NodeupConfigHash: ixr/jHtjzunYpmsBwkCwqeEL1lBBh7cpOWEMPi1HAvA=
 
 __EOF_KUBE_ENV
 
diff --git a/tests/integration/update_cluster/minimal-warmpool/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/minimal-warmpool/data/aws_s3_object_cluster-completed.spec_content
index 870195ef8b..66de8bca22 100644
--- a/tests/integration/update_cluster/minimal-warmpool/data/aws_s3_object_cluster-completed.spec_content
+++ b/tests/integration/update_cluster/minimal-warmpool/data/aws_s3_object_cluster-completed.spec_content
@@ -24,15 +24,12 @@ spec:
   cloudProvider: aws
   clusterDNSDomain: cluster.local
   configBase: memfs://clusters.example.com/minimal-warmpool.example.com
-  containerRuntime: containerd
   containerd:
     logLevel: info
     runc:
       version: 1.1.5
     version: 1.6.20
   dnsZone: Z1AFAKE1ZON3YO
-  docker:
-    skipInstall: true
   etcdClusters:
   - backups:
       backupStore: memfs://clusters.example.com/minimal-warmpool.example.com/backups/etcd/main
diff --git a/tests/integration/update_cluster/minimal-warmpool/data/aws_s3_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/minimal-warmpool/data/aws_s3_object_nodeupconfig-master-us-test-1a_content
index 282c42788a..f88ea10841 100644
--- a/tests/integration/update_cluster/minimal-warmpool/data/aws_s3_object_nodeupconfig-master-us-test-1a_content
+++ b/tests/integration/update_cluster/minimal-warmpool/data/aws_s3_object_nodeupconfig-master-us-test-1a_content
@@ -227,7 +227,6 @@ CAs:
     9B7UD2ushcVFPtaeoL9Gfu8aY4KJBeqqg5ojl4qmRnThjw==
     -----END CERTIFICATE-----
 ClusterName: minimal-warmpool.example.com
-ContainerRuntime: containerd
 ControlPlaneConfig:
   KubeControllerManager:
     allocateNodeCIDRs: true
@@ -322,8 +321,6 @@ containerdConfig:
   runc:
     version: 1.1.5
   version: 1.6.20
-docker:
-  skipInstall: true
 etcdManifests:
 - memfs://clusters.example.com/minimal-warmpool.example.com/manifests/etcd/main-master-us-test-1a.yaml
 - memfs://clusters.example.com/minimal-warmpool.example.com/manifests/etcd/events-master-us-test-1a.yaml
diff --git a/tests/integration/update_cluster/minimal-warmpool/data/aws_s3_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/minimal-warmpool/data/aws_s3_object_nodeupconfig-nodes_content
index cda8187dac..75052880d5 100644
--- a/tests/integration/update_cluster/minimal-warmpool/data/aws_s3_object_nodeupconfig-nodes_content
+++ b/tests/integration/update_cluster/minimal-warmpool/data/aws_s3_object_nodeupconfig-nodes_content
@@ -13,7 +13,6 @@ Assets:
   - 54e79e4d48b9e191767e4abc08be1a8476a1c757e9a9f8c45c6ded001226867f@https://github.com/opencontainers/runc/releases/download/v1.1.5/runc.arm64
 CAs: {}
 ClusterName: minimal-warmpool.example.com
-ContainerRuntime: containerd
 EnableLifecycleHook: true
 Hooks:
 - null
@@ -58,8 +57,6 @@ containerdConfig:
   runc:
     version: 1.1.5
   version: 1.6.20
-docker:
-  skipInstall: true
 usesLegacyGossip: false
 usesNoneDNS: false
 warmPoolImages:
diff --git a/tests/integration/update_cluster/minimal/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data b/tests/integration/update_cluster/minimal/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data
index 12fb417125..e5d6a262c8 100644
--- a/tests/integration/update_cluster/minimal/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data
+++ b/tests/integration/update_cluster/minimal/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data
@@ -128,7 +128,7 @@ ClusterName: minimal.example.com
 ConfigBase: memfs://clusters.example.com/minimal.example.com
 InstanceGroupName: master-us-test-1a
 InstanceGroupRole: ControlPlane
-NodeupConfigHash: dwH1kgoBZy45J3Lrp6esfu5QnlLXcdslDlGUUCslaCs=
+NodeupConfigHash: QagSzGJDRHMhvxCLRpxXO4c5OA7jFPrkYDsQXuX5rcA=
 
 __EOF_KUBE_ENV
 
diff --git a/tests/integration/update_cluster/minimal/data/aws_launch_template_nodes.minimal.example.com_user_data b/tests/integration/update_cluster/minimal/data/aws_launch_template_nodes.minimal.example.com_user_data
index 9782921e6a..0e41f80b48 100644
--- a/tests/integration/update_cluster/minimal/data/aws_launch_template_nodes.minimal.example.com_user_data
+++ b/tests/integration/update_cluster/minimal/data/aws_launch_template_nodes.minimal.example.com_user_data
@@ -151,7 +151,7 @@ ConfigServer:
   - https://kops-controller.internal.minimal.example.com:3988/
 InstanceGroupName: nodes
 InstanceGroupRole: Node
-NodeupConfigHash: wWfg3lUVvc5JnieJ+yIlyQYLTf7ha3hhrn1k+YPzgQs=
+NodeupConfigHash: UBbsPilnsB+d3omFZyCe7V9SkoyT5i2GG2RQrrvGhYc=
 
 __EOF_KUBE_ENV
 
diff --git a/tests/integration/update_cluster/minimal/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/minimal/data/aws_s3_object_cluster-completed.spec_content
index 23365731c2..b81de7a392 100644
--- a/tests/integration/update_cluster/minimal/data/aws_s3_object_cluster-completed.spec_content
+++ b/tests/integration/update_cluster/minimal/data/aws_s3_object_cluster-completed.spec_content
@@ -24,15 +24,12 @@ spec:
   cloudProvider: aws
   clusterDNSDomain: cluster.local
   configBase: memfs://clusters.example.com/minimal.example.com
-  containerRuntime: containerd
   containerd:
     logLevel: info
     runc:
       version: 1.1.5
     version: 1.6.20
   dnsZone: Z1AFAKE1ZON3YO
-  docker:
-    skipInstall: true
   etcdClusters:
   - backups:
       backupStore: memfs://clusters.example.com/minimal.example.com/backups/etcd/main
diff --git a/tests/integration/update_cluster/minimal/data/aws_s3_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/minimal/data/aws_s3_object_nodeupconfig-master-us-test-1a_content
index 3a1d2dd250..6a11941b69 100644
--- a/tests/integration/update_cluster/minimal/data/aws_s3_object_nodeupconfig-master-us-test-1a_content
+++ b/tests/integration/update_cluster/minimal/data/aws_s3_object_nodeupconfig-master-us-test-1a_content
@@ -228,7 +228,6 @@ CAs:
     9B7UD2ushcVFPtaeoL9Gfu8aY4KJBeqqg5ojl4qmRnThjw==
     -----END CERTIFICATE-----
 ClusterName: minimal.example.com
-ContainerRuntime: containerd
 ControlPlaneConfig:
   KubeControllerManager:
     allocateNodeCIDRs: true
@@ -318,8 +317,6 @@ containerdConfig:
   runc:
     version: 1.1.5
   version: 1.6.20
-docker:
-  skipInstall: true
 etcdManifests:
 - memfs://clusters.example.com/minimal.example.com/manifests/etcd/main-master-us-test-1a.yaml
 - memfs://clusters.example.com/minimal.example.com/manifests/etcd/events-master-us-test-1a.yaml
diff --git a/tests/integration/update_cluster/minimal/data/aws_s3_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/minimal/data/aws_s3_object_nodeupconfig-nodes_content
index da42bf207a..6965042314 100644
--- a/tests/integration/update_cluster/minimal/data/aws_s3_object_nodeupconfig-nodes_content
+++ b/tests/integration/update_cluster/minimal/data/aws_s3_object_nodeupconfig-nodes_content
@@ -15,7 +15,6 @@ Assets:
   - 54e79e4d48b9e191767e4abc08be1a8476a1c757e9a9f8c45c6ded001226867f@https://github.com/opencontainers/runc/releases/download/v1.1.5/runc.arm64
 CAs: {}
 ClusterName: minimal.example.com
-ContainerRuntime: containerd
 Hooks:
 - null
 - null
@@ -56,7 +55,5 @@ containerdConfig:
   runc:
     version: 1.1.5
   version: 1.6.20
-docker:
-  skipInstall: true
 usesLegacyGossip: false
 usesNoneDNS: false
diff --git a/tests/integration/update_cluster/minimal_gce/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/minimal_gce/data/aws_s3_object_cluster-completed.spec_content
index cfd38b6b2d..ae8279b500 100644
--- a/tests/integration/update_cluster/minimal_gce/data/aws_s3_object_cluster-completed.spec_content
+++ b/tests/integration/update_cluster/minimal_gce/data/aws_s3_object_cluster-completed.spec_content
@@ -26,15 +26,12 @@ spec:
   cloudProvider: gce
   clusterDNSDomain: cluster.local
   configBase: memfs://tests/minimal-gce.example.com
-  containerRuntime: containerd
   containerd:
     logLevel: info
     runc:
       version: 1.1.5
     version: 1.6.20
   dnsZone: "1"
-  docker:
-    skipInstall: true
   etcdClusters:
   - backups:
       backupStore: memfs://tests/minimal-gce.example.com/backups/etcd/main
diff --git a/tests/integration/update_cluster/minimal_gce/data/aws_s3_object_nodeupconfig-master-us-test1-a_content b/tests/integration/update_cluster/minimal_gce/data/aws_s3_object_nodeupconfig-master-us-test1-a_content
index c3402da015..17ce9dac91 100644
--- a/tests/integration/update_cluster/minimal_gce/data/aws_s3_object_nodeupconfig-master-us-test1-a_content
+++ b/tests/integration/update_cluster/minimal_gce/data/aws_s3_object_nodeupconfig-master-us-test1-a_content
@@ -226,7 +226,6 @@ CAs:
     9B7UD2ushcVFPtaeoL9Gfu8aY4KJBeqqg5ojl4qmRnThjw==
     -----END CERTIFICATE-----
 ClusterName: minimal-gce.example.com
-ContainerRuntime: containerd
 ControlPlaneConfig:
   KubeControllerManager:
     allocateNodeCIDRs: true
@@ -312,8 +311,6 @@ containerdConfig:
   runc:
     version: 1.1.5
   version: 1.6.20
-docker:
-  skipInstall: true
 etcdManifests:
 - memfs://tests/minimal-gce.example.com/manifests/etcd/main-master-us-test1-a.yaml
 - memfs://tests/minimal-gce.example.com/manifests/etcd/events-master-us-test1-a.yaml
diff --git a/tests/integration/update_cluster/minimal_gce/data/aws_s3_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/minimal_gce/data/aws_s3_object_nodeupconfig-nodes_content
index d87de52821..a6c9d1996d 100644
--- a/tests/integration/update_cluster/minimal_gce/data/aws_s3_object_nodeupconfig-nodes_content
+++ b/tests/integration/update_cluster/minimal_gce/data/aws_s3_object_nodeupconfig-nodes_content
@@ -15,7 +15,6 @@ Assets:
   - 54e79e4d48b9e191767e4abc08be1a8476a1c757e9a9f8c45c6ded001226867f@https://github.com/opencontainers/runc/releases/download/v1.1.5/runc.arm64
 CAs: {}
 ClusterName: minimal-gce.example.com
-ContainerRuntime: containerd
 Hooks:
 - null
 - null
@@ -56,8 +55,6 @@ containerdConfig:
   runc:
     version: 1.1.5
   version: 1.6.20
-docker:
-  skipInstall: true
 multizone: true
 nodeTags: minimal-gce-example-com-k8s-io-role-node
 usesLegacyGossip: false
diff --git a/tests/integration/update_cluster/minimal_gce/data/google_compute_instance_template_master-us-test1-a-minimal-gce-example-com_metadata_user-data b/tests/integration/update_cluster/minimal_gce/data/google_compute_instance_template_master-us-test1-a-minimal-gce-example-com_metadata_user-data
index f9a9d9bdd5..074e66f692 100644
--- a/tests/integration/update_cluster/minimal_gce/data/google_compute_instance_template_master-us-test1-a-minimal-gce-example-com_metadata_user-data
+++ b/tests/integration/update_cluster/minimal_gce/data/google_compute_instance_template_master-us-test1-a-minimal-gce-example-com_metadata_user-data
@@ -127,7 +127,7 @@ ClusterName: minimal-gce.example.com
 ConfigBase: memfs://tests/minimal-gce.example.com
 InstanceGroupName: master-us-test1-a
 InstanceGroupRole: ControlPlane
-NodeupConfigHash: HqprtErMytA+TMKKqGyvvuB8PdcEwDvK2LXXjAFAGHM=
+NodeupConfigHash: iMNYLTCBdUdshnrJ2ORXmG8eA3QKRXN/BxF7wbGVvGQ=
 
 __EOF_KUBE_ENV
 
diff --git a/tests/integration/update_cluster/minimal_gce/data/google_compute_instance_template_nodes-minimal-gce-example-com_metadata_user-data b/tests/integration/update_cluster/minimal_gce/data/google_compute_instance_template_nodes-minimal-gce-example-com_metadata_user-data
index 44f3b76320..d5cd1b3ad9 100644
--- a/tests/integration/update_cluster/minimal_gce/data/google_compute_instance_template_nodes-minimal-gce-example-com_metadata_user-data
+++ b/tests/integration/update_cluster/minimal_gce/data/google_compute_instance_template_nodes-minimal-gce-example-com_metadata_user-data
@@ -150,7 +150,7 @@ ConfigServer:
   - https://kops-controller.internal.minimal-gce.example.com:3988/
 InstanceGroupName: nodes
 InstanceGroupRole: Node
-NodeupConfigHash: UfIT6ZSLaUTWdixdfshPAy/JvtFlUVJgbiV3EJlFxQE=
+NodeupConfigHash: F5EalVlSFGzjPP0WcIn8nIMg9oWTPBQ9820lcuz8mwk=
 
 __EOF_KUBE_ENV
 
diff --git a/tests/integration/update_cluster/minimal_gce_dns-none/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/minimal_gce_dns-none/data/aws_s3_object_cluster-completed.spec_content
index 7de5334b9e..3a903dbf3f 100644
--- a/tests/integration/update_cluster/minimal_gce_dns-none/data/aws_s3_object_cluster-completed.spec_content
+++ b/tests/integration/update_cluster/minimal_gce_dns-none/data/aws_s3_object_cluster-completed.spec_content
@@ -30,14 +30,11 @@ spec:
   cloudProvider: gce
   clusterDNSDomain: cluster.local
   configBase: memfs://tests/minimal-gce.example.com
-  containerRuntime: containerd
   containerd:
     logLevel: info
     runc:
       version: 1.1.5
     version: 1.6.20
-  docker:
-    skipInstall: true
   etcdClusters:
   - backups:
       backupStore: memfs://tests/minimal-gce.example.com/backups/etcd/main
diff --git a/tests/integration/update_cluster/minimal_gce_dns-none/data/aws_s3_object_nodeupconfig-master-us-test1-a_content b/tests/integration/update_cluster/minimal_gce_dns-none/data/aws_s3_object_nodeupconfig-master-us-test1-a_content
index ffa5ef618e..cb164f4ce9 100644
--- a/tests/integration/update_cluster/minimal_gce_dns-none/data/aws_s3_object_nodeupconfig-master-us-test1-a_content
+++ b/tests/integration/update_cluster/minimal_gce_dns-none/data/aws_s3_object_nodeupconfig-master-us-test1-a_content
@@ -227,7 +227,6 @@ CAs:
     9B7UD2ushcVFPtaeoL9Gfu8aY4KJBeqqg5ojl4qmRnThjw==
     -----END CERTIFICATE-----
 ClusterName: minimal-gce.example.com
-ContainerRuntime: containerd
 ControlPlaneConfig:
   KubeControllerManager:
     allocateNodeCIDRs: true
@@ -312,8 +311,6 @@ containerdConfig:
   runc:
     version: 1.1.5
   version: 1.6.20
-docker:
-  skipInstall: true
 etcdManifests:
 - memfs://tests/minimal-gce.example.com/manifests/etcd/main-master-us-test1-a.yaml
 - memfs://tests/minimal-gce.example.com/manifests/etcd/events-master-us-test1-a.yaml
diff --git a/tests/integration/update_cluster/minimal_gce_dns-none/data/aws_s3_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/minimal_gce_dns-none/data/aws_s3_object_nodeupconfig-nodes_content
index 7ea30b8453..5dab63fa10 100644
--- a/tests/integration/update_cluster/minimal_gce_dns-none/data/aws_s3_object_nodeupconfig-nodes_content
+++ b/tests/integration/update_cluster/minimal_gce_dns-none/data/aws_s3_object_nodeupconfig-nodes_content
@@ -15,7 +15,6 @@ Assets:
   - 54e79e4d48b9e191767e4abc08be1a8476a1c757e9a9f8c45c6ded001226867f@https://github.com/opencontainers/runc/releases/download/v1.1.5/runc.arm64
 CAs: {}
 ClusterName: minimal-gce.example.com
-ContainerRuntime: containerd
 Hooks:
 - null
 - null
@@ -56,8 +55,6 @@ containerdConfig:
   runc:
     version: 1.1.5
   version: 1.6.20
-docker:
-  skipInstall: true
 multizone: true
 nodeTags: minimal-gce-example-com-k8s-io-role-node
 usesLegacyGossip: false
diff --git a/tests/integration/update_cluster/minimal_gce_dns-none/data/google_compute_instance_template_master-us-test1-a-minimal-gce-example-com_metadata_user-data b/tests/integration/update_cluster/minimal_gce_dns-none/data/google_compute_instance_template_master-us-test1-a-minimal-gce-example-com_metadata_user-data
index f4371c9ad7..27569a7870 100644
--- a/tests/integration/update_cluster/minimal_gce_dns-none/data/google_compute_instance_template_master-us-test1-a-minimal-gce-example-com_metadata_user-data
+++ b/tests/integration/update_cluster/minimal_gce_dns-none/data/google_compute_instance_template_master-us-test1-a-minimal-gce-example-com_metadata_user-data
@@ -127,7 +127,7 @@ ClusterName: minimal-gce.example.com
 ConfigBase: memfs://tests/minimal-gce.example.com
 InstanceGroupName: master-us-test1-a
 InstanceGroupRole: ControlPlane
-NodeupConfigHash: JlzHo4wVuoExUzlYi13zPD8b8HuKExpFQ694kdezs6o=
+NodeupConfigHash: xKwQ4nMHs+9KHmaZdOrJvI+E70geSeRjgooBpvKkLls=
 
 __EOF_KUBE_ENV
 
diff --git a/tests/integration/update_cluster/minimal_gce_dns-none/data/google_compute_instance_template_nodes-minimal-gce-example-com_metadata_user-data b/tests/integration/update_cluster/minimal_gce_dns-none/data/google_compute_instance_template_nodes-minimal-gce-example-com_metadata_user-data
index a5d77ac880..4dbee9a49d 100644
--- a/tests/integration/update_cluster/minimal_gce_dns-none/data/google_compute_instance_template_nodes-minimal-gce-example-com_metadata_user-data
+++ b/tests/integration/update_cluster/minimal_gce_dns-none/data/google_compute_instance_template_nodes-minimal-gce-example-com_metadata_user-data
@@ -150,7 +150,7 @@ ConfigServer:
   - https://kops-controller.internal.minimal-gce.example.com:3988/
 InstanceGroupName: nodes
 InstanceGroupRole: Node
-NodeupConfigHash: Ja2b5Gwr5TfUgtMuAVq5Nb1NnpmiJ80CZLD3ACs5hAs=
+NodeupConfigHash: qQpu1nRmqODOJgAMp9PG8Tp1lu/MeDocy/7yPTOpVBM=
 
 __EOF_KUBE_ENV
 
diff --git a/tests/integration/update_cluster/minimal_gce_ilb/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/minimal_gce_ilb/data/aws_s3_object_cluster-completed.spec_content
index 16aa5c97a4..89c4bea0f1 100644
--- a/tests/integration/update_cluster/minimal_gce_ilb/data/aws_s3_object_cluster-completed.spec_content
+++ b/tests/integration/update_cluster/minimal_gce_ilb/data/aws_s3_object_cluster-completed.spec_content
@@ -30,15 +30,12 @@ spec:
   cloudProvider: gce
   clusterDNSDomain: cluster.local
   configBase: memfs://tests/minimal-gce-ilb.example.com
-  containerRuntime: containerd
   containerd:
     logLevel: info
     runc:
       version: 1.1.5
     version: 1.6.20
   dnsZone: "1"
-  docker:
-    skipInstall: true
   etcdClusters:
   - backups:
       backupStore: memfs://tests/minimal-gce-ilb.example.com/backups/etcd/main
diff --git a/tests/integration/update_cluster/minimal_gce_ilb/data/aws_s3_object_nodeupconfig-master-us-test1-a_content b/tests/integration/update_cluster/minimal_gce_ilb/data/aws_s3_object_nodeupconfig-master-us-test1-a_content
index 143e3e845c..76563fd9c5 100644
--- a/tests/integration/update_cluster/minimal_gce_ilb/data/aws_s3_object_nodeupconfig-master-us-test1-a_content
+++ b/tests/integration/update_cluster/minimal_gce_ilb/data/aws_s3_object_nodeupconfig-master-us-test1-a_content
@@ -227,7 +227,6 @@ CAs:
     9B7UD2ushcVFPtaeoL9Gfu8aY4KJBeqqg5ojl4qmRnThjw==
     -----END CERTIFICATE-----
 ClusterName: minimal-gce-ilb.example.com
-ContainerRuntime: containerd
 ControlPlaneConfig:
   KubeControllerManager:
     allocateNodeCIDRs: true
@@ -313,8 +312,6 @@ containerdConfig:
   runc:
     version: 1.1.5
   version: 1.6.20
-docker:
-  skipInstall: true
 etcdManifests:
 - memfs://tests/minimal-gce-ilb.example.com/manifests/etcd/main-master-us-test1-a.yaml
 - memfs://tests/minimal-gce-ilb.example.com/manifests/etcd/events-master-us-test1-a.yaml
diff --git a/tests/integration/update_cluster/minimal_gce_ilb/data/aws_s3_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/minimal_gce_ilb/data/aws_s3_object_nodeupconfig-nodes_content
index 3b4a6c7c88..11d1f64d30 100644
--- a/tests/integration/update_cluster/minimal_gce_ilb/data/aws_s3_object_nodeupconfig-nodes_content
+++ b/tests/integration/update_cluster/minimal_gce_ilb/data/aws_s3_object_nodeupconfig-nodes_content
@@ -15,7 +15,6 @@ Assets:
   - 54e79e4d48b9e191767e4abc08be1a8476a1c757e9a9f8c45c6ded001226867f@https://github.com/opencontainers/runc/releases/download/v1.1.5/runc.arm64
 CAs: {}
 ClusterName: minimal-gce-ilb.example.com
-ContainerRuntime: containerd
 Hooks:
 - null
 - null
@@ -56,8 +55,6 @@ containerdConfig:
   runc:
     version: 1.1.5
   version: 1.6.20
-docker:
-  skipInstall: true
 multizone: true
 nodeTags: minimal-gce-ilb-example-com-k8s-io-role-node
 usesLegacyGossip: false
diff --git a/tests/integration/update_cluster/minimal_gce_ilb/data/google_compute_instance_template_master-us-test1-a-minimal-gce-ilb-example-com_metadata_user-data b/tests/integration/update_cluster/minimal_gce_ilb/data/google_compute_instance_template_master-us-test1-a-minimal-gce-ilb-example-com_metadata_user-data
index 138ceaf092..7266d97091 100644
--- a/tests/integration/update_cluster/minimal_gce_ilb/data/google_compute_instance_template_master-us-test1-a-minimal-gce-ilb-example-com_metadata_user-data
+++ b/tests/integration/update_cluster/minimal_gce_ilb/data/google_compute_instance_template_master-us-test1-a-minimal-gce-ilb-example-com_metadata_user-data
@@ -127,7 +127,7 @@ ClusterName: minimal-gce-ilb.example.com
 ConfigBase: memfs://tests/minimal-gce-ilb.example.com
 InstanceGroupName: master-us-test1-a
 InstanceGroupRole: ControlPlane
-NodeupConfigHash: 0rfTmRpfQkSuBHQ1b/7xi5Xy+i4diZG73AekITJisPc=
+NodeupConfigHash: BFHLgVJNirf/GYmrkKcuxyn/FHXQHk0nT8pEku9GFSA=
 
 __EOF_KUBE_ENV
 
diff --git a/tests/integration/update_cluster/minimal_gce_ilb/data/google_compute_instance_template_nodes-minimal-gce-ilb-example-com_metadata_user-data b/tests/integration/update_cluster/minimal_gce_ilb/data/google_compute_instance_template_nodes-minimal-gce-ilb-example-com_metadata_user-data
index 78928b2086..9947d1156e 100644
--- a/tests/integration/update_cluster/minimal_gce_ilb/data/google_compute_instance_template_nodes-minimal-gce-ilb-example-com_metadata_user-data
+++ b/tests/integration/update_cluster/minimal_gce_ilb/data/google_compute_instance_template_nodes-minimal-gce-ilb-example-com_metadata_user-data
@@ -150,7 +150,7 @@ ConfigServer:
   - https://kops-controller.internal.minimal-gce-ilb.example.com:3988/
 InstanceGroupName: nodes
 InstanceGroupRole: Node
-NodeupConfigHash: zPlx50pzAzbxQXujbNjml9ykOwzNGxN5ygiHXujkM4o=
+NodeupConfigHash: OLvqTc3IlGczKYCPYkgfNnZvN+h9OvNQrrxZXRH4Z4k=
 
 __EOF_KUBE_ENV
 
diff --git a/tests/integration/update_cluster/minimal_gce_ilb_longclustername/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/minimal_gce_ilb_longclustername/data/aws_s3_object_cluster-completed.spec_content
index fcd64ad606..285701131e 100644
--- a/tests/integration/update_cluster/minimal_gce_ilb_longclustername/data/aws_s3_object_cluster-completed.spec_content
+++ b/tests/integration/update_cluster/minimal_gce_ilb_longclustername/data/aws_s3_object_cluster-completed.spec_content
@@ -30,15 +30,12 @@ spec:
   cloudProvider: gce
   clusterDNSDomain: cluster.local
   configBase: memfs://tests/minimal-gce-with-a-very-very-very-very-very-long-name.example.com
-  containerRuntime: containerd
   containerd:
     logLevel: info
     runc:
       version: 1.1.5
     version: 1.6.20
   dnsZone: "1"
-  docker:
-    skipInstall: true
   etcdClusters:
   - backups:
       backupStore: memfs://tests/minimal-gce-with-a-very-very-very-very-very-long-name.example.com/backups/etcd/main
diff --git a/tests/integration/update_cluster/minimal_gce_ilb_longclustername/data/aws_s3_object_nodeupconfig-master-us-test1-a_content b/tests/integration/update_cluster/minimal_gce_ilb_longclustername/data/aws_s3_object_nodeupconfig-master-us-test1-a_content
index f5a75a8f13..fe3bdbfa99 100644
--- a/tests/integration/update_cluster/minimal_gce_ilb_longclustername/data/aws_s3_object_nodeupconfig-master-us-test1-a_content
+++ b/tests/integration/update_cluster/minimal_gce_ilb_longclustername/data/aws_s3_object_nodeupconfig-master-us-test1-a_content
@@ -227,7 +227,6 @@ CAs:
     9B7UD2ushcVFPtaeoL9Gfu8aY4KJBeqqg5ojl4qmRnThjw==
     -----END CERTIFICATE-----
 ClusterName: minimal-gce-with-a-very-very-very-very-very-long-name.example.com
-ContainerRuntime: containerd
 ControlPlaneConfig:
   KubeControllerManager:
     allocateNodeCIDRs: true
@@ -313,8 +312,6 @@ containerdConfig:
   runc:
     version: 1.1.5
   version: 1.6.20
-docker:
-  skipInstall: true
 etcdManifests:
 - memfs://tests/minimal-gce-with-a-very-very-very-very-very-long-name.example.com/manifests/etcd/main-master-us-test1-a.yaml
 - memfs://tests/minimal-gce-with-a-very-very-very-very-very-long-name.example.com/manifests/etcd/events-master-us-test1-a.yaml
diff --git a/tests/integration/update_cluster/minimal_gce_ilb_longclustername/data/aws_s3_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/minimal_gce_ilb_longclustername/data/aws_s3_object_nodeupconfig-nodes_content
index ddc7a42172..71bb1a5ec4 100644
--- a/tests/integration/update_cluster/minimal_gce_ilb_longclustername/data/aws_s3_object_nodeupconfig-nodes_content
+++ b/tests/integration/update_cluster/minimal_gce_ilb_longclustername/data/aws_s3_object_nodeupconfig-nodes_content
@@ -15,7 +15,6 @@ Assets:
   - 54e79e4d48b9e191767e4abc08be1a8476a1c757e9a9f8c45c6ded001226867f@https://github.com/opencontainers/runc/releases/download/v1.1.5/runc.arm64
 CAs: {}
 ClusterName: minimal-gce-with-a-very-very-very-very-very-long-name.example.com
-ContainerRuntime: containerd
 Hooks:
 - null
 - null
@@ -56,8 +55,6 @@ containerdConfig:
   runc:
     version: 1.1.5
   version: 1.6.20
-docker:
-  skipInstall: true
 multizone: true
 nodeTags: minimal-gce-with-a-very-very-very-very--96dqvi-k8s-io-role-node
 usesLegacyGossip: false
diff --git a/tests/integration/update_cluster/minimal_gce_ilb_longclustername/data/google_compute_instance_template_master-us-test1-a-minimal-gce-with-a-very-very-very-very-very-long-name-example-com_metadata_user-data b/tests/integration/update_cluster/minimal_gce_ilb_longclustername/data/google_compute_instance_template_master-us-test1-a-minimal-gce-with-a-very-very-very-very-very-long-name-example-com_metadata_user-data
index 1275676e92..1d6260351c 100644
--- a/tests/integration/update_cluster/minimal_gce_ilb_longclustername/data/google_compute_instance_template_master-us-test1-a-minimal-gce-with-a-very-very-very-very-very-long-name-example-com_metadata_user-data
+++ b/tests/integration/update_cluster/minimal_gce_ilb_longclustername/data/google_compute_instance_template_master-us-test1-a-minimal-gce-with-a-very-very-very-very-very-long-name-example-com_metadata_user-data
@@ -127,7 +127,7 @@ ClusterName: minimal-gce-with-a-very-very-very-very-very-long-name.example.com
 ConfigBase: memfs://tests/minimal-gce-with-a-very-very-very-very-very-long-name.example.com
 InstanceGroupName: master-us-test1-a
 InstanceGroupRole: ControlPlane
-NodeupConfigHash: 3BzNEec5dyjVThv95u5WkeeJfkfndq3Lt44B6VPX8nA=
+NodeupConfigHash: RxPzUrF6dCNmSsfCSdA+fo5ar3F+w7p/y1wY6iYQzfw=
 
 __EOF_KUBE_ENV
 
diff --git a/tests/integration/update_cluster/minimal_gce_ilb_longclustername/data/google_compute_instance_template_nodes-minimal-gce-with-a-very-very-very-very-very-long-name-example-com_metadata_user-data b/tests/integration/update_cluster/minimal_gce_ilb_longclustername/data/google_compute_instance_template_nodes-minimal-gce-with-a-very-very-very-very-very-long-name-example-com_metadata_user-data
index edfd641461..a78709588b 100644
--- a/tests/integration/update_cluster/minimal_gce_ilb_longclustername/data/google_compute_instance_template_nodes-minimal-gce-with-a-very-very-very-very-very-long-name-example-com_metadata_user-data
+++ b/tests/integration/update_cluster/minimal_gce_ilb_longclustername/data/google_compute_instance_template_nodes-minimal-gce-with-a-very-very-very-very-very-long-name-example-com_metadata_user-data
@@ -150,7 +150,7 @@ ConfigServer:
   - https://kops-controller.internal.minimal-gce-with-a-very-very-very-very-very-long-name.example.com:3988/
 InstanceGroupName: nodes
 InstanceGroupRole: Node
-NodeupConfigHash: CNCTgdX9DW3rH2UZPI8dWzPC70GloP6xYhFOHTgSgJQ=
+NodeupConfigHash: h5aPOrj6qXsVpUAUfU8eT+W08o0cfVbM+Q25WAlJm9c=
 
 __EOF_KUBE_ENV
 
diff --git a/tests/integration/update_cluster/minimal_gce_longclustername/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/minimal_gce_longclustername/data/aws_s3_object_cluster-completed.spec_content
index f29c9c042c..16cebea6c5 100644
--- a/tests/integration/update_cluster/minimal_gce_longclustername/data/aws_s3_object_cluster-completed.spec_content
+++ b/tests/integration/update_cluster/minimal_gce_longclustername/data/aws_s3_object_cluster-completed.spec_content
@@ -26,15 +26,12 @@ spec:
   cloudProvider: gce
   clusterDNSDomain: cluster.local
   configBase: memfs://tests/minimal-gce-with-a-very-very-very-very-very-long-name.example.com
-  containerRuntime: containerd
   containerd:
     logLevel: info
     runc:
       version: 1.1.5
     version: 1.6.20
   dnsZone: "1"
-  docker:
-    skipInstall: true
   etcdClusters:
   - backups:
       backupStore: memfs://tests/minimal-gce-with-a-very-very-very-very-very-long-name.example.com/backups/etcd/main
diff --git a/tests/integration/update_cluster/minimal_gce_longclustername/data/aws_s3_object_nodeupconfig-master-us-test1-a_content b/tests/integration/update_cluster/minimal_gce_longclustername/data/aws_s3_object_nodeupconfig-master-us-test1-a_content
index 0df3221dc7..4742e28a12 100644
--- a/tests/integration/update_cluster/minimal_gce_longclustername/data/aws_s3_object_nodeupconfig-master-us-test1-a_content
+++ b/tests/integration/update_cluster/minimal_gce_longclustername/data/aws_s3_object_nodeupconfig-master-us-test1-a_content
@@ -226,7 +226,6 @@ CAs:
     9B7UD2ushcVFPtaeoL9Gfu8aY4KJBeqqg5ojl4qmRnThjw==
     -----END CERTIFICATE-----
 ClusterName: minimal-gce-with-a-very-very-very-very-very-long-name.example.com
-ContainerRuntime: containerd
 ControlPlaneConfig:
   KubeControllerManager:
     allocateNodeCIDRs: true
@@ -312,8 +311,6 @@ containerdConfig:
   runc:
     version: 1.1.5
   version: 1.6.20
-docker:
-  skipInstall: true
 etcdManifests:
 - memfs://tests/minimal-gce-with-a-very-very-very-very-very-long-name.example.com/manifests/etcd/main-master-us-test1-a.yaml
 - memfs://tests/minimal-gce-with-a-very-very-very-very-very-long-name.example.com/manifests/etcd/events-master-us-test1-a.yaml
diff --git a/tests/integration/update_cluster/minimal_gce_longclustername/data/aws_s3_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/minimal_gce_longclustername/data/aws_s3_object_nodeupconfig-nodes_content
index ddc7a42172..71bb1a5ec4 100644
--- a/tests/integration/update_cluster/minimal_gce_longclustername/data/aws_s3_object_nodeupconfig-nodes_content
+++ b/tests/integration/update_cluster/minimal_gce_longclustername/data/aws_s3_object_nodeupconfig-nodes_content
@@ -15,7 +15,6 @@ Assets:
   - 54e79e4d48b9e191767e4abc08be1a8476a1c757e9a9f8c45c6ded001226867f@https://github.com/opencontainers/runc/releases/download/v1.1.5/runc.arm64
 CAs: {}
 ClusterName: minimal-gce-with-a-very-very-very-very-very-long-name.example.com
-ContainerRuntime: containerd
 Hooks:
 - null
 - null
@@ -56,8 +55,6 @@ containerdConfig:
   runc:
     version: 1.1.5
   version: 1.6.20
-docker:
-  skipInstall: true
 multizone: true
 nodeTags: minimal-gce-with-a-very-very-very-very--96dqvi-k8s-io-role-node
 usesLegacyGossip: false
diff --git a/tests/integration/update_cluster/minimal_gce_longclustername/data/google_compute_instance_template_master-us-test1-a-minimal-gce-with-a-very-very-very-very-very-long-name-example-com_metadata_user-data b/tests/integration/update_cluster/minimal_gce_longclustername/data/google_compute_instance_template_master-us-test1-a-minimal-gce-with-a-very-very-very-very-very-long-name-example-com_metadata_user-data
index bace934387..142871d9b6 100644
--- a/tests/integration/update_cluster/minimal_gce_longclustername/data/google_compute_instance_template_master-us-test1-a-minimal-gce-with-a-very-very-very-very-very-long-name-example-com_metadata_user-data
+++ b/tests/integration/update_cluster/minimal_gce_longclustername/data/google_compute_instance_template_master-us-test1-a-minimal-gce-with-a-very-very-very-very-very-long-name-example-com_metadata_user-data
@@ -127,7 +127,7 @@ ClusterName: minimal-gce-with-a-very-very-very-very-very-long-name.example.com
 ConfigBase: memfs://tests/minimal-gce-with-a-very-very-very-very-very-long-name.example.com
 InstanceGroupName: master-us-test1-a
 InstanceGroupRole: ControlPlane
-NodeupConfigHash: LpND2tktI6bj4Jo9J/YZhyECTspLkkwTfZnWdwOnARI=
+NodeupConfigHash: uipb1+9Zn1wAv4TmDDJS2WOjooWTBJnN4S0Dh7bsmMc=
 
 __EOF_KUBE_ENV
 
diff --git a/tests/integration/update_cluster/minimal_gce_longclustername/data/google_compute_instance_template_nodes-minimal-gce-with-a-very-very-very-very-very-long-name-example-com_metadata_user-data b/tests/integration/update_cluster/minimal_gce_longclustername/data/google_compute_instance_template_nodes-minimal-gce-with-a-very-very-very-very-very-long-name-example-com_metadata_user-data
index edfd641461..a78709588b 100644
--- a/tests/integration/update_cluster/minimal_gce_longclustername/data/google_compute_instance_template_nodes-minimal-gce-with-a-very-very-very-very-very-long-name-example-com_metadata_user-data
+++ b/tests/integration/update_cluster/minimal_gce_longclustername/data/google_compute_instance_template_nodes-minimal-gce-with-a-very-very-very-very-very-long-name-example-com_metadata_user-data
@@ -150,7 +150,7 @@ ConfigServer:
   - https://kops-controller.internal.minimal-gce-with-a-very-very-very-very-very-long-name.example.com:3988/
 InstanceGroupName: nodes
 InstanceGroupRole: Node
-NodeupConfigHash: CNCTgdX9DW3rH2UZPI8dWzPC70GloP6xYhFOHTgSgJQ=
+NodeupConfigHash: h5aPOrj6qXsVpUAUfU8eT+W08o0cfVbM+Q25WAlJm9c=
 
 __EOF_KUBE_ENV
 
diff --git a/tests/integration/update_cluster/minimal_gce_plb/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/minimal_gce_plb/data/aws_s3_object_cluster-completed.spec_content
index 3f61b323ac..4ed5bec052 100644
--- a/tests/integration/update_cluster/minimal_gce_plb/data/aws_s3_object_cluster-completed.spec_content
+++ b/tests/integration/update_cluster/minimal_gce_plb/data/aws_s3_object_cluster-completed.spec_content
@@ -30,15 +30,12 @@ spec:
   cloudProvider: gce
   clusterDNSDomain: cluster.local
   configBase: memfs://tests/minimal-gce-plb.example.com
-  containerRuntime: containerd
   containerd:
     logLevel: info
     runc:
       version: 1.1.5
     version: 1.6.20
   dnsZone: "1"
-  docker:
-    skipInstall: true
   etcdClusters:
   - backups:
       backupStore: memfs://tests/minimal-gce-plb.example.com/backups/etcd/main
diff --git a/tests/integration/update_cluster/minimal_gce_plb/data/aws_s3_object_nodeupconfig-master-us-test1-a_content b/tests/integration/update_cluster/minimal_gce_plb/data/aws_s3_object_nodeupconfig-master-us-test1-a_content
index f5a8cdd893..ce78d00131 100644
--- a/tests/integration/update_cluster/minimal_gce_plb/data/aws_s3_object_nodeupconfig-master-us-test1-a_content
+++ b/tests/integration/update_cluster/minimal_gce_plb/data/aws_s3_object_nodeupconfig-master-us-test1-a_content
@@ -227,7 +227,6 @@ CAs:
     9B7UD2ushcVFPtaeoL9Gfu8aY4KJBeqqg5ojl4qmRnThjw==
     -----END CERTIFICATE-----
 ClusterName: minimal-gce-plb.example.com
-ContainerRuntime: containerd
 ControlPlaneConfig:
   KubeControllerManager:
     allocateNodeCIDRs: true
@@ -313,8 +312,6 @@ containerdConfig:
   runc:
     version: 1.1.5
   version: 1.6.20
-docker:
-  skipInstall: true
 etcdManifests:
 - memfs://tests/minimal-gce-plb.example.com/manifests/etcd/main-master-us-test1-a.yaml
 - memfs://tests/minimal-gce-plb.example.com/manifests/etcd/events-master-us-test1-a.yaml
diff --git a/tests/integration/update_cluster/minimal_gce_plb/data/aws_s3_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/minimal_gce_plb/data/aws_s3_object_nodeupconfig-nodes_content
index c6b47f1555..26890a8aba 100644
--- a/tests/integration/update_cluster/minimal_gce_plb/data/aws_s3_object_nodeupconfig-nodes_content
+++ b/tests/integration/update_cluster/minimal_gce_plb/data/aws_s3_object_nodeupconfig-nodes_content
@@ -15,7 +15,6 @@ Assets:
   - 54e79e4d48b9e191767e4abc08be1a8476a1c757e9a9f8c45c6ded001226867f@https://github.com/opencontainers/runc/releases/download/v1.1.5/runc.arm64
 CAs: {}
 ClusterName: minimal-gce-plb.example.com
-ContainerRuntime: containerd
 Hooks:
 - null
 - null
@@ -56,8 +55,6 @@ containerdConfig:
   runc:
     version: 1.1.5
   version: 1.6.20
-docker:
-  skipInstall: true
 multizone: true
 nodeTags: minimal-gce-plb-example-com-k8s-io-role-node
 usesLegacyGossip: false
diff --git a/tests/integration/update_cluster/minimal_gce_plb/data/google_compute_instance_template_master-us-test1-a-minimal-gce-plb-example-com_metadata_user-data b/tests/integration/update_cluster/minimal_gce_plb/data/google_compute_instance_template_master-us-test1-a-minimal-gce-plb-example-com_metadata_user-data
index 2b952a68c7..a6ec1ca978 100644
--- a/tests/integration/update_cluster/minimal_gce_plb/data/google_compute_instance_template_master-us-test1-a-minimal-gce-plb-example-com_metadata_user-data
+++ b/tests/integration/update_cluster/minimal_gce_plb/data/google_compute_instance_template_master-us-test1-a-minimal-gce-plb-example-com_metadata_user-data
@@ -127,7 +127,7 @@ ClusterName: minimal-gce-plb.example.com
 ConfigBase: memfs://tests/minimal-gce-plb.example.com
 InstanceGroupName: master-us-test1-a
 InstanceGroupRole: ControlPlane
-NodeupConfigHash: ODo7qeec5AK3c9jWKUETxJkJERxTJPqvx0HeO6LR7SU=
+NodeupConfigHash: jF/pjogibcVJn+PHyTHDlLlnhkuLQj26YSbCdXl4T5o=
 
 __EOF_KUBE_ENV
 
diff --git a/tests/integration/update_cluster/minimal_gce_plb/data/google_compute_instance_template_nodes-minimal-gce-plb-example-com_metadata_user-data b/tests/integration/update_cluster/minimal_gce_plb/data/google_compute_instance_template_nodes-minimal-gce-plb-example-com_metadata_user-data
index 1a219bb864..9e14001a56 100644
--- a/tests/integration/update_cluster/minimal_gce_plb/data/google_compute_instance_template_nodes-minimal-gce-plb-example-com_metadata_user-data
+++ b/tests/integration/update_cluster/minimal_gce_plb/data/google_compute_instance_template_nodes-minimal-gce-plb-example-com_metadata_user-data
@@ -150,7 +150,7 @@ ConfigServer:
   - https://kops-controller.internal.minimal-gce-plb.example.com:3988/
 InstanceGroupName: nodes
 InstanceGroupRole: Node
-NodeupConfigHash: b7B7sVWEyXkieYOZEMMx3M8wMDXHbGU9B0HUzGGsOw0=
+NodeupConfigHash: EFZ5F290nxS9/R7gPI3l7EG4SBgXGDzTdxzJqehn9wc=
 
 __EOF_KUBE_ENV
 
diff --git a/tests/integration/update_cluster/minimal_gce_private/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/minimal_gce_private/data/aws_s3_object_cluster-completed.spec_content
index 92fcf4b730..a7b94e0184 100644
--- a/tests/integration/update_cluster/minimal_gce_private/data/aws_s3_object_cluster-completed.spec_content
+++ b/tests/integration/update_cluster/minimal_gce_private/data/aws_s3_object_cluster-completed.spec_content
@@ -26,15 +26,12 @@ spec:
   cloudProvider: gce
   clusterDNSDomain: cluster.local
   configBase: memfs://tests/minimal-gce-private.example.com
-  containerRuntime: containerd
   containerd:
     logLevel: info
     runc:
       version: 1.1.5
     version: 1.6.20
   dnsZone: "1"
-  docker:
-    skipInstall: true
   etcdClusters:
   - backups:
       backupStore: memfs://tests/minimal-gce-private.example.com/backups/etcd/main
diff --git a/tests/integration/update_cluster/minimal_gce_private/data/aws_s3_object_nodeupconfig-master-us-test1-a_content b/tests/integration/update_cluster/minimal_gce_private/data/aws_s3_object_nodeupconfig-master-us-test1-a_content
index 84b43c2606..0219de9e8a 100644
--- a/tests/integration/update_cluster/minimal_gce_private/data/aws_s3_object_nodeupconfig-master-us-test1-a_content
+++ b/tests/integration/update_cluster/minimal_gce_private/data/aws_s3_object_nodeupconfig-master-us-test1-a_content
@@ -226,7 +226,6 @@ CAs:
     9B7UD2ushcVFPtaeoL9Gfu8aY4KJBeqqg5ojl4qmRnThjw==
     -----END CERTIFICATE-----
 ClusterName: minimal-gce-private.example.com
-ContainerRuntime: containerd
 ControlPlaneConfig:
   KubeControllerManager:
     allocateNodeCIDRs: true
@@ -312,8 +311,6 @@ containerdConfig:
   runc:
     version: 1.1.5
   version: 1.6.20
-docker:
-  skipInstall: true
 etcdManifests:
 - memfs://tests/minimal-gce-private.example.com/manifests/etcd/main-master-us-test1-a.yaml
 - memfs://tests/minimal-gce-private.example.com/manifests/etcd/events-master-us-test1-a.yaml
diff --git a/tests/integration/update_cluster/minimal_gce_private/data/aws_s3_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/minimal_gce_private/data/aws_s3_object_nodeupconfig-nodes_content
index 1bcebbd81f..5dd4b29a94 100644
--- a/tests/integration/update_cluster/minimal_gce_private/data/aws_s3_object_nodeupconfig-nodes_content
+++ b/tests/integration/update_cluster/minimal_gce_private/data/aws_s3_object_nodeupconfig-nodes_content
@@ -15,7 +15,6 @@ Assets:
   - 54e79e4d48b9e191767e4abc08be1a8476a1c757e9a9f8c45c6ded001226867f@https://github.com/opencontainers/runc/releases/download/v1.1.5/runc.arm64
 CAs: {}
 ClusterName: minimal-gce-private.example.com
-ContainerRuntime: containerd
 Hooks:
 - null
 - null
@@ -56,8 +55,6 @@ containerdConfig:
   runc:
     version: 1.1.5
   version: 1.6.20
-docker:
-  skipInstall: true
 multizone: true
 nodeTags: minimal-gce-private-example-com-k8s-io-role-node
 usesLegacyGossip: false
diff --git a/tests/integration/update_cluster/minimal_gce_private/data/google_compute_instance_template_master-us-test1-a-minimal-gce-private-example-com_metadata_user-data b/tests/integration/update_cluster/minimal_gce_private/data/google_compute_instance_template_master-us-test1-a-minimal-gce-private-example-com_metadata_user-data
index 612a0d15ee..cbcbcb505f 100644
--- a/tests/integration/update_cluster/minimal_gce_private/data/google_compute_instance_template_master-us-test1-a-minimal-gce-private-example-com_metadata_user-data
+++ b/tests/integration/update_cluster/minimal_gce_private/data/google_compute_instance_template_master-us-test1-a-minimal-gce-private-example-com_metadata_user-data
@@ -127,7 +127,7 @@ ClusterName: minimal-gce-private.example.com
 ConfigBase: memfs://tests/minimal-gce-private.example.com
 InstanceGroupName: master-us-test1-a
 InstanceGroupRole: ControlPlane
-NodeupConfigHash: Ar0AZikECjb2HoPZRrFZncLJcgF9nuj1nMEjjxKQcFo=
+NodeupConfigHash: VHfjbGW6KEeMxqcxL5yjd6zd+mwfyRiyf+4LQmqbNNA=
 
 __EOF_KUBE_ENV
 
diff --git a/tests/integration/update_cluster/minimal_gce_private/data/google_compute_instance_template_nodes-minimal-gce-private-example-com_metadata_user-data b/tests/integration/update_cluster/minimal_gce_private/data/google_compute_instance_template_nodes-minimal-gce-private-example-com_metadata_user-data
index 6b8f9b6bb1..2f6b056887 100644
--- a/tests/integration/update_cluster/minimal_gce_private/data/google_compute_instance_template_nodes-minimal-gce-private-example-com_metadata_user-data
+++ b/tests/integration/update_cluster/minimal_gce_private/data/google_compute_instance_template_nodes-minimal-gce-private-example-com_metadata_user-data
@@ -150,7 +150,7 @@ ConfigServer:
   - https://kops-controller.internal.minimal-gce-private.example.com:3988/
 InstanceGroupName: nodes
 InstanceGroupRole: Node
-NodeupConfigHash: hozNDar1VIy/FUuOF9d76W39eQU5A5CFBHK+yoxEvP4=
+NodeupConfigHash: xGLJ3Y8wjrJVAn4E9PGZqcPkTozoH73fia/V3Yiu56g=
 
 __EOF_KUBE_ENV
 
diff --git a/tests/integration/update_cluster/minimal_gossip/data/aws_launch_template_master-us-test-1a.masters.minimal.k8s.local_user_data b/tests/integration/update_cluster/minimal_gossip/data/aws_launch_template_master-us-test-1a.masters.minimal.k8s.local_user_data
index f8303214c7..b89f801da0 100644
--- a/tests/integration/update_cluster/minimal_gossip/data/aws_launch_template_master-us-test-1a.masters.minimal.k8s.local_user_data
+++ b/tests/integration/update_cluster/minimal_gossip/data/aws_launch_template_master-us-test-1a.masters.minimal.k8s.local_user_data
@@ -128,7 +128,7 @@ ClusterName: minimal.k8s.local
 ConfigBase: memfs://clusters.example.com/minimal.k8s.local
 InstanceGroupName: master-us-test-1a
 InstanceGroupRole: ControlPlane
-NodeupConfigHash: ugxU1cTdz/OKwuPGz+hPldTZcckl/tce2TcXFUOMBY8=
+NodeupConfigHash: g9WGlRDdkNExgDbxJXQ/zdez508aYXrycW5SMPPZBYI=
 
 __EOF_KUBE_ENV
 
diff --git a/tests/integration/update_cluster/minimal_gossip/data/aws_launch_template_nodes.minimal.k8s.local_user_data b/tests/integration/update_cluster/minimal_gossip/data/aws_launch_template_nodes.minimal.k8s.local_user_data
index d1a4d38381..4f5e5b7351 100644
--- a/tests/integration/update_cluster/minimal_gossip/data/aws_launch_template_nodes.minimal.k8s.local_user_data
+++ b/tests/integration/update_cluster/minimal_gossip/data/aws_launch_template_nodes.minimal.k8s.local_user_data
@@ -128,7 +128,7 @@ ClusterName: minimal.k8s.local
 ConfigBase: memfs://clusters.example.com/minimal.k8s.local
 InstanceGroupName: nodes
 InstanceGroupRole: Node
-NodeupConfigHash: lHyc4HSwXrl0QJYBww6sx3AA0lyv+p9j03Y79mwdJX0=
+NodeupConfigHash: 5f5hHWKFBGXNymsuQQpUzUZQfZVwC/Q2sx6bIdNPS5c=
 
 __EOF_KUBE_ENV
 
diff --git a/tests/integration/update_cluster/minimal_gossip/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/minimal_gossip/data/aws_s3_object_cluster-completed.spec_content
index ccefdb7be0..8babf1a694 100644
--- a/tests/integration/update_cluster/minimal_gossip/data/aws_s3_object_cluster-completed.spec_content
+++ b/tests/integration/update_cluster/minimal_gossip/data/aws_s3_object_cluster-completed.spec_content
@@ -24,14 +24,11 @@ spec:
   cloudProvider: aws
   clusterDNSDomain: cluster.local
   configBase: memfs://clusters.example.com/minimal.k8s.local
-  containerRuntime: containerd
   containerd:
     logLevel: info
     runc:
       version: 1.1.5
     version: 1.6.20
-  docker:
-    skipInstall: true
   etcdClusters:
   - backups:
       backupStore: memfs://clusters.example.com/minimal.k8s.local/backups/etcd/main
diff --git a/tests/integration/update_cluster/minimal_gossip/data/aws_s3_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/minimal_gossip/data/aws_s3_object_nodeupconfig-master-us-test-1a_content
index 6acc1880b6..e48e64934c 100644
--- a/tests/integration/update_cluster/minimal_gossip/data/aws_s3_object_nodeupconfig-master-us-test-1a_content
+++ b/tests/integration/update_cluster/minimal_gossip/data/aws_s3_object_nodeupconfig-master-us-test-1a_content
@@ -227,7 +227,6 @@ CAs:
     9B7UD2ushcVFPtaeoL9Gfu8aY4KJBeqqg5ojl4qmRnThjw==
     -----END CERTIFICATE-----
 ClusterName: minimal.k8s.local
-ContainerRuntime: containerd
 ControlPlaneConfig:
   KubeControllerManager:
     allocateNodeCIDRs: true
@@ -320,8 +319,6 @@ containerdConfig:
   runc:
     version: 1.1.5
   version: 1.6.20
-docker:
-  skipInstall: true
 etcdManifests:
 - memfs://clusters.example.com/minimal.k8s.local/manifests/etcd/main-master-us-test-1a.yaml
 - memfs://clusters.example.com/minimal.k8s.local/manifests/etcd/events-master-us-test-1a.yaml
diff --git a/tests/integration/update_cluster/minimal_gossip/data/aws_s3_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/minimal_gossip/data/aws_s3_object_nodeupconfig-nodes_content
index 8357b76317..e0d8483f64 100644
--- a/tests/integration/update_cluster/minimal_gossip/data/aws_s3_object_nodeupconfig-nodes_content
+++ b/tests/integration/update_cluster/minimal_gossip/data/aws_s3_object_nodeupconfig-nodes_content
@@ -38,7 +38,6 @@ CAs:
     9B7UD2ushcVFPtaeoL9Gfu8aY4KJBeqqg5ojl4qmRnThjw==
     -----END CERTIFICATE-----
 ClusterName: minimal.k8s.local
-ContainerRuntime: containerd
 Hooks:
 - null
 - null
@@ -86,7 +85,5 @@ containerdConfig:
   runc:
     version: 1.1.5
   version: 1.6.20
-docker:
-  skipInstall: true
 usesLegacyGossip: true
 usesNoneDNS: false
diff --git a/tests/integration/update_cluster/minimal_gossip_irsa/data/aws_launch_template_master-us-test-1a.masters.minimal.k8s.local_user_data b/tests/integration/update_cluster/minimal_gossip_irsa/data/aws_launch_template_master-us-test-1a.masters.minimal.k8s.local_user_data
index 785232dfcb..5fcb967d7f 100644
--- a/tests/integration/update_cluster/minimal_gossip_irsa/data/aws_launch_template_master-us-test-1a.masters.minimal.k8s.local_user_data
+++ b/tests/integration/update_cluster/minimal_gossip_irsa/data/aws_launch_template_master-us-test-1a.masters.minimal.k8s.local_user_data
@@ -128,7 +128,7 @@ ClusterName: minimal.k8s.local
 ConfigBase: memfs://clusters.example.com/minimal.k8s.local
 InstanceGroupName: master-us-test-1a
 InstanceGroupRole: ControlPlane
-NodeupConfigHash: /qdBZCY8663lnkHmRnutSMvIC2FB0VxXx90Q+136c84=
+NodeupConfigHash: 2POW3C7J5gSVc/mzeAq72LhNDycQlEQ3jxFi6tZYM44=
 
 __EOF_KUBE_ENV
 
diff --git a/tests/integration/update_cluster/minimal_gossip_irsa/data/aws_launch_template_nodes.minimal.k8s.local_user_data b/tests/integration/update_cluster/minimal_gossip_irsa/data/aws_launch_template_nodes.minimal.k8s.local_user_data
index d1a4d38381..4f5e5b7351 100644
--- a/tests/integration/update_cluster/minimal_gossip_irsa/data/aws_launch_template_nodes.minimal.k8s.local_user_data
+++ b/tests/integration/update_cluster/minimal_gossip_irsa/data/aws_launch_template_nodes.minimal.k8s.local_user_data
@@ -128,7 +128,7 @@ ClusterName: minimal.k8s.local
 ConfigBase: memfs://clusters.example.com/minimal.k8s.local
 InstanceGroupName: nodes
 InstanceGroupRole: Node
-NodeupConfigHash: lHyc4HSwXrl0QJYBww6sx3AA0lyv+p9j03Y79mwdJX0=
+NodeupConfigHash: 5f5hHWKFBGXNymsuQQpUzUZQfZVwC/Q2sx6bIdNPS5c=
 
 __EOF_KUBE_ENV
 
diff --git a/tests/integration/update_cluster/minimal_gossip_irsa/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/minimal_gossip_irsa/data/aws_s3_object_cluster-completed.spec_content
index a5efe0c7fb..bd9a984eb5 100644
--- a/tests/integration/update_cluster/minimal_gossip_irsa/data/aws_s3_object_cluster-completed.spec_content
+++ b/tests/integration/update_cluster/minimal_gossip_irsa/data/aws_s3_object_cluster-completed.spec_content
@@ -24,14 +24,11 @@ spec:
   cloudProvider: aws
   clusterDNSDomain: cluster.local
   configBase: memfs://clusters.example.com/minimal.k8s.local
-  containerRuntime: containerd
   containerd:
     logLevel: info
     runc:
       version: 1.1.5
     version: 1.6.20
-  docker:
-    skipInstall: true
   etcdClusters:
   - backups:
       backupStore: memfs://clusters.example.com/minimal.k8s.local/backups/etcd/main
diff --git a/tests/integration/update_cluster/minimal_gossip_irsa/data/aws_s3_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/minimal_gossip_irsa/data/aws_s3_object_nodeupconfig-master-us-test-1a_content
index ad434cfd15..4de0043fc6 100644
--- a/tests/integration/update_cluster/minimal_gossip_irsa/data/aws_s3_object_nodeupconfig-master-us-test-1a_content
+++ b/tests/integration/update_cluster/minimal_gossip_irsa/data/aws_s3_object_nodeupconfig-master-us-test-1a_content
@@ -227,7 +227,6 @@ CAs:
     9B7UD2ushcVFPtaeoL9Gfu8aY4KJBeqqg5ojl4qmRnThjw==
     -----END CERTIFICATE-----
 ClusterName: minimal.k8s.local
-ContainerRuntime: containerd
 ControlPlaneConfig:
   KubeControllerManager:
     allocateNodeCIDRs: true
@@ -320,8 +319,6 @@ containerdConfig:
   runc:
     version: 1.1.5
   version: 1.6.20
-docker:
-  skipInstall: true
 etcdManifests:
 - memfs://clusters.example.com/minimal.k8s.local/manifests/etcd/main-master-us-test-1a.yaml
 - memfs://clusters.example.com/minimal.k8s.local/manifests/etcd/events-master-us-test-1a.yaml
diff --git a/tests/integration/update_cluster/minimal_gossip_irsa/data/aws_s3_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/minimal_gossip_irsa/data/aws_s3_object_nodeupconfig-nodes_content
index 8357b76317..e0d8483f64 100644
--- a/tests/integration/update_cluster/minimal_gossip_irsa/data/aws_s3_object_nodeupconfig-nodes_content
+++ b/tests/integration/update_cluster/minimal_gossip_irsa/data/aws_s3_object_nodeupconfig-nodes_content
@@ -38,7 +38,6 @@ CAs:
     9B7UD2ushcVFPtaeoL9Gfu8aY4KJBeqqg5ojl4qmRnThjw==
     -----END CERTIFICATE-----
 ClusterName: minimal.k8s.local
-ContainerRuntime: containerd
 Hooks:
 - null
 - null
@@ -86,7 +85,5 @@ containerdConfig:
   runc:
     version: 1.1.5
   version: 1.6.20
-docker:
-  skipInstall: true
 usesLegacyGossip: true
 usesNoneDNS: false
diff --git a/tests/integration/update_cluster/minimal_hetzner/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/minimal_hetzner/data/aws_s3_object_cluster-completed.spec_content
index 70f9927e62..e0642faff1 100644
--- a/tests/integration/update_cluster/minimal_hetzner/data/aws_s3_object_cluster-completed.spec_content
+++ b/tests/integration/update_cluster/minimal_hetzner/data/aws_s3_object_cluster-completed.spec_content
@@ -24,14 +24,11 @@ spec:
   cloudProvider: hetzner
   clusterDNSDomain: cluster.local
   configBase: memfs://tests/minimal.example.com
-  containerRuntime: containerd
   containerd:
     logLevel: info
     runc:
       version: 1.1.5
     version: 1.6.20
-  docker:
-    skipInstall: true
   etcdClusters:
   - backups:
       backupStore: memfs://tests/minimal.example.com/backups/etcd/main
diff --git a/tests/integration/update_cluster/minimal_hetzner/data/aws_s3_object_nodeupconfig-master-fsn1_content b/tests/integration/update_cluster/minimal_hetzner/data/aws_s3_object_nodeupconfig-master-fsn1_content
index 90aefcd79a..0fe8b91955 100644
--- a/tests/integration/update_cluster/minimal_hetzner/data/aws_s3_object_nodeupconfig-master-fsn1_content
+++ b/tests/integration/update_cluster/minimal_hetzner/data/aws_s3_object_nodeupconfig-master-fsn1_content
@@ -222,7 +222,6 @@ CAs:
     9B7UD2ushcVFPtaeoL9Gfu8aY4KJBeqqg5ojl4qmRnThjw==
     -----END CERTIFICATE-----
 ClusterName: minimal.example.com
-ContainerRuntime: containerd
 ControlPlaneConfig:
   KubeControllerManager:
     allocateNodeCIDRs: true
@@ -306,8 +305,6 @@ containerdConfig:
   runc:
     version: 1.1.5
   version: 1.6.20
-docker:
-  skipInstall: true
 etcdManifests:
 - memfs://tests/minimal.example.com/manifests/etcd/main-master-fsn1.yaml
 - memfs://tests/minimal.example.com/manifests/etcd/events-master-fsn1.yaml
diff --git a/tests/integration/update_cluster/minimal_hetzner/data/aws_s3_object_nodeupconfig-nodes-fsn1_content b/tests/integration/update_cluster/minimal_hetzner/data/aws_s3_object_nodeupconfig-nodes-fsn1_content
index 5a578b088d..24ac801421 100644
--- a/tests/integration/update_cluster/minimal_hetzner/data/aws_s3_object_nodeupconfig-nodes-fsn1_content
+++ b/tests/integration/update_cluster/minimal_hetzner/data/aws_s3_object_nodeupconfig-nodes-fsn1_content
@@ -13,7 +13,6 @@ Assets:
   - 54e79e4d48b9e191767e4abc08be1a8476a1c757e9a9f8c45c6ded001226867f@https://github.com/opencontainers/runc/releases/download/v1.1.5/runc.arm64
 CAs: {}
 ClusterName: minimal.example.com
-ContainerRuntime: containerd
 Hooks:
 - null
 - null
@@ -53,7 +52,5 @@ containerdConfig:
   runc:
     version: 1.1.5
   version: 1.6.20
-docker:
-  skipInstall: true
 usesLegacyGossip: false
 usesNoneDNS: true
diff --git a/tests/integration/update_cluster/minimal_hetzner/data/hcloud_server_master-fsn1_user_data b/tests/integration/update_cluster/minimal_hetzner/data/hcloud_server_master-fsn1_user_data
index 52d164dc26..d0cb52ec7b 100644
--- a/tests/integration/update_cluster/minimal_hetzner/data/hcloud_server_master-fsn1_user_data
+++ b/tests/integration/update_cluster/minimal_hetzner/data/hcloud_server_master-fsn1_user_data
@@ -128,7 +128,7 @@ ClusterName: minimal.example.com
 ConfigBase: memfs://tests/minimal.example.com
 InstanceGroupName: master-fsn1
 InstanceGroupRole: ControlPlane
-NodeupConfigHash: fS15SWRmpqJ7W7dGYbEPolWX/jaf9jrtOUKLUibEAeY=
+NodeupConfigHash: ItfVR2ayIodf160buncHSUoCxp5qsR74ONwdUIhLl3s=
 
 __EOF_KUBE_ENV
 
diff --git a/tests/integration/update_cluster/minimal_hetzner/data/hcloud_server_nodes-fsn1_user_data b/tests/integration/update_cluster/minimal_hetzner/data/hcloud_server_nodes-fsn1_user_data
index c6fbadf773..41e12146a8 100644
--- a/tests/integration/update_cluster/minimal_hetzner/data/hcloud_server_nodes-fsn1_user_data
+++ b/tests/integration/update_cluster/minimal_hetzner/data/hcloud_server_nodes-fsn1_user_data
@@ -150,7 +150,7 @@ ConfigServer:
   - https://kops-controller.internal.minimal.example.com:3988/
 InstanceGroupName: nodes-fsn1
 InstanceGroupRole: Node
-NodeupConfigHash: QEAiJbha3188+l62+EW7dhtQ2AYujByJN5z/cm29CFY=
+NodeupConfigHash: dHgSeT3fPVuU1uQXSGAoQU9MMY/lpOKxwkDBEShUj3o=
 
 __EOF_KUBE_ENV
 
diff --git a/tests/integration/update_cluster/minimal_scaleway/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/minimal_scaleway/data/aws_s3_object_cluster-completed.spec_content
index e42f9b4ab5..96be8120ae 100644
--- a/tests/integration/update_cluster/minimal_scaleway/data/aws_s3_object_cluster-completed.spec_content
+++ b/tests/integration/update_cluster/minimal_scaleway/data/aws_s3_object_cluster-completed.spec_content
@@ -15,14 +15,11 @@ spec:
   cloudProvider: scaleway
   clusterDNSDomain: cluster.local
   configBase: memfs://tests/scw-minimal.k8s.local
-  containerRuntime: containerd
   containerd:
     logLevel: info
     runc:
       version: 1.1.5
     version: 1.6.20
-  docker:
-    skipInstall: true
   etcdClusters:
   - backups:
       backupStore: memfs://tests/scw-minimal.k8s.local/backups/etcd/main
diff --git a/tests/integration/update_cluster/minimal_scaleway/data/aws_s3_object_nodeupconfig-control-plane-fr-par-1_content b/tests/integration/update_cluster/minimal_scaleway/data/aws_s3_object_nodeupconfig-control-plane-fr-par-1_content
index e694c47aa1..990ab8a01c 100644
--- a/tests/integration/update_cluster/minimal_scaleway/data/aws_s3_object_nodeupconfig-control-plane-fr-par-1_content
+++ b/tests/integration/update_cluster/minimal_scaleway/data/aws_s3_object_nodeupconfig-control-plane-fr-par-1_content
@@ -222,7 +222,6 @@ CAs:
     9B7UD2ushcVFPtaeoL9Gfu8aY4KJBeqqg5ojl4qmRnThjw==
     -----END CERTIFICATE-----
 ClusterName: scw-minimal.k8s.local
-ContainerRuntime: containerd
 ControlPlaneConfig:
   KubeControllerManager:
     allocateNodeCIDRs: true
@@ -303,8 +302,6 @@ containerdConfig:
   runc:
     version: 1.1.5
   version: 1.6.20
-docker:
-  skipInstall: true
 etcdManifests:
 - memfs://tests/scw-minimal.k8s.local/manifests/etcd/main-control-plane-fr-par-1.yaml
 - memfs://tests/scw-minimal.k8s.local/manifests/etcd/events-control-plane-fr-par-1.yaml
diff --git a/tests/integration/update_cluster/minimal_scaleway/data/aws_s3_object_nodeupconfig-nodes-fr-par-1_content b/tests/integration/update_cluster/minimal_scaleway/data/aws_s3_object_nodeupconfig-nodes-fr-par-1_content
index f932745356..428695bdc3 100644
--- a/tests/integration/update_cluster/minimal_scaleway/data/aws_s3_object_nodeupconfig-nodes-fr-par-1_content
+++ b/tests/integration/update_cluster/minimal_scaleway/data/aws_s3_object_nodeupconfig-nodes-fr-par-1_content
@@ -17,7 +17,6 @@ Assets:
   - 9d842e3636a95de2315cdea2be7a282355aac0658ef0b86d5dc2449066538f13@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/arm64/channels,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/channels-linux-arm64
 CAs: {}
 ClusterName: scw-minimal.k8s.local
-ContainerRuntime: containerd
 Hooks:
 - null
 - null
@@ -56,7 +55,5 @@ containerdConfig:
   runc:
     version: 1.1.5
   version: 1.6.20
-docker:
-  skipInstall: true
 usesLegacyGossip: true
 usesNoneDNS: false
diff --git a/tests/integration/update_cluster/minimal_scaleway/data/scaleway_instance_server_control-plane-fr-par-1_user_data b/tests/integration/update_cluster/minimal_scaleway/data/scaleway_instance_server_control-plane-fr-par-1_user_data
index 7d561c5434..1fd5f842c1 100644
--- a/tests/integration/update_cluster/minimal_scaleway/data/scaleway_instance_server_control-plane-fr-par-1_user_data
+++ b/tests/integration/update_cluster/minimal_scaleway/data/scaleway_instance_server_control-plane-fr-par-1_user_data
@@ -130,7 +130,7 @@ ClusterName: scw-minimal.k8s.local
 ConfigBase: memfs://tests/scw-minimal.k8s.local
 InstanceGroupName: control-plane-fr-par-1
 InstanceGroupRole: ControlPlane
-NodeupConfigHash: eJPrumtTFTtr67J/1ZRKJ+30lryIkSVCso6mU5gIG2U=
+NodeupConfigHash: Eju0QG9LIx4osURNz5K7RCCbZ5hWBWrmyJ83jQfXFeE=
 
 __EOF_KUBE_ENV
 
diff --git a/tests/integration/update_cluster/minimal_scaleway/data/scaleway_instance_server_nodes-fr-par-1_user_data b/tests/integration/update_cluster/minimal_scaleway/data/scaleway_instance_server_nodes-fr-par-1_user_data
index c2af935d8d..40e4a4ddc8 100644
--- a/tests/integration/update_cluster/minimal_scaleway/data/scaleway_instance_server_nodes-fr-par-1_user_data
+++ b/tests/integration/update_cluster/minimal_scaleway/data/scaleway_instance_server_nodes-fr-par-1_user_data
@@ -153,7 +153,7 @@ ConfigServer:
   - https://kops-controller.internal.scw-minimal.k8s.local:3988/
 InstanceGroupName: nodes-fr-par-1
 InstanceGroupRole: Node
-NodeupConfigHash: eUhbKK88gvKLoCTbPZf6zpvD8Crp63n12SS35Fu50nc=
+NodeupConfigHash: CRgSNjrIlXY1zT6p8kLLtKm1istdXuZNPQoylPnsChI=
 
 __EOF_KUBE_ENV
 
diff --git a/tests/integration/update_cluster/mixed_instances/data/aws_launch_template_master-us-test-1a.masters.mixedinstances.example.com_user_data b/tests/integration/update_cluster/mixed_instances/data/aws_launch_template_master-us-test-1a.masters.mixedinstances.example.com_user_data
index e262a605c2..3506e08335 100644
--- a/tests/integration/update_cluster/mixed_instances/data/aws_launch_template_master-us-test-1a.masters.mixedinstances.example.com_user_data
+++ b/tests/integration/update_cluster/mixed_instances/data/aws_launch_template_master-us-test-1a.masters.mixedinstances.example.com_user_data
@@ -128,7 +128,7 @@ ClusterName: mixedinstances.example.com
 ConfigBase: memfs://clusters.example.com/mixedinstances.example.com
 InstanceGroupName: master-us-test-1a
 InstanceGroupRole: ControlPlane
-NodeupConfigHash: OYs4Opv8kvpy4C/g3DkV40XQQAfTFnTlg4o7h1cJOGs=
+NodeupConfigHash: P71G3kTMvRDw1jIpAY53fUfwqUwsnGBrs0hK3rxQZDs=
 
 __EOF_KUBE_ENV
 
diff --git a/tests/integration/update_cluster/mixed_instances/data/aws_launch_template_master-us-test-1b.masters.mixedinstances.example.com_user_data b/tests/integration/update_cluster/mixed_instances/data/aws_launch_template_master-us-test-1b.masters.mixedinstances.example.com_user_data
index 0cb1eb1e7a..8261cfbc49 100644
--- a/tests/integration/update_cluster/mixed_instances/data/aws_launch_template_master-us-test-1b.masters.mixedinstances.example.com_user_data
+++ b/tests/integration/update_cluster/mixed_instances/data/aws_launch_template_master-us-test-1b.masters.mixedinstances.example.com_user_data
@@ -128,7 +128,7 @@ ClusterName: mixedinstances.example.com
 ConfigBase: memfs://clusters.example.com/mixedinstances.example.com
 InstanceGroupName: master-us-test-1b
 InstanceGroupRole: ControlPlane
-NodeupConfigHash: aKZ0NvDqCFZsFOjwSS47YHD504NB+d78pFV4pypellI=
+NodeupConfigHash: aSkjbH9FhH7WQip2DljRy76B20rkTHxv8dSR/y6mNqY=
 
 __EOF_KUBE_ENV
 
diff --git a/tests/integration/update_cluster/mixed_instances/data/aws_launch_template_master-us-test-1c.masters.mixedinstances.example.com_user_data b/tests/integration/update_cluster/mixed_instances/data/aws_launch_template_master-us-test-1c.masters.mixedinstances.example.com_user_data
index fab683804a..954e279732 100644
--- a/tests/integration/update_cluster/mixed_instances/data/aws_launch_template_master-us-test-1c.masters.mixedinstances.example.com_user_data
+++ b/tests/integration/update_cluster/mixed_instances/data/aws_launch_template_master-us-test-1c.masters.mixedinstances.example.com_user_data
@@ -128,7 +128,7 @@ ClusterName: mixedinstances.example.com
 ConfigBase: memfs://clusters.example.com/mixedinstances.example.com
 InstanceGroupName: master-us-test-1c
 InstanceGroupRole: ControlPlane
-NodeupConfigHash: L2NXvd9ikuBXMe1zEJgTq+gOdQgZBqBcwV8GR7lizoY=
+NodeupConfigHash: nl92+1C13yiA6xfeIul/W+K9XVPBWyT8kdmd+eLYwpE=
 
 __EOF_KUBE_ENV
 
diff --git a/tests/integration/update_cluster/mixed_instances/data/aws_launch_template_nodes.mixedinstances.example.com_user_data b/tests/integration/update_cluster/mixed_instances/data/aws_launch_template_nodes.mixedinstances.example.com_user_data
index 20d970f060..ed14111410 100644
--- a/tests/integration/update_cluster/mixed_instances/data/aws_launch_template_nodes.mixedinstances.example.com_user_data
+++ b/tests/integration/update_cluster/mixed_instances/data/aws_launch_template_nodes.mixedinstances.example.com_user_data
@@ -151,7 +151,7 @@ ConfigServer:
   - https://kops-controller.internal.mixedinstances.example.com:3988/
 InstanceGroupName: nodes
 InstanceGroupRole: Node
-NodeupConfigHash: F4iT/kf0MCauTUQMrTA+InWhwQhHjNPWAesGvFnHMDc=
+NodeupConfigHash: FuFQlPno+19nMsVx1UahbMhz9x7JQgnbfIjGBaH6xqQ=
 
 __EOF_KUBE_ENV
 
diff --git a/tests/integration/update_cluster/mixed_instances/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/mixed_instances/data/aws_s3_object_cluster-completed.spec_content
index a42edde68f..324be5db35 100644
--- a/tests/integration/update_cluster/mixed_instances/data/aws_s3_object_cluster-completed.spec_content
+++ b/tests/integration/update_cluster/mixed_instances/data/aws_s3_object_cluster-completed.spec_content
@@ -24,15 +24,12 @@ spec:
   cloudProvider: aws
   clusterDNSDomain: cluster.local
   configBase: memfs://clusters.example.com/mixedinstances.example.com
-  containerRuntime: containerd
   containerd:
     logLevel: info
     runc:
       version: 1.1.5
     version: 1.6.20
   dnsZone: Z1AFAKE1ZON3YO
-  docker:
-    skipInstall: true
   etcdClusters:
   - backups:
       backupStore: memfs://clusters.example.com/mixedinstances.example.com/backups/etcd/main
diff --git a/tests/integration/update_cluster/mixed_instances/data/aws_s3_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/mixed_instances/data/aws_s3_object_nodeupconfig-master-us-test-1a_content
index 1d654baca6..b138547ab7 100644
--- a/tests/integration/update_cluster/mixed_instances/data/aws_s3_object_nodeupconfig-master-us-test-1a_content
+++ b/tests/integration/update_cluster/mixed_instances/data/aws_s3_object_nodeupconfig-master-us-test-1a_content
@@ -227,7 +227,6 @@ CAs:
     9B7UD2ushcVFPtaeoL9Gfu8aY4KJBeqqg5ojl4qmRnThjw==
     -----END CERTIFICATE-----
 ClusterName: mixedinstances.example.com
-ContainerRuntime: containerd
 ControlPlaneConfig:
   KubeControllerManager:
     allocateNodeCIDRs: true
@@ -321,8 +320,6 @@ containerdConfig:
   runc:
     version: 1.1.5
   version: 1.6.20
-docker:
-  skipInstall: true
 etcdManifests:
 - memfs://clusters.example.com/mixedinstances.example.com/manifests/etcd/main-master-us-test-1a.yaml
 - memfs://clusters.example.com/mixedinstances.example.com/manifests/etcd/events-master-us-test-1a.yaml
diff --git a/tests/integration/update_cluster/mixed_instances/data/aws_s3_object_nodeupconfig-master-us-test-1b_content b/tests/integration/update_cluster/mixed_instances/data/aws_s3_object_nodeupconfig-master-us-test-1b_content
index c0af70a321..b54814f1cb 100644
--- a/tests/integration/update_cluster/mixed_instances/data/aws_s3_object_nodeupconfig-master-us-test-1b_content
+++ b/tests/integration/update_cluster/mixed_instances/data/aws_s3_object_nodeupconfig-master-us-test-1b_content
@@ -227,7 +227,6 @@ CAs:
     9B7UD2ushcVFPtaeoL9Gfu8aY4KJBeqqg5ojl4qmRnThjw==
     -----END CERTIFICATE-----
 ClusterName: mixedinstances.example.com
-ContainerRuntime: containerd
 ControlPlaneConfig:
   KubeControllerManager:
     allocateNodeCIDRs: true
@@ -321,8 +320,6 @@ containerdConfig:
   runc:
     version: 1.1.5
   version: 1.6.20
-docker:
-  skipInstall: true
 etcdManifests:
 - memfs://clusters.example.com/mixedinstances.example.com/manifests/etcd/main-master-us-test-1b.yaml
 - memfs://clusters.example.com/mixedinstances.example.com/manifests/etcd/events-master-us-test-1b.yaml
diff --git a/tests/integration/update_cluster/mixed_instances/data/aws_s3_object_nodeupconfig-master-us-test-1c_content b/tests/integration/update_cluster/mixed_instances/data/aws_s3_object_nodeupconfig-master-us-test-1c_content
index 0d70738cad..ef811d2b5b 100644
--- a/tests/integration/update_cluster/mixed_instances/data/aws_s3_object_nodeupconfig-master-us-test-1c_content
+++ b/tests/integration/update_cluster/mixed_instances/data/aws_s3_object_nodeupconfig-master-us-test-1c_content
@@ -227,7 +227,6 @@ CAs:
     9B7UD2ushcVFPtaeoL9Gfu8aY4KJBeqqg5ojl4qmRnThjw==
     -----END CERTIFICATE-----
 ClusterName: mixedinstances.example.com
-ContainerRuntime: containerd
 ControlPlaneConfig:
   KubeControllerManager:
     allocateNodeCIDRs: true
@@ -321,8 +320,6 @@ containerdConfig:
   runc:
     version: 1.1.5
   version: 1.6.20
-docker:
-  skipInstall: true
 etcdManifests:
 - memfs://clusters.example.com/mixedinstances.example.com/manifests/etcd/main-master-us-test-1c.yaml
 - memfs://clusters.example.com/mixedinstances.example.com/manifests/etcd/events-master-us-test-1c.yaml
diff --git a/tests/integration/update_cluster/mixed_instances/data/aws_s3_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/mixed_instances/data/aws_s3_object_nodeupconfig-nodes_content
index 6599533f2e..80ed8293b8 100644
--- a/tests/integration/update_cluster/mixed_instances/data/aws_s3_object_nodeupconfig-nodes_content
+++ b/tests/integration/update_cluster/mixed_instances/data/aws_s3_object_nodeupconfig-nodes_content
@@ -13,7 +13,6 @@ Assets:
   - 54e79e4d48b9e191767e4abc08be1a8476a1c757e9a9f8c45c6ded001226867f@https://github.com/opencontainers/runc/releases/download/v1.1.5/runc.arm64
 CAs: {}
 ClusterName: mixedinstances.example.com
-ContainerRuntime: containerd
 Hooks:
 - null
 - null
@@ -56,7 +55,5 @@ containerdConfig:
   runc:
     version: 1.1.5
   version: 1.6.20
-docker:
-  skipInstall: true
 usesLegacyGossip: false
 usesNoneDNS: false
diff --git a/tests/integration/update_cluster/mixed_instances_spot/data/aws_launch_template_master-us-test-1a.masters.mixedinstances.example.com_user_data b/tests/integration/update_cluster/mixed_instances_spot/data/aws_launch_template_master-us-test-1a.masters.mixedinstances.example.com_user_data
index e262a605c2..3506e08335 100644
--- a/tests/integration/update_cluster/mixed_instances_spot/data/aws_launch_template_master-us-test-1a.masters.mixedinstances.example.com_user_data
+++ b/tests/integration/update_cluster/mixed_instances_spot/data/aws_launch_template_master-us-test-1a.masters.mixedinstances.example.com_user_data
@@ -128,7 +128,7 @@ ClusterName: mixedinstances.example.com
 ConfigBase: memfs://clusters.example.com/mixedinstances.example.com
 InstanceGroupName: master-us-test-1a
 InstanceGroupRole: ControlPlane
-NodeupConfigHash: OYs4Opv8kvpy4C/g3DkV40XQQAfTFnTlg4o7h1cJOGs=
+NodeupConfigHash: P71G3kTMvRDw1jIpAY53fUfwqUwsnGBrs0hK3rxQZDs=
 
 __EOF_KUBE_ENV
 
diff --git a/tests/integration/update_cluster/mixed_instances_spot/data/aws_launch_template_master-us-test-1b.masters.mixedinstances.example.com_user_data b/tests/integration/update_cluster/mixed_instances_spot/data/aws_launch_template_master-us-test-1b.masters.mixedinstances.example.com_user_data
index 0cb1eb1e7a..8261cfbc49 100644
--- a/tests/integration/update_cluster/mixed_instances_spot/data/aws_launch_template_master-us-test-1b.masters.mixedinstances.example.com_user_data
+++ b/tests/integration/update_cluster/mixed_instances_spot/data/aws_launch_template_master-us-test-1b.masters.mixedinstances.example.com_user_data
@@ -128,7 +128,7 @@ ClusterName: mixedinstances.example.com
 ConfigBase: memfs://clusters.example.com/mixedinstances.example.com
 InstanceGroupName: master-us-test-1b
 InstanceGroupRole: ControlPlane
-NodeupConfigHash: aKZ0NvDqCFZsFOjwSS47YHD504NB+d78pFV4pypellI=
+NodeupConfigHash: aSkjbH9FhH7WQip2DljRy76B20rkTHxv8dSR/y6mNqY=
 
 __EOF_KUBE_ENV
 
diff --git a/tests/integration/update_cluster/mixed_instances_spot/data/aws_launch_template_master-us-test-1c.masters.mixedinstances.example.com_user_data b/tests/integration/update_cluster/mixed_instances_spot/data/aws_launch_template_master-us-test-1c.masters.mixedinstances.example.com_user_data
index fab683804a..954e279732 100644
--- a/tests/integration/update_cluster/mixed_instances_spot/data/aws_launch_template_master-us-test-1c.masters.mixedinstances.example.com_user_data
+++ b/tests/integration/update_cluster/mixed_instances_spot/data/aws_launch_template_master-us-test-1c.masters.mixedinstances.example.com_user_data
@@ -128,7 +128,7 @@ ClusterName: mixedinstances.example.com
 ConfigBase: memfs://clusters.example.com/mixedinstances.example.com
 InstanceGroupName: master-us-test-1c
 InstanceGroupRole: ControlPlane
-NodeupConfigHash: L2NXvd9ikuBXMe1zEJgTq+gOdQgZBqBcwV8GR7lizoY=
+NodeupConfigHash: nl92+1C13yiA6xfeIul/W+K9XVPBWyT8kdmd+eLYwpE=
 
 __EOF_KUBE_ENV
 
diff --git a/tests/integration/update_cluster/mixed_instances_spot/data/aws_launch_template_nodes.mixedinstances.example.com_user_data b/tests/integration/update_cluster/mixed_instances_spot/data/aws_launch_template_nodes.mixedinstances.example.com_user_data
index 20d970f060..ed14111410 100644
--- a/tests/integration/update_cluster/mixed_instances_spot/data/aws_launch_template_nodes.mixedinstances.example.com_user_data
+++ b/tests/integration/update_cluster/mixed_instances_spot/data/aws_launch_template_nodes.mixedinstances.example.com_user_data
@@ -151,7 +151,7 @@ ConfigServer:
   - https://kops-controller.internal.mixedinstances.example.com:3988/
 InstanceGroupName: nodes
 InstanceGroupRole: Node
-NodeupConfigHash: F4iT/kf0MCauTUQMrTA+InWhwQhHjNPWAesGvFnHMDc=
+NodeupConfigHash: FuFQlPno+19nMsVx1UahbMhz9x7JQgnbfIjGBaH6xqQ=
 
 __EOF_KUBE_ENV
 
diff --git a/tests/integration/update_cluster/mixed_instances_spot/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/mixed_instances_spot/data/aws_s3_object_cluster-completed.spec_content
index a42edde68f..324be5db35 100644
--- a/tests/integration/update_cluster/mixed_instances_spot/data/aws_s3_object_cluster-completed.spec_content
+++ b/tests/integration/update_cluster/mixed_instances_spot/data/aws_s3_object_cluster-completed.spec_content
@@ -24,15 +24,12 @@ spec:
   cloudProvider: aws
   clusterDNSDomain: cluster.local
   configBase: memfs://clusters.example.com/mixedinstances.example.com
-  containerRuntime: containerd
   containerd:
     logLevel: info
     runc:
       version: 1.1.5
     version: 1.6.20
   dnsZone: Z1AFAKE1ZON3YO
-  docker:
-    skipInstall: true
   etcdClusters:
   - backups:
       backupStore: memfs://clusters.example.com/mixedinstances.example.com/backups/etcd/main
diff --git a/tests/integration/update_cluster/mixed_instances_spot/data/aws_s3_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/mixed_instances_spot/data/aws_s3_object_nodeupconfig-master-us-test-1a_content
index 1d654baca6..b138547ab7 100644
--- a/tests/integration/update_cluster/mixed_instances_spot/data/aws_s3_object_nodeupconfig-master-us-test-1a_content
+++ b/tests/integration/update_cluster/mixed_instances_spot/data/aws_s3_object_nodeupconfig-master-us-test-1a_content
@@ -227,7 +227,6 @@ CAs:
     9B7UD2ushcVFPtaeoL9Gfu8aY4KJBeqqg5ojl4qmRnThjw==
     -----END CERTIFICATE-----
 ClusterName: mixedinstances.example.com
-ContainerRuntime: containerd
 ControlPlaneConfig:
   KubeControllerManager:
     allocateNodeCIDRs: true
@@ -321,8 +320,6 @@ containerdConfig:
   runc:
     version: 1.1.5
   version: 1.6.20
-docker:
-  skipInstall: true
 etcdManifests:
 - memfs://clusters.example.com/mixedinstances.example.com/manifests/etcd/main-master-us-test-1a.yaml
 - memfs://clusters.example.com/mixedinstances.example.com/manifests/etcd/events-master-us-test-1a.yaml
diff --git a/tests/integration/update_cluster/mixed_instances_spot/data/aws_s3_object_nodeupconfig-master-us-test-1b_content b/tests/integration/update_cluster/mixed_instances_spot/data/aws_s3_object_nodeupconfig-master-us-test-1b_content
index c0af70a321..b54814f1cb 100644
--- a/tests/integration/update_cluster/mixed_instances_spot/data/aws_s3_object_nodeupconfig-master-us-test-1b_content
+++ b/tests/integration/update_cluster/mixed_instances_spot/data/aws_s3_object_nodeupconfig-master-us-test-1b_content
@@ -227,7 +227,6 @@ CAs:
     9B7UD2ushcVFPtaeoL9Gfu8aY4KJBeqqg5ojl4qmRnThjw==
     -----END CERTIFICATE-----
 ClusterName: mixedinstances.example.com
-ContainerRuntime: containerd
 ControlPlaneConfig:
   KubeControllerManager:
     allocateNodeCIDRs: true
@@ -321,8 +320,6 @@ containerdConfig:
   runc:
     version: 1.1.5
   version: 1.6.20
-docker:
-  skipInstall: true
 etcdManifests:
 - memfs://clusters.example.com/mixedinstances.example.com/manifests/etcd/main-master-us-test-1b.yaml
 - memfs://clusters.example.com/mixedinstances.example.com/manifests/etcd/events-master-us-test-1b.yaml
diff --git a/tests/integration/update_cluster/mixed_instances_spot/data/aws_s3_object_nodeupconfig-master-us-test-1c_content b/tests/integration/update_cluster/mixed_instances_spot/data/aws_s3_object_nodeupconfig-master-us-test-1c_content
index 0d70738cad..ef811d2b5b 100644
--- a/tests/integration/update_cluster/mixed_instances_spot/data/aws_s3_object_nodeupconfig-master-us-test-1c_content
+++ b/tests/integration/update_cluster/mixed_instances_spot/data/aws_s3_object_nodeupconfig-master-us-test-1c_content
@@ -227,7 +227,6 @@ CAs:
     9B7UD2ushcVFPtaeoL9Gfu8aY4KJBeqqg5ojl4qmRnThjw==
     -----END CERTIFICATE-----
 ClusterName: mixedinstances.example.com
-ContainerRuntime: containerd
 ControlPlaneConfig:
   KubeControllerManager:
     allocateNodeCIDRs: true
@@ -321,8 +320,6 @@ containerdConfig:
   runc:
     version: 1.1.5
   version: 1.6.20
-docker:
-  skipInstall: true
 etcdManifests:
 - memfs://clusters.example.com/mixedinstances.example.com/manifests/etcd/main-master-us-test-1c.yaml
 - memfs://clusters.example.com/mixedinstances.example.com/manifests/etcd/events-master-us-test-1c.yaml
diff --git a/tests/integration/update_cluster/mixed_instances_spot/data/aws_s3_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/mixed_instances_spot/data/aws_s3_object_nodeupconfig-nodes_content
index 6599533f2e..80ed8293b8 100644
--- a/tests/integration/update_cluster/mixed_instances_spot/data/aws_s3_object_nodeupconfig-nodes_content
+++ b/tests/integration/update_cluster/mixed_instances_spot/data/aws_s3_object_nodeupconfig-nodes_content
@@ -13,7 +13,6 @@ Assets:
   - 54e79e4d48b9e191767e4abc08be1a8476a1c757e9a9f8c45c6ded001226867f@https://github.com/opencontainers/runc/releases/download/v1.1.5/runc.arm64
 CAs: {}
 ClusterName: mixedinstances.example.com
-ContainerRuntime: containerd
 Hooks:
 - null
 - null
@@ -56,7 +55,5 @@ containerdConfig:
   runc:
     version: 1.1.5
   version: 1.6.20
-docker:
-  skipInstall: true
 usesLegacyGossip: false
 usesNoneDNS: false
diff --git a/tests/integration/update_cluster/nth-imds-processor-irsa/data/aws_launch_template_master-us-test-1a.masters.nthimdsprocessor.longclustername.example.com_user_data b/tests/integration/update_cluster/nth-imds-processor-irsa/data/aws_launch_template_master-us-test-1a.masters.nthimdsprocessor.longclustername.example.com_user_data
index 5994eaa5f5..ed1bdb6a5c 100644
--- a/tests/integration/update_cluster/nth-imds-processor-irsa/data/aws_launch_template_master-us-test-1a.masters.nthimdsprocessor.longclustername.example.com_user_data
+++ b/tests/integration/update_cluster/nth-imds-processor-irsa/data/aws_launch_template_master-us-test-1a.masters.nthimdsprocessor.longclustername.example.com_user_data
@@ -128,7 +128,7 @@ ClusterName: nthimdsprocessor.longclustername.example.com
 ConfigBase: memfs://clusters.example.com/nthimdsprocessor.longclustername.example.com
 InstanceGroupName: master-us-test-1a
 InstanceGroupRole: ControlPlane
-NodeupConfigHash: RfPNL0JlNtPifVnidxSpj1ZiS4t9eo6zoJz89wzhnJs=
+NodeupConfigHash: ciA3P94O06OnR06YKwj6/SlEyWXSyY8yGw8pk36fGLk=
 
 __EOF_KUBE_ENV
 
diff --git a/tests/integration/update_cluster/nth-imds-processor-irsa/data/aws_launch_template_nodes.nthimdsprocessor.longclustername.example.com_user_data b/tests/integration/update_cluster/nth-imds-processor-irsa/data/aws_launch_template_nodes.nthimdsprocessor.longclustername.example.com_user_data
index 7297618a32..03d0663d5b 100644
--- a/tests/integration/update_cluster/nth-imds-processor-irsa/data/aws_launch_template_nodes.nthimdsprocessor.longclustername.example.com_user_data
+++ b/tests/integration/update_cluster/nth-imds-processor-irsa/data/aws_launch_template_nodes.nthimdsprocessor.longclustername.example.com_user_data
@@ -151,7 +151,7 @@ ConfigServer:
   - https://kops-controller.internal.nthimdsprocessor.longclustername.example.com:3988/
 InstanceGroupName: nodes
 InstanceGroupRole: Node
-NodeupConfigHash: DS9qmhIpckn/cZOc8OPbBclIACkNtwElkmg8LhAK+KQ=
+NodeupConfigHash: XvEA5++juueUlPJwMDaJiAuxCTy53Tc2w0T2r7kd0m8=
 
 __EOF_KUBE_ENV
 
diff --git a/tests/integration/update_cluster/nth-imds-processor-irsa/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/nth-imds-processor-irsa/data/aws_s3_object_cluster-completed.spec_content
index 4fc6f84f7d..d5a54aec67 100644
--- a/tests/integration/update_cluster/nth-imds-processor-irsa/data/aws_s3_object_cluster-completed.spec_content
+++ b/tests/integration/update_cluster/nth-imds-processor-irsa/data/aws_s3_object_cluster-completed.spec_content
@@ -24,15 +24,12 @@ spec:
   cloudProvider: aws
   clusterDNSDomain: cluster.local
   configBase: memfs://clusters.example.com/nthimdsprocessor.longclustername.example.com
-  containerRuntime: containerd
   containerd:
     logLevel: info
     runc:
       version: 1.1.5
     version: 1.6.20
   dnsZone: Z1AFAKE1ZON3YO
-  docker:
-    skipInstall: true
   etcdClusters:
   - backups:
       backupStore: memfs://clusters.example.com/nthimdsprocessor.longclustername.example.com/backups/etcd/main
diff --git a/tests/integration/update_cluster/nth-imds-processor-irsa/data/aws_s3_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/nth-imds-processor-irsa/data/aws_s3_object_nodeupconfig-master-us-test-1a_content
index ab35054446..f1c85a45a3 100644
--- a/tests/integration/update_cluster/nth-imds-processor-irsa/data/aws_s3_object_nodeupconfig-master-us-test-1a_content
+++ b/tests/integration/update_cluster/nth-imds-processor-irsa/data/aws_s3_object_nodeupconfig-master-us-test-1a_content
@@ -227,7 +227,6 @@ CAs:
     9B7UD2ushcVFPtaeoL9Gfu8aY4KJBeqqg5ojl4qmRnThjw==
     -----END CERTIFICATE-----
 ClusterName: nthimdsprocessor.longclustername.example.com
-ContainerRuntime: containerd
 ControlPlaneConfig:
   KubeControllerManager:
     allocateNodeCIDRs: true
@@ -321,8 +320,6 @@ containerdConfig:
   runc:
     version: 1.1.5
   version: 1.6.20
-docker:
-  skipInstall: true
 etcdManifests:
 - memfs://clusters.example.com/nthimdsprocessor.longclustername.example.com/manifests/etcd/main-master-us-test-1a.yaml
 - memfs://clusters.example.com/nthimdsprocessor.longclustername.example.com/manifests/etcd/events-master-us-test-1a.yaml
diff --git a/tests/integration/update_cluster/nth-imds-processor-irsa/data/aws_s3_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/nth-imds-processor-irsa/data/aws_s3_object_nodeupconfig-nodes_content
index 2bcb5e51bc..6e610e5304 100644
--- a/tests/integration/update_cluster/nth-imds-processor-irsa/data/aws_s3_object_nodeupconfig-nodes_content
+++ b/tests/integration/update_cluster/nth-imds-processor-irsa/data/aws_s3_object_nodeupconfig-nodes_content
@@ -13,7 +13,6 @@ Assets:
   - 54e79e4d48b9e191767e4abc08be1a8476a1c757e9a9f8c45c6ded001226867f@https://github.com/opencontainers/runc/releases/download/v1.1.5/runc.arm64
 CAs: {}
 ClusterName: nthimdsprocessor.longclustername.example.com
-ContainerRuntime: containerd
 Hooks:
 - null
 - null
@@ -56,7 +55,5 @@ containerdConfig:
   runc:
     version: 1.1.5
   version: 1.6.20
-docker:
-  skipInstall: true
 usesLegacyGossip: false
 usesNoneDNS: false
diff --git a/tests/integration/update_cluster/nth-imds-processor/data/aws_launch_template_master-us-test-1a.masters.nthimdsprocessor.longclustername.example.com_user_data b/tests/integration/update_cluster/nth-imds-processor/data/aws_launch_template_master-us-test-1a.masters.nthimdsprocessor.longclustername.example.com_user_data
index 3b3fd74d5a..40ef436801 100644
--- a/tests/integration/update_cluster/nth-imds-processor/data/aws_launch_template_master-us-test-1a.masters.nthimdsprocessor.longclustername.example.com_user_data
+++ b/tests/integration/update_cluster/nth-imds-processor/data/aws_launch_template_master-us-test-1a.masters.nthimdsprocessor.longclustername.example.com_user_data
@@ -128,7 +128,7 @@ ClusterName: nthimdsprocessor.longclustername.example.com
 ConfigBase: memfs://clusters.example.com/nthimdsprocessor.longclustername.example.com
 InstanceGroupName: master-us-test-1a
 InstanceGroupRole: ControlPlane
-NodeupConfigHash: c5XcPI4XelgpGgsO+EHa5YzELRmSL9iseettG6Y0f+s=
+NodeupConfigHash: 4izHKKDTGQbZP86mrnd506mgtYWS592jLcC3gP3qMfQ=
 
 __EOF_KUBE_ENV
 
diff --git a/tests/integration/update_cluster/nth-imds-processor/data/aws_launch_template_nodes.nthimdsprocessor.longclustername.example.com_user_data b/tests/integration/update_cluster/nth-imds-processor/data/aws_launch_template_nodes.nthimdsprocessor.longclustername.example.com_user_data
index 7297618a32..03d0663d5b 100644
--- a/tests/integration/update_cluster/nth-imds-processor/data/aws_launch_template_nodes.nthimdsprocessor.longclustername.example.com_user_data
+++ b/tests/integration/update_cluster/nth-imds-processor/data/aws_launch_template_nodes.nthimdsprocessor.longclustername.example.com_user_data
@@ -151,7 +151,7 @@ ConfigServer:
   - https://kops-controller.internal.nthimdsprocessor.longclustername.example.com:3988/
 InstanceGroupName: nodes
 InstanceGroupRole: Node
-NodeupConfigHash: DS9qmhIpckn/cZOc8OPbBclIACkNtwElkmg8LhAK+KQ=
+NodeupConfigHash: XvEA5++juueUlPJwMDaJiAuxCTy53Tc2w0T2r7kd0m8=
 
 __EOF_KUBE_ENV
 
diff --git a/tests/integration/update_cluster/nth-imds-processor/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/nth-imds-processor/data/aws_s3_object_cluster-completed.spec_content
index c635a4fe30..c76d5c63cf 100644
--- a/tests/integration/update_cluster/nth-imds-processor/data/aws_s3_object_cluster-completed.spec_content
+++ b/tests/integration/update_cluster/nth-imds-processor/data/aws_s3_object_cluster-completed.spec_content
@@ -24,15 +24,12 @@ spec:
   cloudProvider: aws
   clusterDNSDomain: cluster.local
   configBase: memfs://clusters.example.com/nthimdsprocessor.longclustername.example.com
-  containerRuntime: containerd
   containerd:
     logLevel: info
     runc:
       version: 1.1.5
     version: 1.6.20
   dnsZone: Z1AFAKE1ZON3YO
-  docker:
-    skipInstall: true
   etcdClusters:
   - backups:
       backupStore: memfs://clusters.example.com/nthimdsprocessor.longclustername.example.com/backups/etcd/main
diff --git a/tests/integration/update_cluster/nth-imds-processor/data/aws_s3_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/nth-imds-processor/data/aws_s3_object_nodeupconfig-master-us-test-1a_content
index c5ba45f24f..5a6a3d54bc 100644
--- a/tests/integration/update_cluster/nth-imds-processor/data/aws_s3_object_nodeupconfig-master-us-test-1a_content
+++ b/tests/integration/update_cluster/nth-imds-processor/data/aws_s3_object_nodeupconfig-master-us-test-1a_content
@@ -227,7 +227,6 @@ CAs:
     9B7UD2ushcVFPtaeoL9Gfu8aY4KJBeqqg5ojl4qmRnThjw==
     -----END CERTIFICATE-----
 ClusterName: nthimdsprocessor.longclustername.example.com
-ContainerRuntime: containerd
 ControlPlaneConfig:
   KubeControllerManager:
     allocateNodeCIDRs: true
@@ -321,8 +320,6 @@ containerdConfig:
   runc:
     version: 1.1.5
   version: 1.6.20
-docker:
-  skipInstall: true
 etcdManifests:
 - memfs://clusters.example.com/nthimdsprocessor.longclustername.example.com/manifests/etcd/main-master-us-test-1a.yaml
 - memfs://clusters.example.com/nthimdsprocessor.longclustername.example.com/manifests/etcd/events-master-us-test-1a.yaml
diff --git a/tests/integration/update_cluster/nth-imds-processor/data/aws_s3_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/nth-imds-processor/data/aws_s3_object_nodeupconfig-nodes_content
index 2bcb5e51bc..6e610e5304 100644
--- a/tests/integration/update_cluster/nth-imds-processor/data/aws_s3_object_nodeupconfig-nodes_content
+++ b/tests/integration/update_cluster/nth-imds-processor/data/aws_s3_object_nodeupconfig-nodes_content
@@ -13,7 +13,6 @@ Assets:
   - 54e79e4d48b9e191767e4abc08be1a8476a1c757e9a9f8c45c6ded001226867f@https://github.com/opencontainers/runc/releases/download/v1.1.5/runc.arm64
 CAs: {}
 ClusterName: nthimdsprocessor.longclustername.example.com
-ContainerRuntime: containerd
 Hooks:
 - null
 - null
@@ -56,7 +55,5 @@ containerdConfig:
   runc:
     version: 1.1.5
   version: 1.6.20
-docker:
-  skipInstall: true
 usesLegacyGossip: false
 usesNoneDNS: false
diff --git a/tests/integration/update_cluster/nvidia/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data b/tests/integration/update_cluster/nvidia/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data
index c64661697f..2b65bb339e 100644
--- a/tests/integration/update_cluster/nvidia/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data
+++ b/tests/integration/update_cluster/nvidia/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data
@@ -128,7 +128,7 @@ ClusterName: minimal.example.com
 ConfigBase: memfs://clusters.example.com/minimal.example.com
 InstanceGroupName: master-us-test-1a
 InstanceGroupRole: ControlPlane
-NodeupConfigHash: wB8g0P3JGzNCOJ7frRBGtr6WYq/dfk6+4MGgOZj1pZU=
+NodeupConfigHash: FUnVJ0DpQeNYCQlccRJ0dDZEGqczn50Air5z9uixKoI=
 
 __EOF_KUBE_ENV
 
diff --git a/tests/integration/update_cluster/nvidia/data/aws_launch_template_nodes.minimal.example.com_user_data b/tests/integration/update_cluster/nvidia/data/aws_launch_template_nodes.minimal.example.com_user_data
index 50e65fc455..d9935bd4b6 100644
--- a/tests/integration/update_cluster/nvidia/data/aws_launch_template_nodes.minimal.example.com_user_data
+++ b/tests/integration/update_cluster/nvidia/data/aws_launch_template_nodes.minimal.example.com_user_data
@@ -151,7 +151,7 @@ ConfigServer:
   - https://kops-controller.internal.minimal.example.com:3988/
 InstanceGroupName: nodes
 InstanceGroupRole: Node
-NodeupConfigHash: D4gSSmangYuaGIuYD2ThxJqBIWYkKlBSRI0CHitwqj4=
+NodeupConfigHash: R2CwjDqMuM9RyXQInrEzUBVc+LPpX0IoSa+YSfEMEtc=
 
 __EOF_KUBE_ENV
 
diff --git a/tests/integration/update_cluster/nvidia/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/nvidia/data/aws_s3_object_cluster-completed.spec_content
index bb1745a107..814f1a2681 100644
--- a/tests/integration/update_cluster/nvidia/data/aws_s3_object_cluster-completed.spec_content
+++ b/tests/integration/update_cluster/nvidia/data/aws_s3_object_cluster-completed.spec_content
@@ -24,7 +24,6 @@ spec:
   cloudProvider: aws
   clusterDNSDomain: cluster.local
   configBase: memfs://clusters.example.com/minimal.example.com
-  containerRuntime: containerd
   containerd:
     logLevel: info
     nvidiaGPU:
@@ -34,8 +33,6 @@ spec:
       version: 1.1.5
     version: 1.6.20
   dnsZone: Z1AFAKE1ZON3YO
-  docker:
-    skipInstall: true
   etcdClusters:
   - backups:
       backupStore: memfs://clusters.example.com/minimal.example.com/backups/etcd/main
diff --git a/tests/integration/update_cluster/nvidia/data/aws_s3_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/nvidia/data/aws_s3_object_nodeupconfig-master-us-test-1a_content
index abcd88146b..3a9339ed8b 100644
--- a/tests/integration/update_cluster/nvidia/data/aws_s3_object_nodeupconfig-master-us-test-1a_content
+++ b/tests/integration/update_cluster/nvidia/data/aws_s3_object_nodeupconfig-master-us-test-1a_content
@@ -227,7 +227,6 @@ CAs:
     9B7UD2ushcVFPtaeoL9Gfu8aY4KJBeqqg5ojl4qmRnThjw==
     -----END CERTIFICATE-----
 ClusterName: minimal.example.com
-ContainerRuntime: containerd
 ControlPlaneConfig:
   KubeControllerManager:
     allocateNodeCIDRs: true
@@ -327,8 +326,6 @@ containerdConfig:
   runc:
     version: 1.1.5
   version: 1.6.20
-docker:
-  skipInstall: true
 etcdManifests:
 - memfs://clusters.example.com/minimal.example.com/manifests/etcd/main-master-us-test-1a.yaml
 - memfs://clusters.example.com/minimal.example.com/manifests/etcd/events-master-us-test-1a.yaml
diff --git a/tests/integration/update_cluster/nvidia/data/aws_s3_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/nvidia/data/aws_s3_object_nodeupconfig-nodes_content
index 6c69e407f2..f8308261f1 100644
--- a/tests/integration/update_cluster/nvidia/data/aws_s3_object_nodeupconfig-nodes_content
+++ b/tests/integration/update_cluster/nvidia/data/aws_s3_object_nodeupconfig-nodes_content
@@ -13,7 +13,6 @@ Assets:
   - 54e79e4d48b9e191767e4abc08be1a8476a1c757e9a9f8c45c6ded001226867f@https://github.com/opencontainers/runc/releases/download/v1.1.5/runc.arm64
 CAs: {}
 ClusterName: minimal.example.com
-ContainerRuntime: containerd
 Hooks:
 - null
 - null
@@ -65,7 +64,5 @@ containerdConfig:
   runc:
     version: 1.1.5
   version: 1.6.20
-docker:
-  skipInstall: true
 usesLegacyGossip: false
 usesNoneDNS: false
diff --git a/tests/integration/update_cluster/private-shared-ip/data/aws_launch_template_master-us-test-1a.masters.private-shared-ip.example.com_user_data b/tests/integration/update_cluster/private-shared-ip/data/aws_launch_template_master-us-test-1a.masters.private-shared-ip.example.com_user_data
index 7a69aa79e5..e3a4a0e6a5 100644
--- a/tests/integration/update_cluster/private-shared-ip/data/aws_launch_template_master-us-test-1a.masters.private-shared-ip.example.com_user_data
+++ b/tests/integration/update_cluster/private-shared-ip/data/aws_launch_template_master-us-test-1a.masters.private-shared-ip.example.com_user_data
@@ -128,7 +128,7 @@ ClusterName: private-shared-ip.example.com
 ConfigBase: memfs://clusters.example.com/private-shared-ip.example.com
 InstanceGroupName: master-us-test-1a
 InstanceGroupRole: ControlPlane
-NodeupConfigHash: F2+wDoOQG4ALl2pMLLZecWmYFw6MtWrOLLAbqhNf14c=
+NodeupConfigHash: OSX2aIPkK/GEjTZij3MvUNKt+kZSRbv6tSavgrvdteE=
 
 __EOF_KUBE_ENV
 
diff --git a/tests/integration/update_cluster/private-shared-ip/data/aws_launch_template_nodes.private-shared-ip.example.com_user_data b/tests/integration/update_cluster/private-shared-ip/data/aws_launch_template_nodes.private-shared-ip.example.com_user_data
index 7721ca1edc..3941f00a96 100644
--- a/tests/integration/update_cluster/private-shared-ip/data/aws_launch_template_nodes.private-shared-ip.example.com_user_data
+++ b/tests/integration/update_cluster/private-shared-ip/data/aws_launch_template_nodes.private-shared-ip.example.com_user_data
@@ -151,7 +151,7 @@ ConfigServer:
   - https://kops-controller.internal.private-shared-ip.example.com:3988/
 InstanceGroupName: nodes
 InstanceGroupRole: Node
-NodeupConfigHash: cqWJfjvqUgr2MrCPXWKsdAmTvRD5dPzemXk2kuzHWXI=
+NodeupConfigHash: VPMWaj5zNTXW6lzmkaaRhfguAx1iQCD4YHQjnejW2mM=
 
 __EOF_KUBE_ENV
 
diff --git a/tests/integration/update_cluster/private-shared-ip/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/private-shared-ip/data/aws_s3_object_cluster-completed.spec_content
index 5ded5d5cdb..022bb19e0f 100644
--- a/tests/integration/update_cluster/private-shared-ip/data/aws_s3_object_cluster-completed.spec_content
+++ b/tests/integration/update_cluster/private-shared-ip/data/aws_s3_object_cluster-completed.spec_content
@@ -26,15 +26,12 @@ spec:
   cloudProvider: aws
   clusterDNSDomain: cluster.local
   configBase: memfs://clusters.example.com/private-shared-ip.example.com
-  containerRuntime: containerd
   containerd:
     logLevel: info
     runc:
       version: 1.1.5
     version: 1.6.20
   dnsZone: Z1AFAKE1ZON3YO
-  docker:
-    skipInstall: true
   etcdClusters:
   - backups:
       backupStore: memfs://clusters.example.com/private-shared-ip.example.com/backups/etcd/main
diff --git a/tests/integration/update_cluster/private-shared-ip/data/aws_s3_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/private-shared-ip/data/aws_s3_object_nodeupconfig-master-us-test-1a_content
index 8ae5474bf3..b5525bd9fd 100644
--- a/tests/integration/update_cluster/private-shared-ip/data/aws_s3_object_nodeupconfig-master-us-test-1a_content
+++ b/tests/integration/update_cluster/private-shared-ip/data/aws_s3_object_nodeupconfig-master-us-test-1a_content
@@ -226,7 +226,6 @@ CAs:
     9B7UD2ushcVFPtaeoL9Gfu8aY4KJBeqqg5ojl4qmRnThjw==
     -----END CERTIFICATE-----
 ClusterName: private-shared-ip.example.com
-ContainerRuntime: containerd
 ControlPlaneConfig:
   KubeControllerManager:
     allocateNodeCIDRs: true
@@ -320,8 +319,6 @@ containerdConfig:
   runc:
     version: 1.1.5
   version: 1.6.20
-docker:
-  skipInstall: true
 etcdManifests:
 - memfs://clusters.example.com/private-shared-ip.example.com/manifests/etcd/main-master-us-test-1a.yaml
 - memfs://clusters.example.com/private-shared-ip.example.com/manifests/etcd/events-master-us-test-1a.yaml
diff --git a/tests/integration/update_cluster/private-shared-ip/data/aws_s3_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/private-shared-ip/data/aws_s3_object_nodeupconfig-nodes_content
index b6384c8c5c..39bf87a868 100644
--- a/tests/integration/update_cluster/private-shared-ip/data/aws_s3_object_nodeupconfig-nodes_content
+++ b/tests/integration/update_cluster/private-shared-ip/data/aws_s3_object_nodeupconfig-nodes_content
@@ -13,7 +13,6 @@ Assets:
   - 54e79e4d48b9e191767e4abc08be1a8476a1c757e9a9f8c45c6ded001226867f@https://github.com/opencontainers/runc/releases/download/v1.1.5/runc.arm64
 CAs: {}
 ClusterName: private-shared-ip.example.com
-ContainerRuntime: containerd
 Hooks:
 - null
 - null
@@ -56,7 +55,5 @@ containerdConfig:
   runc:
     version: 1.1.5
   version: 1.6.20
-docker:
-  skipInstall: true
 usesLegacyGossip: false
 usesNoneDNS: false
diff --git a/tests/integration/update_cluster/private-shared-subnet/data/aws_launch_template_master-us-test-1a.masters.private-shared-subnet.example.com_user_data b/tests/integration/update_cluster/private-shared-subnet/data/aws_launch_template_master-us-test-1a.masters.private-shared-subnet.example.com_user_data
index 1c19b87420..3cd7430f49 100644
--- a/tests/integration/update_cluster/private-shared-subnet/data/aws_launch_template_master-us-test-1a.masters.private-shared-subnet.example.com_user_data
+++ b/tests/integration/update_cluster/private-shared-subnet/data/aws_launch_template_master-us-test-1a.masters.private-shared-subnet.example.com_user_data
@@ -128,7 +128,7 @@ ClusterName: private-shared-subnet.example.com
 ConfigBase: memfs://clusters.example.com/private-shared-subnet.example.com
 InstanceGroupName: master-us-test-1a
 InstanceGroupRole: ControlPlane
-NodeupConfigHash: Xz4k3rOpe1iTPKipTpZ4kQPPBuCFsjdnHUyMsVikziQ=
+NodeupConfigHash: pAHTkfaVLRAeTkx0d2czVSKqzuWOt7IMIX/V+KEFTSs=
 
 __EOF_KUBE_ENV
 
diff --git a/tests/integration/update_cluster/private-shared-subnet/data/aws_launch_template_nodes.private-shared-subnet.example.com_user_data b/tests/integration/update_cluster/private-shared-subnet/data/aws_launch_template_nodes.private-shared-subnet.example.com_user_data
index 730bd6d31d..6a32597a53 100644
--- a/tests/integration/update_cluster/private-shared-subnet/data/aws_launch_template_nodes.private-shared-subnet.example.com_user_data
+++ b/tests/integration/update_cluster/private-shared-subnet/data/aws_launch_template_nodes.private-shared-subnet.example.com_user_data
@@ -151,7 +151,7 @@ ConfigServer:
   - https://kops-controller.internal.private-shared-subnet.example.com:3988/
 InstanceGroupName: nodes
 InstanceGroupRole: Node
-NodeupConfigHash: j0hLZnFgDeJ0uYgeW3wD+lMitBcTPi9fjbRzQCP3osQ=
+NodeupConfigHash: TH/3mhJvBNQvWSICJCqpTUng9ZpJaHMGm7ihNkyP1L8=
 
 __EOF_KUBE_ENV
 
diff --git a/tests/integration/update_cluster/private-shared-subnet/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/private-shared-subnet/data/aws_s3_object_cluster-completed.spec_content
index 4dd836c42e..52a5fa7856 100644
--- a/tests/integration/update_cluster/private-shared-subnet/data/aws_s3_object_cluster-completed.spec_content
+++ b/tests/integration/update_cluster/private-shared-subnet/data/aws_s3_object_cluster-completed.spec_content
@@ -26,15 +26,12 @@ spec:
   cloudProvider: aws
   clusterDNSDomain: cluster.local
   configBase: memfs://clusters.example.com/private-shared-subnet.example.com
-  containerRuntime: containerd
   containerd:
     logLevel: info
     runc:
       version: 1.1.5
     version: 1.6.20
   dnsZone: Z1AFAKE1ZON3YO
-  docker:
-    skipInstall: true
   etcdClusters:
   - backups:
       backupStore: memfs://clusters.example.com/private-shared-subnet.example.com/backups/etcd/main
diff --git a/tests/integration/update_cluster/private-shared-subnet/data/aws_s3_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/private-shared-subnet/data/aws_s3_object_nodeupconfig-master-us-test-1a_content
index 9f8748d445..27dd1f43d8 100644
--- a/tests/integration/update_cluster/private-shared-subnet/data/aws_s3_object_nodeupconfig-master-us-test-1a_content
+++ b/tests/integration/update_cluster/private-shared-subnet/data/aws_s3_object_nodeupconfig-master-us-test-1a_content
@@ -226,7 +226,6 @@ CAs:
     9B7UD2ushcVFPtaeoL9Gfu8aY4KJBeqqg5ojl4qmRnThjw==
     -----END CERTIFICATE-----
 ClusterName: private-shared-subnet.example.com
-ContainerRuntime: containerd
 ControlPlaneConfig:
   KubeControllerManager:
     allocateNodeCIDRs: true
@@ -320,8 +319,6 @@ containerdConfig:
   runc:
     version: 1.1.5
   version: 1.6.20
-docker:
-  skipInstall: true
 etcdManifests:
 - memfs://clusters.example.com/private-shared-subnet.example.com/manifests/etcd/main-master-us-test-1a.yaml
 - memfs://clusters.example.com/private-shared-subnet.example.com/manifests/etcd/events-master-us-test-1a.yaml
diff --git a/tests/integration/update_cluster/private-shared-subnet/data/aws_s3_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/private-shared-subnet/data/aws_s3_object_nodeupconfig-nodes_content
index def5d50a60..73228f525f 100644
--- a/tests/integration/update_cluster/private-shared-subnet/data/aws_s3_object_nodeupconfig-nodes_content
+++ b/tests/integration/update_cluster/private-shared-subnet/data/aws_s3_object_nodeupconfig-nodes_content
@@ -13,7 +13,6 @@ Assets:
   - 54e79e4d48b9e191767e4abc08be1a8476a1c757e9a9f8c45c6ded001226867f@https://github.com/opencontainers/runc/releases/download/v1.1.5/runc.arm64
 CAs: {}
 ClusterName: private-shared-subnet.example.com
-ContainerRuntime: containerd
 Hooks:
 - null
 - null
@@ -56,7 +55,5 @@ containerdConfig:
   runc:
     version: 1.1.5
   version: 1.6.20
-docker:
-  skipInstall: true
 usesLegacyGossip: false
 usesNoneDNS: false
diff --git a/tests/integration/update_cluster/privatecalico/data/aws_launch_template_master-us-test-1a.masters.privatecalico.example.com_user_data b/tests/integration/update_cluster/privatecalico/data/aws_launch_template_master-us-test-1a.masters.privatecalico.example.com_user_data
index 594bb1e5a2..1b1fa79917 100644
--- a/tests/integration/update_cluster/privatecalico/data/aws_launch_template_master-us-test-1a.masters.privatecalico.example.com_user_data
+++ b/tests/integration/update_cluster/privatecalico/data/aws_launch_template_master-us-test-1a.masters.privatecalico.example.com_user_data
@@ -128,7 +128,7 @@ ClusterName: privatecalico.example.com
 ConfigBase: memfs://clusters.example.com/privatecalico.example.com
 InstanceGroupName: master-us-test-1a
 InstanceGroupRole: ControlPlane
-NodeupConfigHash: RTrhOTdIr8tVpYw/0ZnkDJk9JWPD9UE/MpPywJBFtXw=
+NodeupConfigHash: WUgQbhYsiPnCcskiu5collbj3M/1ZOrRb+CaGvJ90qQ=
 
 __EOF_KUBE_ENV
 
diff --git a/tests/integration/update_cluster/privatecalico/data/aws_launch_template_nodes.privatecalico.example.com_user_data b/tests/integration/update_cluster/privatecalico/data/aws_launch_template_nodes.privatecalico.example.com_user_data
index a38151de0d..d0d70ea755 100644
--- a/tests/integration/update_cluster/privatecalico/data/aws_launch_template_nodes.privatecalico.example.com_user_data
+++ b/tests/integration/update_cluster/privatecalico/data/aws_launch_template_nodes.privatecalico.example.com_user_data
@@ -151,7 +151,7 @@ ConfigServer:
   - https://kops-controller.internal.privatecalico.example.com:3988/
 InstanceGroupName: nodes
 InstanceGroupRole: Node
-NodeupConfigHash: L8K15pWatEwP+9iAaw+IO5Xd9biVy93p2wcilf2/BR8=
+NodeupConfigHash: zFrDQqs2PWCQqqW94XPiWqYYBuULF1+WGw6bI7Zq7pQ=
 
 __EOF_KUBE_ENV
 
diff --git a/tests/integration/update_cluster/privatecalico/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/privatecalico/data/aws_s3_object_cluster-completed.spec_content
index a9644d5130..b705889d74 100644
--- a/tests/integration/update_cluster/privatecalico/data/aws_s3_object_cluster-completed.spec_content
+++ b/tests/integration/update_cluster/privatecalico/data/aws_s3_object_cluster-completed.spec_content
@@ -26,15 +26,12 @@ spec:
   cloudProvider: aws
   clusterDNSDomain: cluster.local
   configBase: memfs://clusters.example.com/privatecalico.example.com
-  containerRuntime: containerd
   containerd:
     logLevel: info
     runc:
       version: 1.1.5
     version: 1.6.20
   dnsZone: Z1AFAKE1ZON3YO
-  docker:
-    skipInstall: true
   etcdClusters:
   - backups:
       backupStore: memfs://clusters.example.com/privatecalico.example.com/backups/etcd/main
diff --git a/tests/integration/update_cluster/privatecalico/data/aws_s3_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/privatecalico/data/aws_s3_object_nodeupconfig-master-us-test-1a_content
index 0656cc8535..76ba514258 100644
--- a/tests/integration/update_cluster/privatecalico/data/aws_s3_object_nodeupconfig-master-us-test-1a_content
+++ b/tests/integration/update_cluster/privatecalico/data/aws_s3_object_nodeupconfig-master-us-test-1a_content
@@ -226,7 +226,6 @@ CAs:
     9B7UD2ushcVFPtaeoL9Gfu8aY4KJBeqqg5ojl4qmRnThjw==
     -----END CERTIFICATE-----
 ClusterName: privatecalico.example.com
-ContainerRuntime: containerd
 ControlPlaneConfig:
   KubeControllerManager:
     allocateNodeCIDRs: true
@@ -321,8 +320,6 @@ containerdConfig:
   runc:
     version: 1.1.5
   version: 1.6.20
-docker:
-  skipInstall: true
 etcdManifests:
 - memfs://clusters.example.com/privatecalico.example.com/manifests/etcd/main-master-us-test-1a.yaml
 - memfs://clusters.example.com/privatecalico.example.com/manifests/etcd/events-master-us-test-1a.yaml
diff --git a/tests/integration/update_cluster/privatecalico/data/aws_s3_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/privatecalico/data/aws_s3_object_nodeupconfig-nodes_content
index 52eb1de087..91266ee556 100644
--- a/tests/integration/update_cluster/privatecalico/data/aws_s3_object_nodeupconfig-nodes_content
+++ b/tests/integration/update_cluster/privatecalico/data/aws_s3_object_nodeupconfig-nodes_content
@@ -13,7 +13,6 @@ Assets:
   - 54e79e4d48b9e191767e4abc08be1a8476a1c757e9a9f8c45c6ded001226867f@https://github.com/opencontainers/runc/releases/download/v1.1.5/runc.arm64
 CAs: {}
 ClusterName: privatecalico.example.com
-ContainerRuntime: containerd
 Hooks:
 - null
 - null
@@ -57,7 +56,5 @@ containerdConfig:
   runc:
     version: 1.1.5
   version: 1.6.20
-docker:
-  skipInstall: true
 usesLegacyGossip: false
 usesNoneDNS: false
diff --git a/tests/integration/update_cluster/privatecanal/data/aws_launch_template_master-us-test-1a.masters.privatecanal.example.com_user_data b/tests/integration/update_cluster/privatecanal/data/aws_launch_template_master-us-test-1a.masters.privatecanal.example.com_user_data
index ea6714d8be..765dcf4d44 100644
--- a/tests/integration/update_cluster/privatecanal/data/aws_launch_template_master-us-test-1a.masters.privatecanal.example.com_user_data
+++ b/tests/integration/update_cluster/privatecanal/data/aws_launch_template_master-us-test-1a.masters.privatecanal.example.com_user_data
@@ -128,7 +128,7 @@ ClusterName: privatecanal.example.com
 ConfigBase: memfs://clusters.example.com/privatecanal.example.com
 InstanceGroupName: master-us-test-1a
 InstanceGroupRole: ControlPlane
-NodeupConfigHash: V2xXI+gZ8IuOmhHiTU47XRflgrZpp9Wf1tiJYZP/q+8=
+NodeupConfigHash: ZwZ+BrNXwlpfaHz/iEgD5Oi1kXgil838TEydD+r/Qus=
 
 __EOF_KUBE_ENV
 
diff --git a/tests/integration/update_cluster/privatecanal/data/aws_launch_template_nodes.privatecanal.example.com_user_data b/tests/integration/update_cluster/privatecanal/data/aws_launch_template_nodes.privatecanal.example.com_user_data
index 4c546d159b..7601a7901d 100644
--- a/tests/integration/update_cluster/privatecanal/data/aws_launch_template_nodes.privatecanal.example.com_user_data
+++ b/tests/integration/update_cluster/privatecanal/data/aws_launch_template_nodes.privatecanal.example.com_user_data
@@ -151,7 +151,7 @@ ConfigServer:
   - https://kops-controller.internal.privatecanal.example.com:3988/
 InstanceGroupName: nodes
 InstanceGroupRole: Node
-NodeupConfigHash: 46bbpdy8FQ2EOQ9aqwoURN/qZop0tMblnzPfLffX9z4=
+NodeupConfigHash: PBYYCXJ1beHmCXPcVot3+rNpiBJiEhmXa0eE22I3yHo=
 
 __EOF_KUBE_ENV
 
diff --git a/tests/integration/update_cluster/privatecanal/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/privatecanal/data/aws_s3_object_cluster-completed.spec_content
index 839dbc2bdd..b26cd9223a 100644
--- a/tests/integration/update_cluster/privatecanal/data/aws_s3_object_cluster-completed.spec_content
+++ b/tests/integration/update_cluster/privatecanal/data/aws_s3_object_cluster-completed.spec_content
@@ -26,15 +26,12 @@ spec:
   cloudProvider: aws
   clusterDNSDomain: cluster.local
   configBase: memfs://clusters.example.com/privatecanal.example.com
-  containerRuntime: containerd
   containerd:
     logLevel: info
     runc:
       version: 1.1.5
     version: 1.6.20
   dnsZone: Z1AFAKE1ZON3YO
-  docker:
-    skipInstall: true
   etcdClusters:
   - backups:
       backupStore: memfs://clusters.example.com/privatecanal.example.com/backups/etcd/main
diff --git a/tests/integration/update_cluster/privatecanal/data/aws_s3_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/privatecanal/data/aws_s3_object_nodeupconfig-master-us-test-1a_content
index 5b24e40202..47dace54c2 100644
--- a/tests/integration/update_cluster/privatecanal/data/aws_s3_object_nodeupconfig-master-us-test-1a_content
+++ b/tests/integration/update_cluster/privatecanal/data/aws_s3_object_nodeupconfig-master-us-test-1a_content
@@ -226,7 +226,6 @@ CAs:
     9B7UD2ushcVFPtaeoL9Gfu8aY4KJBeqqg5ojl4qmRnThjw==
     -----END CERTIFICATE-----
 ClusterName: privatecanal.example.com
-ContainerRuntime: containerd
 ControlPlaneConfig:
   KubeControllerManager:
     allocateNodeCIDRs: true
@@ -320,8 +319,6 @@ containerdConfig:
   runc:
     version: 1.1.5
   version: 1.6.20
-docker:
-  skipInstall: true
 etcdManifests:
 - memfs://clusters.example.com/privatecanal.example.com/manifests/etcd/main-master-us-test-1a.yaml
 - memfs://clusters.example.com/privatecanal.example.com/manifests/etcd/events-master-us-test-1a.yaml
diff --git a/tests/integration/update_cluster/privatecanal/data/aws_s3_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/privatecanal/data/aws_s3_object_nodeupconfig-nodes_content
index c240807e7b..ed6d1c8c09 100644
--- a/tests/integration/update_cluster/privatecanal/data/aws_s3_object_nodeupconfig-nodes_content
+++ b/tests/integration/update_cluster/privatecanal/data/aws_s3_object_nodeupconfig-nodes_content
@@ -13,7 +13,6 @@ Assets:
   - 54e79e4d48b9e191767e4abc08be1a8476a1c757e9a9f8c45c6ded001226867f@https://github.com/opencontainers/runc/releases/download/v1.1.5/runc.arm64
 CAs: {}
 ClusterName: privatecanal.example.com
-ContainerRuntime: containerd
 Hooks:
 - null
 - null
@@ -56,7 +55,5 @@ containerdConfig:
   runc:
     version: 1.1.5
   version: 1.6.20
-docker:
-  skipInstall: true
 usesLegacyGossip: false
 usesNoneDNS: false
diff --git a/tests/integration/update_cluster/privatecilium-eni/data/aws_launch_template_master-us-test-1a.masters.privatecilium.example.com_user_data b/tests/integration/update_cluster/privatecilium-eni/data/aws_launch_template_master-us-test-1a.masters.privatecilium.example.com_user_data
index a6c27d6c16..fa2845d768 100644
--- a/tests/integration/update_cluster/privatecilium-eni/data/aws_launch_template_master-us-test-1a.masters.privatecilium.example.com_user_data
+++ b/tests/integration/update_cluster/privatecilium-eni/data/aws_launch_template_master-us-test-1a.masters.privatecilium.example.com_user_data
@@ -128,7 +128,7 @@ ClusterName: privatecilium.example.com
 ConfigBase: memfs://clusters.example.com/privatecilium.example.com
 InstanceGroupName: master-us-test-1a
 InstanceGroupRole: ControlPlane
-NodeupConfigHash: nfVyB3tklLjZlM0e4nH8oj72R2EmHEiWYrvFBux+C8o=
+NodeupConfigHash: oHvT5kc5x/1F5dHg+2+fPOtWG7qTDEqiitKjbs8Oavg=
 
 __EOF_KUBE_ENV
 
diff --git a/tests/integration/update_cluster/privatecilium-eni/data/aws_launch_template_nodes.privatecilium.example.com_user_data b/tests/integration/update_cluster/privatecilium-eni/data/aws_launch_template_nodes.privatecilium.example.com_user_data
index 9eec4cdf95..ebc5eef297 100644
--- a/tests/integration/update_cluster/privatecilium-eni/data/aws_launch_template_nodes.privatecilium.example.com_user_data
+++ b/tests/integration/update_cluster/privatecilium-eni/data/aws_launch_template_nodes.privatecilium.example.com_user_data
@@ -151,7 +151,7 @@ ConfigServer:
   - https://kops-controller.internal.privatecilium.example.com:3988/
 InstanceGroupName: nodes
 InstanceGroupRole: Node
-NodeupConfigHash: Jn2d8cdGHRS+aB3mywDueplKKyhALzMEGxDFO+abfCQ=
+NodeupConfigHash: TLheye7sT9qHcGMMJL6LeTPKlrCHra7V4aH7PCi2WNM=
 
 __EOF_KUBE_ENV
 
diff --git a/tests/integration/update_cluster/privatecilium-eni/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/privatecilium-eni/data/aws_s3_object_cluster-completed.spec_content
index a7198b72e8..f2eac74e19 100644
--- a/tests/integration/update_cluster/privatecilium-eni/data/aws_s3_object_cluster-completed.spec_content
+++ b/tests/integration/update_cluster/privatecilium-eni/data/aws_s3_object_cluster-completed.spec_content
@@ -26,15 +26,12 @@ spec:
   cloudProvider: aws
   clusterDNSDomain: cluster.local
   configBase: memfs://clusters.example.com/privatecilium.example.com
-  containerRuntime: containerd
   containerd:
     logLevel: info
     runc:
       version: 1.1.5
     version: 1.6.20
   dnsZone: Z1AFAKE1ZON3YO
-  docker:
-    skipInstall: true
   etcdClusters:
   - backups:
       backupStore: memfs://clusters.example.com/privatecilium.example.com/backups/etcd/main
diff --git a/tests/integration/update_cluster/privatecilium-eni/data/aws_s3_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/privatecilium-eni/data/aws_s3_object_nodeupconfig-master-us-test-1a_content
index 103e4f428c..fbd237975c 100644
--- a/tests/integration/update_cluster/privatecilium-eni/data/aws_s3_object_nodeupconfig-master-us-test-1a_content
+++ b/tests/integration/update_cluster/privatecilium-eni/data/aws_s3_object_nodeupconfig-master-us-test-1a_content
@@ -226,7 +226,6 @@ CAs:
     9B7UD2ushcVFPtaeoL9Gfu8aY4KJBeqqg5ojl4qmRnThjw==
     -----END CERTIFICATE-----
 ClusterName: privatecilium.example.com
-ContainerRuntime: containerd
 ControlPlaneConfig:
   KubeControllerManager:
     allocateNodeCIDRs: true
@@ -322,8 +321,6 @@ containerdConfig:
   runc:
     version: 1.1.5
   version: 1.6.20
-docker:
-  skipInstall: true
 etcdManifests:
 - memfs://clusters.example.com/privatecilium.example.com/manifests/etcd/main-master-us-test-1a.yaml
 - memfs://clusters.example.com/privatecilium.example.com/manifests/etcd/events-master-us-test-1a.yaml
diff --git a/tests/integration/update_cluster/privatecilium-eni/data/aws_s3_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/privatecilium-eni/data/aws_s3_object_nodeupconfig-nodes_content
index 7a10e7c944..4f96442874 100644
--- a/tests/integration/update_cluster/privatecilium-eni/data/aws_s3_object_nodeupconfig-nodes_content
+++ b/tests/integration/update_cluster/privatecilium-eni/data/aws_s3_object_nodeupconfig-nodes_content
@@ -13,7 +13,6 @@ Assets:
   - 54e79e4d48b9e191767e4abc08be1a8476a1c757e9a9f8c45c6ded001226867f@https://github.com/opencontainers/runc/releases/download/v1.1.5/runc.arm64
 CAs: {}
 ClusterName: privatecilium.example.com
-ContainerRuntime: containerd
 Hooks:
 - null
 - null
@@ -58,7 +57,5 @@ containerdConfig:
   runc:
     version: 1.1.5
   version: 1.6.20
-docker:
-  skipInstall: true
 usesLegacyGossip: false
 usesNoneDNS: false
diff --git a/tests/integration/update_cluster/privatecilium/data/aws_launch_template_master-us-test-1a.masters.privatecilium.example.com_user_data b/tests/integration/update_cluster/privatecilium/data/aws_launch_template_master-us-test-1a.masters.privatecilium.example.com_user_data
index b4dd1ff15d..1bcb7ed7e1 100644
--- a/tests/integration/update_cluster/privatecilium/data/aws_launch_template_master-us-test-1a.masters.privatecilium.example.com_user_data
+++ b/tests/integration/update_cluster/privatecilium/data/aws_launch_template_master-us-test-1a.masters.privatecilium.example.com_user_data
@@ -128,7 +128,7 @@ ClusterName: privatecilium.example.com
 ConfigBase: memfs://clusters.example.com/privatecilium.example.com
 InstanceGroupName: master-us-test-1a
 InstanceGroupRole: ControlPlane
-NodeupConfigHash: 61nbJYoGn27nFBC0qdY8Q8pPgZerLTwdmDKyJf2d6+E=
+NodeupConfigHash: 4l/JWavpRqrFzxRDKIWeH8qpCxpkoLi6s53iKYz//NU=
 
 __EOF_KUBE_ENV
 
diff --git a/tests/integration/update_cluster/privatecilium/data/aws_launch_template_nodes.privatecilium.example.com_user_data b/tests/integration/update_cluster/privatecilium/data/aws_launch_template_nodes.privatecilium.example.com_user_data
index 6d22987d98..ac4cae17bb 100644
--- a/tests/integration/update_cluster/privatecilium/data/aws_launch_template_nodes.privatecilium.example.com_user_data
+++ b/tests/integration/update_cluster/privatecilium/data/aws_launch_template_nodes.privatecilium.example.com_user_data
@@ -151,7 +151,7 @@ ConfigServer:
   - https://kops-controller.internal.privatecilium.example.com:3988/
 InstanceGroupName: nodes
 InstanceGroupRole: Node
-NodeupConfigHash: GGDOT7fYi40wslBhmOntO204nl+d+SmKK5nN6w1EOg0=
+NodeupConfigHash: pfbXrJJ66tMciuBrBNUeypeRSD/Zm7SmgvrdtCfvyM0=
 
 __EOF_KUBE_ENV
 
diff --git a/tests/integration/update_cluster/privatecilium/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/privatecilium/data/aws_s3_object_cluster-completed.spec_content
index 484b971ff3..6dd8aba8af 100644
--- a/tests/integration/update_cluster/privatecilium/data/aws_s3_object_cluster-completed.spec_content
+++ b/tests/integration/update_cluster/privatecilium/data/aws_s3_object_cluster-completed.spec_content
@@ -26,15 +26,12 @@ spec:
   cloudProvider: aws
   clusterDNSDomain: cluster.local
   configBase: memfs://clusters.example.com/privatecilium.example.com
-  containerRuntime: containerd
   containerd:
     logLevel: info
     runc:
       version: 1.1.5
     version: 1.6.20
   dnsZone: Z1AFAKE1ZON3YO
-  docker:
-    skipInstall: true
   etcdClusters:
   - backups:
       backupStore: memfs://clusters.example.com/privatecilium.example.com/backups/etcd/main
diff --git a/tests/integration/update_cluster/privatecilium/data/aws_s3_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/privatecilium/data/aws_s3_object_nodeupconfig-master-us-test-1a_content
index 5c776b9120..7c1b621699 100644
--- a/tests/integration/update_cluster/privatecilium/data/aws_s3_object_nodeupconfig-master-us-test-1a_content
+++ b/tests/integration/update_cluster/privatecilium/data/aws_s3_object_nodeupconfig-master-us-test-1a_content
@@ -226,7 +226,6 @@ CAs:
     9B7UD2ushcVFPtaeoL9Gfu8aY4KJBeqqg5ojl4qmRnThjw==
     -----END CERTIFICATE-----
 ClusterName: privatecilium.example.com
-ContainerRuntime: containerd
 ControlPlaneConfig:
   KubeControllerManager:
     allocateNodeCIDRs: true
@@ -321,8 +320,6 @@ containerdConfig:
   runc:
     version: 1.1.5
   version: 1.6.20
-docker:
-  skipInstall: true
 etcdManifests:
 - memfs://clusters.example.com/privatecilium.example.com/manifests/etcd/main-master-us-test-1a.yaml
 - memfs://clusters.example.com/privatecilium.example.com/manifests/etcd/events-master-us-test-1a.yaml
diff --git a/tests/integration/update_cluster/privatecilium/data/aws_s3_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/privatecilium/data/aws_s3_object_nodeupconfig-nodes_content
index 779e605c2b..815281c0c9 100644
--- a/tests/integration/update_cluster/privatecilium/data/aws_s3_object_nodeupconfig-nodes_content
+++ b/tests/integration/update_cluster/privatecilium/data/aws_s3_object_nodeupconfig-nodes_content
@@ -13,7 +13,6 @@ Assets:
   - 54e79e4d48b9e191767e4abc08be1a8476a1c757e9a9f8c45c6ded001226867f@https://github.com/opencontainers/runc/releases/download/v1.1.5/runc.arm64
 CAs: {}
 ClusterName: privatecilium.example.com
-ContainerRuntime: containerd
 Hooks:
 - null
 - null
@@ -57,7 +56,5 @@ containerdConfig:
   runc:
     version: 1.1.5
   version: 1.6.20
-docker:
-  skipInstall: true
 usesLegacyGossip: false
 usesNoneDNS: false
diff --git a/tests/integration/update_cluster/privatecilium2/data/aws_launch_template_master-us-test-1a.masters.privatecilium.example.com_user_data b/tests/integration/update_cluster/privatecilium2/data/aws_launch_template_master-us-test-1a.masters.privatecilium.example.com_user_data
index d0d1ca9159..84e470fc1d 100644
--- a/tests/integration/update_cluster/privatecilium2/data/aws_launch_template_master-us-test-1a.masters.privatecilium.example.com_user_data
+++ b/tests/integration/update_cluster/privatecilium2/data/aws_launch_template_master-us-test-1a.masters.privatecilium.example.com_user_data
@@ -128,7 +128,7 @@ ClusterName: privatecilium.example.com
 ConfigBase: memfs://clusters.example.com/privatecilium.example.com
 InstanceGroupName: master-us-test-1a
 InstanceGroupRole: ControlPlane
-NodeupConfigHash: eXJz9tun1l+uQK894613a4dayTrrDr+cRUFFsYavwM4=
+NodeupConfigHash: pJ+szTc9vEwLVl0vDzGJLoCaXah2ap+Tfu0YZdSMBWw=
 
 __EOF_KUBE_ENV
 
diff --git a/tests/integration/update_cluster/privatecilium2/data/aws_launch_template_nodes.privatecilium.example.com_user_data b/tests/integration/update_cluster/privatecilium2/data/aws_launch_template_nodes.privatecilium.example.com_user_data
index d38ef7f3ee..db2495e13c 100644
--- a/tests/integration/update_cluster/privatecilium2/data/aws_launch_template_nodes.privatecilium.example.com_user_data
+++ b/tests/integration/update_cluster/privatecilium2/data/aws_launch_template_nodes.privatecilium.example.com_user_data
@@ -151,7 +151,7 @@ ConfigServer:
   - https://kops-controller.internal.privatecilium.example.com:3988/
 InstanceGroupName: nodes
 InstanceGroupRole: Node
-NodeupConfigHash: S9oKBuxRr0hL5WKyWER1j6BbLjp/akZFZ7GzIbSXx+U=
+NodeupConfigHash: NrLniwtKa38qx26x1S0d1/kujJd7CANTjPHEMeWjiWg=
 
 __EOF_KUBE_ENV
 
diff --git a/tests/integration/update_cluster/privatecilium2/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/privatecilium2/data/aws_s3_object_cluster-completed.spec_content
index 8550169180..a8c6786757 100644
--- a/tests/integration/update_cluster/privatecilium2/data/aws_s3_object_cluster-completed.spec_content
+++ b/tests/integration/update_cluster/privatecilium2/data/aws_s3_object_cluster-completed.spec_content
@@ -29,15 +29,12 @@ spec:
   cloudProvider: aws
   clusterDNSDomain: cluster.local
   configBase: memfs://clusters.example.com/privatecilium.example.com
-  containerRuntime: containerd
   containerd:
     logLevel: info
     runc:
       version: 1.1.5
     version: 1.6.20
   dnsZone: Z1AFAKE1ZON3YO
-  docker:
-    skipInstall: true
   etcdClusters:
   - backups:
       backupStore: memfs://clusters.example.com/privatecilium.example.com/backups/etcd/main
diff --git a/tests/integration/update_cluster/privatecilium2/data/aws_s3_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/privatecilium2/data/aws_s3_object_nodeupconfig-master-us-test-1a_content
index 00f3fd2ac1..639db9223a 100644
--- a/tests/integration/update_cluster/privatecilium2/data/aws_s3_object_nodeupconfig-master-us-test-1a_content
+++ b/tests/integration/update_cluster/privatecilium2/data/aws_s3_object_nodeupconfig-master-us-test-1a_content
@@ -226,7 +226,6 @@ CAs:
     9B7UD2ushcVFPtaeoL9Gfu8aY4KJBeqqg5ojl4qmRnThjw==
     -----END CERTIFICATE-----
 ClusterName: privatecilium.example.com
-ContainerRuntime: containerd
 ControlPlaneConfig:
   KubeControllerManager:
     allocateNodeCIDRs: true
@@ -321,8 +320,6 @@ containerdConfig:
   runc:
     version: 1.1.5
   version: 1.6.20
-docker:
-  skipInstall: true
 etcdManifests:
 - memfs://clusters.example.com/privatecilium.example.com/manifests/etcd/main-master-us-test-1a.yaml
 - memfs://clusters.example.com/privatecilium.example.com/manifests/etcd/events-master-us-test-1a.yaml
diff --git a/tests/integration/update_cluster/privatecilium2/data/aws_s3_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/privatecilium2/data/aws_s3_object_nodeupconfig-nodes_content
index d656377531..3e59c6dd57 100644
--- a/tests/integration/update_cluster/privatecilium2/data/aws_s3_object_nodeupconfig-nodes_content
+++ b/tests/integration/update_cluster/privatecilium2/data/aws_s3_object_nodeupconfig-nodes_content
@@ -13,7 +13,6 @@ Assets:
   - 54e79e4d48b9e191767e4abc08be1a8476a1c757e9a9f8c45c6ded001226867f@https://github.com/opencontainers/runc/releases/download/v1.1.5/runc.arm64
 CAs: {}
 ClusterName: privatecilium.example.com
-ContainerRuntime: containerd
 Hooks:
 - null
 - null
@@ -57,7 +56,5 @@ containerdConfig:
   runc:
     version: 1.1.5
   version: 1.6.20
-docker:
-  skipInstall: true
 usesLegacyGossip: false
 usesNoneDNS: false
diff --git a/tests/integration/update_cluster/privateciliumadvanced/data/aws_launch_template_master-us-test-1a.masters.privateciliumadvanced.example.com_user_data b/tests/integration/update_cluster/privateciliumadvanced/data/aws_launch_template_master-us-test-1a.masters.privateciliumadvanced.example.com_user_data
index 30a1bed1fa..9be7e40239 100644
--- a/tests/integration/update_cluster/privateciliumadvanced/data/aws_launch_template_master-us-test-1a.masters.privateciliumadvanced.example.com_user_data
+++ b/tests/integration/update_cluster/privateciliumadvanced/data/aws_launch_template_master-us-test-1a.masters.privateciliumadvanced.example.com_user_data
@@ -128,7 +128,7 @@ ClusterName: privateciliumadvanced.example.com
 ConfigBase: memfs://clusters.example.com/privateciliumadvanced.example.com
 InstanceGroupName: master-us-test-1a
 InstanceGroupRole: ControlPlane
-NodeupConfigHash: d123SB48S6Sa2lrrEr0OZkZhtQ1EmavYL+F8yEqx/ow=
+NodeupConfigHash: J7//O+HOG5YAbIRRYMA3+vbRp4iTmAfnu8vI+YObiJU=
 
 __EOF_KUBE_ENV
 
diff --git a/tests/integration/update_cluster/privateciliumadvanced/data/aws_launch_template_nodes.privateciliumadvanced.example.com_user_data b/tests/integration/update_cluster/privateciliumadvanced/data/aws_launch_template_nodes.privateciliumadvanced.example.com_user_data
index 597dfc8164..672f8b77bd 100644
--- a/tests/integration/update_cluster/privateciliumadvanced/data/aws_launch_template_nodes.privateciliumadvanced.example.com_user_data
+++ b/tests/integration/update_cluster/privateciliumadvanced/data/aws_launch_template_nodes.privateciliumadvanced.example.com_user_data
@@ -151,7 +151,7 @@ ConfigServer:
   - https://kops-controller.internal.privateciliumadvanced.example.com:3988/
 InstanceGroupName: nodes
 InstanceGroupRole: Node
-NodeupConfigHash: BttSGeoNZG6DYYh8MKK1P9rS4bKdniecS1sSWWtZmA0=
+NodeupConfigHash: urg3Xg0szeLYheUdem8JjNvSCzDJ9V5lvEnU9xWhXmA=
 
 __EOF_KUBE_ENV
 
diff --git a/tests/integration/update_cluster/privateciliumadvanced/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/privateciliumadvanced/data/aws_s3_object_cluster-completed.spec_content
index f980c611b8..92f8802b52 100644
--- a/tests/integration/update_cluster/privateciliumadvanced/data/aws_s3_object_cluster-completed.spec_content
+++ b/tests/integration/update_cluster/privateciliumadvanced/data/aws_s3_object_cluster-completed.spec_content
@@ -26,15 +26,12 @@ spec:
   cloudProvider: aws
   clusterDNSDomain: cluster.local
   configBase: memfs://clusters.example.com/privateciliumadvanced.example.com
-  containerRuntime: containerd
   containerd:
     logLevel: info
     runc:
       version: 1.1.5
     version: 1.6.20
   dnsZone: Z1AFAKE1ZON3YO
-  docker:
-    skipInstall: true
   etcdClusters:
   - backups:
       backupStore: memfs://clusters.example.com/privateciliumadvanced.example.com/backups/etcd/main
diff --git a/tests/integration/update_cluster/privateciliumadvanced/data/aws_s3_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/privateciliumadvanced/data/aws_s3_object_nodeupconfig-master-us-test-1a_content
index e1c534bc6f..4d5e5a190f 100644
--- a/tests/integration/update_cluster/privateciliumadvanced/data/aws_s3_object_nodeupconfig-master-us-test-1a_content
+++ b/tests/integration/update_cluster/privateciliumadvanced/data/aws_s3_object_nodeupconfig-master-us-test-1a_content
@@ -293,7 +293,6 @@ CAs:
     9B7UD2ushcVFPtaeoL9Gfu8aY4KJBeqqg5ojl4qmRnThjw==
     -----END CERTIFICATE-----
 ClusterName: privateciliumadvanced.example.com
-ContainerRuntime: containerd
 ControlPlaneConfig:
   KubeControllerManager:
     allocateNodeCIDRs: true
@@ -390,8 +389,6 @@ containerdConfig:
   runc:
     version: 1.1.5
   version: 1.6.20
-docker:
-  skipInstall: true
 etcdManifests:
 - memfs://clusters.example.com/privateciliumadvanced.example.com/manifests/etcd/main-master-us-test-1a.yaml
 - memfs://clusters.example.com/privateciliumadvanced.example.com/manifests/etcd/events-master-us-test-1a.yaml
diff --git a/tests/integration/update_cluster/privateciliumadvanced/data/aws_s3_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/privateciliumadvanced/data/aws_s3_object_nodeupconfig-nodes_content
index 2279b03ddc..25c9324d0a 100644
--- a/tests/integration/update_cluster/privateciliumadvanced/data/aws_s3_object_nodeupconfig-nodes_content
+++ b/tests/integration/update_cluster/privateciliumadvanced/data/aws_s3_object_nodeupconfig-nodes_content
@@ -36,7 +36,6 @@ CAs:
     MQNfAQ==
     -----END CERTIFICATE-----
 ClusterName: privateciliumadvanced.example.com
-ContainerRuntime: containerd
 Hooks:
 - null
 - null
@@ -79,7 +78,5 @@ containerdConfig:
   runc:
     version: 1.1.5
   version: 1.6.20
-docker:
-  skipInstall: true
 usesLegacyGossip: false
 usesNoneDNS: false
diff --git a/tests/integration/update_cluster/privatedns1/data/aws_launch_template_master-us-test-1a.masters.privatedns1.example.com_user_data b/tests/integration/update_cluster/privatedns1/data/aws_launch_template_master-us-test-1a.masters.privatedns1.example.com_user_data
index 1f55b97ece..508b66670f 100644
--- a/tests/integration/update_cluster/privatedns1/data/aws_launch_template_master-us-test-1a.masters.privatedns1.example.com_user_data
+++ b/tests/integration/update_cluster/privatedns1/data/aws_launch_template_master-us-test-1a.masters.privatedns1.example.com_user_data
@@ -128,7 +128,7 @@ ClusterName: privatedns1.example.com
 ConfigBase: memfs://clusters.example.com/privatedns1.example.com
 InstanceGroupName: master-us-test-1a
 InstanceGroupRole: ControlPlane
-NodeupConfigHash: dahnBaU8EhJU/hYOeJ4zjZ3PoS820NCYICHKxLjQc6w=
+NodeupConfigHash: syDOXFAVu76jk5nz+NuVuwf269m+jI5O8JvtS7wjeNU=
 
 __EOF_KUBE_ENV
 
diff --git a/tests/integration/update_cluster/privatedns1/data/aws_launch_template_nodes.privatedns1.example.com_user_data b/tests/integration/update_cluster/privatedns1/data/aws_launch_template_nodes.privatedns1.example.com_user_data
index 876f498209..64c9160fcc 100644
--- a/tests/integration/update_cluster/privatedns1/data/aws_launch_template_nodes.privatedns1.example.com_user_data
+++ b/tests/integration/update_cluster/privatedns1/data/aws_launch_template_nodes.privatedns1.example.com_user_data
@@ -151,7 +151,7 @@ ConfigServer:
   - https://kops-controller.internal.privatedns1.example.com:3988/
 InstanceGroupName: nodes
 InstanceGroupRole: Node
-NodeupConfigHash: hmT07iT8OR2Id/qzWGvePSQBiAAtptrv3/Vq/i0psPA=
+NodeupConfigHash: xMai8ee5pFxnvO8cXBU/TZEsbkcoihD6HsBZG2eyfyI=
 
 __EOF_KUBE_ENV
 
diff --git a/tests/integration/update_cluster/privatedns1/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/privatedns1/data/aws_s3_object_cluster-completed.spec_content
index c7e85ee41d..744f8922d2 100644
--- a/tests/integration/update_cluster/privatedns1/data/aws_s3_object_cluster-completed.spec_content
+++ b/tests/integration/update_cluster/privatedns1/data/aws_s3_object_cluster-completed.spec_content
@@ -29,15 +29,12 @@ spec:
   cloudProvider: aws
   clusterDNSDomain: cluster.local
   configBase: memfs://clusters.example.com/privatedns1.example.com
-  containerRuntime: containerd
   containerd:
     logLevel: info
     runc:
       version: 1.1.5
     version: 1.6.20
   dnsZone: internal.example.com
-  docker:
-    skipInstall: true
   etcdClusters:
   - backups:
       backupStore: memfs://clusters.example.com/privatedns1.example.com/backups/etcd/main
diff --git a/tests/integration/update_cluster/privatedns1/data/aws_s3_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/privatedns1/data/aws_s3_object_nodeupconfig-master-us-test-1a_content
index 61cc26fbac..8efc8a659f 100644
--- a/tests/integration/update_cluster/privatedns1/data/aws_s3_object_nodeupconfig-master-us-test-1a_content
+++ b/tests/integration/update_cluster/privatedns1/data/aws_s3_object_nodeupconfig-master-us-test-1a_content
@@ -227,7 +227,6 @@ CAs:
     9B7UD2ushcVFPtaeoL9Gfu8aY4KJBeqqg5ojl4qmRnThjw==
     -----END CERTIFICATE-----
 ClusterName: privatedns1.example.com
-ContainerRuntime: containerd
 ControlPlaneConfig:
   KubeControllerManager:
     allocateNodeCIDRs: true
@@ -318,8 +317,6 @@ containerdConfig:
   runc:
     version: 1.1.5
   version: 1.6.20
-docker:
-  skipInstall: true
 etcdManifests:
 - memfs://clusters.example.com/privatedns1.example.com/manifests/etcd/main-master-us-test-1a.yaml
 - memfs://clusters.example.com/privatedns1.example.com/manifests/etcd/events-master-us-test-1a.yaml
diff --git a/tests/integration/update_cluster/privatedns1/data/aws_s3_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/privatedns1/data/aws_s3_object_nodeupconfig-nodes_content
index 120578eb0c..896d0ad47e 100644
--- a/tests/integration/update_cluster/privatedns1/data/aws_s3_object_nodeupconfig-nodes_content
+++ b/tests/integration/update_cluster/privatedns1/data/aws_s3_object_nodeupconfig-nodes_content
@@ -15,7 +15,6 @@ Assets:
   - 54e79e4d48b9e191767e4abc08be1a8476a1c757e9a9f8c45c6ded001226867f@https://github.com/opencontainers/runc/releases/download/v1.1.5/runc.arm64
 CAs: {}
 ClusterName: privatedns1.example.com
-ContainerRuntime: containerd
 Hooks:
 - null
 - null
@@ -57,7 +56,5 @@ containerdConfig:
   runc:
     version: 1.1.5
   version: 1.6.20
-docker:
-  skipInstall: true
 usesLegacyGossip: false
 usesNoneDNS: false
diff --git a/tests/integration/update_cluster/privatedns2/data/aws_launch_template_master-us-test-1a.masters.privatedns2.example.com_user_data b/tests/integration/update_cluster/privatedns2/data/aws_launch_template_master-us-test-1a.masters.privatedns2.example.com_user_data
index 974fdc4768..0c61212cc2 100644
--- a/tests/integration/update_cluster/privatedns2/data/aws_launch_template_master-us-test-1a.masters.privatedns2.example.com_user_data
+++ b/tests/integration/update_cluster/privatedns2/data/aws_launch_template_master-us-test-1a.masters.privatedns2.example.com_user_data
@@ -128,7 +128,7 @@ ClusterName: privatedns2.example.com
 ConfigBase: memfs://clusters.example.com/privatedns2.example.com
 InstanceGroupName: master-us-test-1a
 InstanceGroupRole: ControlPlane
-NodeupConfigHash: ZUBBcs/tLubb/FuNCcZGer0OUmeFZy9cHqf3JPKvmjw=
+NodeupConfigHash: QMO9JwLcK2KcZZ1WnW5F3oal/kBM3uu/y8qJdJhlwg8=
 
 __EOF_KUBE_ENV
 
diff --git a/tests/integration/update_cluster/privatedns2/data/aws_launch_template_nodes.privatedns2.example.com_user_data b/tests/integration/update_cluster/privatedns2/data/aws_launch_template_nodes.privatedns2.example.com_user_data
index cff7e07758..c5d53654c0 100644
--- a/tests/integration/update_cluster/privatedns2/data/aws_launch_template_nodes.privatedns2.example.com_user_data
+++ b/tests/integration/update_cluster/privatedns2/data/aws_launch_template_nodes.privatedns2.example.com_user_data
@@ -151,7 +151,7 @@ ConfigServer:
   - https://kops-controller.internal.privatedns2.example.com:3988/
 InstanceGroupName: nodes
 InstanceGroupRole: Node
-NodeupConfigHash: q8SZXE/VW/t8DA+/w4EzCBKoQVcHcfchSH/Y8nSCDYQ=
+NodeupConfigHash: vLe7LuERV/YzTwziOrggLVKRhRt4th20BN3lQD5+zrg=
 
 __EOF_KUBE_ENV
 
diff --git a/tests/integration/update_cluster/privatedns2/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/privatedns2/data/aws_s3_object_cluster-completed.spec_content
index 721fb3941c..c72a168c3a 100644
--- a/tests/integration/update_cluster/privatedns2/data/aws_s3_object_cluster-completed.spec_content
+++ b/tests/integration/update_cluster/privatedns2/data/aws_s3_object_cluster-completed.spec_content
@@ -26,15 +26,12 @@ spec:
   cloudProvider: aws
   clusterDNSDomain: cluster.local
   configBase: memfs://clusters.example.com/privatedns2.example.com
-  containerRuntime: containerd
   containerd:
     logLevel: info
     runc:
       version: 1.1.5
     version: 1.6.20
   dnsZone: private.example.com
-  docker:
-    skipInstall: true
   etcdClusters:
   - backups:
       backupStore: memfs://clusters.example.com/privatedns2.example.com/backups/etcd/main
diff --git a/tests/integration/update_cluster/privatedns2/data/aws_s3_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/privatedns2/data/aws_s3_object_nodeupconfig-master-us-test-1a_content
index 92eed96a0f..677f09141b 100644
--- a/tests/integration/update_cluster/privatedns2/data/aws_s3_object_nodeupconfig-master-us-test-1a_content
+++ b/tests/integration/update_cluster/privatedns2/data/aws_s3_object_nodeupconfig-master-us-test-1a_content
@@ -226,7 +226,6 @@ CAs:
     9B7UD2ushcVFPtaeoL9Gfu8aY4KJBeqqg5ojl4qmRnThjw==
     -----END CERTIFICATE-----
 ClusterName: privatedns2.example.com
-ContainerRuntime: containerd
 ControlPlaneConfig:
   KubeControllerManager:
     allocateNodeCIDRs: true
@@ -320,8 +319,6 @@ containerdConfig:
   runc:
     version: 1.1.5
   version: 1.6.20
-docker:
-  skipInstall: true
 etcdManifests:
 - memfs://clusters.example.com/privatedns2.example.com/manifests/etcd/main-master-us-test-1a.yaml
 - memfs://clusters.example.com/privatedns2.example.com/manifests/etcd/events-master-us-test-1a.yaml
diff --git a/tests/integration/update_cluster/privatedns2/data/aws_s3_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/privatedns2/data/aws_s3_object_nodeupconfig-nodes_content
index e1712ec5fb..1e6d4398d9 100644
--- a/tests/integration/update_cluster/privatedns2/data/aws_s3_object_nodeupconfig-nodes_content
+++ b/tests/integration/update_cluster/privatedns2/data/aws_s3_object_nodeupconfig-nodes_content
@@ -13,7 +13,6 @@ Assets:
   - 54e79e4d48b9e191767e4abc08be1a8476a1c757e9a9f8c45c6ded001226867f@https://github.com/opencontainers/runc/releases/download/v1.1.5/runc.arm64
 CAs: {}
 ClusterName: privatedns2.example.com
-ContainerRuntime: containerd
 Hooks:
 - null
 - null
@@ -56,7 +55,5 @@ containerdConfig:
   runc:
     version: 1.1.5
   version: 1.6.20
-docker:
-  skipInstall: true
 usesLegacyGossip: false
 usesNoneDNS: false
diff --git a/tests/integration/update_cluster/privateflannel/data/aws_launch_template_master-us-test-1a.masters.privateflannel.example.com_user_data b/tests/integration/update_cluster/privateflannel/data/aws_launch_template_master-us-test-1a.masters.privateflannel.example.com_user_data
index 8bf9b15d1b..0588638405 100644
--- a/tests/integration/update_cluster/privateflannel/data/aws_launch_template_master-us-test-1a.masters.privateflannel.example.com_user_data
+++ b/tests/integration/update_cluster/privateflannel/data/aws_launch_template_master-us-test-1a.masters.privateflannel.example.com_user_data
@@ -128,7 +128,7 @@ ClusterName: privateflannel.example.com
 ConfigBase: memfs://clusters.example.com/privateflannel.example.com
 InstanceGroupName: master-us-test-1a
 InstanceGroupRole: ControlPlane
-NodeupConfigHash: ZN5n4QClTX1rmBde3yoDK+pDLq2H85G5NPiiPq1uCDo=
+NodeupConfigHash: wehd/kTjhwJjl5g2iVvPEWJAGoJbqCkvlGCeO0ANyzE=
 
 __EOF_KUBE_ENV
 
diff --git a/tests/integration/update_cluster/privateflannel/data/aws_launch_template_nodes.privateflannel.example.com_user_data b/tests/integration/update_cluster/privateflannel/data/aws_launch_template_nodes.privateflannel.example.com_user_data
index 73e32135d7..658e4df4c4 100644
--- a/tests/integration/update_cluster/privateflannel/data/aws_launch_template_nodes.privateflannel.example.com_user_data
+++ b/tests/integration/update_cluster/privateflannel/data/aws_launch_template_nodes.privateflannel.example.com_user_data
@@ -151,7 +151,7 @@ ConfigServer:
   - https://kops-controller.internal.privateflannel.example.com:3988/
 InstanceGroupName: nodes
 InstanceGroupRole: Node
-NodeupConfigHash: jps/Pwp7nqqPvdUiYEG+Tfarve2txU/nqq0xj7mh8Bc=
+NodeupConfigHash: OJWDl7pb8pkME2Cf/mS+lXj1SSYxUcL+bOJ1KDUyL/A=
 
 __EOF_KUBE_ENV
 
diff --git a/tests/integration/update_cluster/privateflannel/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/privateflannel/data/aws_s3_object_cluster-completed.spec_content
index 63719200e2..328dc5deda 100644
--- a/tests/integration/update_cluster/privateflannel/data/aws_s3_object_cluster-completed.spec_content
+++ b/tests/integration/update_cluster/privateflannel/data/aws_s3_object_cluster-completed.spec_content
@@ -26,15 +26,12 @@ spec:
   cloudProvider: aws
   clusterDNSDomain: cluster.local
   configBase: memfs://clusters.example.com/privateflannel.example.com
-  containerRuntime: containerd
   containerd:
     logLevel: info
     runc:
       version: 1.1.5
     version: 1.6.20
   dnsZone: Z1AFAKE1ZON3YO
-  docker:
-    skipInstall: true
   etcdClusters:
   - backups:
       backupStore: memfs://clusters.example.com/privateflannel.example.com/backups/etcd/main
diff --git a/tests/integration/update_cluster/privateflannel/data/aws_s3_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/privateflannel/data/aws_s3_object_nodeupconfig-master-us-test-1a_content
index 703f643717..c339c8597e 100644
--- a/tests/integration/update_cluster/privateflannel/data/aws_s3_object_nodeupconfig-master-us-test-1a_content
+++ b/tests/integration/update_cluster/privateflannel/data/aws_s3_object_nodeupconfig-master-us-test-1a_content
@@ -226,7 +226,6 @@ CAs:
     9B7UD2ushcVFPtaeoL9Gfu8aY4KJBeqqg5ojl4qmRnThjw==
     -----END CERTIFICATE-----
 ClusterName: privateflannel.example.com
-ContainerRuntime: containerd
 ControlPlaneConfig:
   KubeControllerManager:
     allocateNodeCIDRs: true
@@ -321,8 +320,6 @@ containerdConfig:
   runc:
     version: 1.1.5
   version: 1.6.20
-docker:
-  skipInstall: true
 etcdManifests:
 - memfs://clusters.example.com/privateflannel.example.com/manifests/etcd/main-master-us-test-1a.yaml
 - memfs://clusters.example.com/privateflannel.example.com/manifests/etcd/events-master-us-test-1a.yaml
diff --git a/tests/integration/update_cluster/privateflannel/data/aws_s3_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/privateflannel/data/aws_s3_object_nodeupconfig-nodes_content
index 35209ea314..7a22b485ee 100644
--- a/tests/integration/update_cluster/privateflannel/data/aws_s3_object_nodeupconfig-nodes_content
+++ b/tests/integration/update_cluster/privateflannel/data/aws_s3_object_nodeupconfig-nodes_content
@@ -13,7 +13,6 @@ Assets:
   - 54e79e4d48b9e191767e4abc08be1a8476a1c757e9a9f8c45c6ded001226867f@https://github.com/opencontainers/runc/releases/download/v1.1.5/runc.arm64
 CAs: {}
 ClusterName: privateflannel.example.com
-ContainerRuntime: containerd
 Hooks:
 - null
 - null
@@ -57,7 +56,5 @@ containerdConfig:
   runc:
     version: 1.1.5
   version: 1.6.20
-docker:
-  skipInstall: true
 usesLegacyGossip: false
 usesNoneDNS: false
diff --git a/tests/integration/update_cluster/privatekopeio/data/aws_launch_template_master-us-test-1a.masters.privatekopeio.example.com_user_data b/tests/integration/update_cluster/privatekopeio/data/aws_launch_template_master-us-test-1a.masters.privatekopeio.example.com_user_data
index 5b597b7495..c79f5cd291 100644
--- a/tests/integration/update_cluster/privatekopeio/data/aws_launch_template_master-us-test-1a.masters.privatekopeio.example.com_user_data
+++ b/tests/integration/update_cluster/privatekopeio/data/aws_launch_template_master-us-test-1a.masters.privatekopeio.example.com_user_data
@@ -128,7 +128,7 @@ ClusterName: privatekopeio.example.com
 ConfigBase: memfs://clusters.example.com/privatekopeio.example.com
 InstanceGroupName: master-us-test-1a
 InstanceGroupRole: ControlPlane
-NodeupConfigHash: 9DkK0XhE4wpWAz0bmMmmjhZdVvfuQ60yFvIp+KuVfao=
+NodeupConfigHash: xJKTxbMo3xkBIZKEA1bQJ9+URWcdznxaN7FmxAHj7qo=
 
 __EOF_KUBE_ENV
 
diff --git a/tests/integration/update_cluster/privatekopeio/data/aws_launch_template_nodes.privatekopeio.example.com_user_data b/tests/integration/update_cluster/privatekopeio/data/aws_launch_template_nodes.privatekopeio.example.com_user_data
index f62aed66dc..94fe5ce1c4 100644
--- a/tests/integration/update_cluster/privatekopeio/data/aws_launch_template_nodes.privatekopeio.example.com_user_data
+++ b/tests/integration/update_cluster/privatekopeio/data/aws_launch_template_nodes.privatekopeio.example.com_user_data
@@ -151,7 +151,7 @@ ConfigServer:
   - https://kops-controller.internal.privatekopeio.example.com:3988/
 InstanceGroupName: nodes
 InstanceGroupRole: Node
-NodeupConfigHash: m4d/YbZCxC6srrFKGVtqznVJ13U0qwM42XQ8OOwphYo=
+NodeupConfigHash: bLL0GSxoOPphDUlp45NV8tt6vdWnSAzUHrTQuxSheiw=
 
 __EOF_KUBE_ENV
 
diff --git a/tests/integration/update_cluster/privatekopeio/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/privatekopeio/data/aws_s3_object_cluster-completed.spec_content
index 58d907fd82..6a36d02432 100644
--- a/tests/integration/update_cluster/privatekopeio/data/aws_s3_object_cluster-completed.spec_content
+++ b/tests/integration/update_cluster/privatekopeio/data/aws_s3_object_cluster-completed.spec_content
@@ -26,15 +26,12 @@ spec:
   cloudProvider: aws
   clusterDNSDomain: cluster.local
   configBase: memfs://clusters.example.com/privatekopeio.example.com
-  containerRuntime: containerd
   containerd:
     logLevel: info
     runc:
       version: 1.1.5
     version: 1.6.20
   dnsZone: Z1AFAKE1ZON3YO
-  docker:
-    skipInstall: true
   etcdClusters:
   - backups:
       backupStore: memfs://clusters.example.com/privatekopeio.example.com/backups/etcd/main
diff --git a/tests/integration/update_cluster/privatekopeio/data/aws_s3_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/privatekopeio/data/aws_s3_object_nodeupconfig-master-us-test-1a_content
index a572e8e700..653d3176d9 100644
--- a/tests/integration/update_cluster/privatekopeio/data/aws_s3_object_nodeupconfig-master-us-test-1a_content
+++ b/tests/integration/update_cluster/privatekopeio/data/aws_s3_object_nodeupconfig-master-us-test-1a_content
@@ -226,7 +226,6 @@ CAs:
     9B7UD2ushcVFPtaeoL9Gfu8aY4KJBeqqg5ojl4qmRnThjw==
     -----END CERTIFICATE-----
 ClusterName: privatekopeio.example.com
-ContainerRuntime: containerd
 ControlPlaneConfig:
   KubeControllerManager:
     allocateNodeCIDRs: true
@@ -321,8 +320,6 @@ containerdConfig:
   runc:
     version: 1.1.5
   version: 1.6.20
-docker:
-  skipInstall: true
 etcdManifests:
 - memfs://clusters.example.com/privatekopeio.example.com/manifests/etcd/main-master-us-test-1a.yaml
 - memfs://clusters.example.com/privatekopeio.example.com/manifests/etcd/events-master-us-test-1a.yaml
diff --git a/tests/integration/update_cluster/privatekopeio/data/aws_s3_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/privatekopeio/data/aws_s3_object_nodeupconfig-nodes_content
index a211bf879a..a12b58e8b6 100644
--- a/tests/integration/update_cluster/privatekopeio/data/aws_s3_object_nodeupconfig-nodes_content
+++ b/tests/integration/update_cluster/privatekopeio/data/aws_s3_object_nodeupconfig-nodes_content
@@ -13,7 +13,6 @@ Assets:
   - 54e79e4d48b9e191767e4abc08be1a8476a1c757e9a9f8c45c6ded001226867f@https://github.com/opencontainers/runc/releases/download/v1.1.5/runc.arm64
 CAs: {}
 ClusterName: privatekopeio.example.com
-ContainerRuntime: containerd
 Hooks:
 - null
 - null
@@ -57,7 +56,5 @@ containerdConfig:
   runc:
     version: 1.1.5
   version: 1.6.20
-docker:
-  skipInstall: true
 usesLegacyGossip: false
 usesNoneDNS: false
diff --git a/tests/integration/update_cluster/public-jwks-apiserver/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data b/tests/integration/update_cluster/public-jwks-apiserver/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data
index cf03f7fbb7..385e1b5d3d 100644
--- a/tests/integration/update_cluster/public-jwks-apiserver/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data
+++ b/tests/integration/update_cluster/public-jwks-apiserver/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data
@@ -128,7 +128,7 @@ ClusterName: minimal.example.com
 ConfigBase: memfs://clusters.example.com/minimal.example.com
 InstanceGroupName: master-us-test-1a
 InstanceGroupRole: ControlPlane
-NodeupConfigHash: S5qDTQt1KwvzyGPHU7I6aYCF6jiWLvQYfSVfW3keeQY=
+NodeupConfigHash: 4pg4Rbtqiv0n7dmj+K6vFKv+kAw1+Dlto16r5kf8PwA=
 
 __EOF_KUBE_ENV
 
diff --git a/tests/integration/update_cluster/public-jwks-apiserver/data/aws_launch_template_nodes.minimal.example.com_user_data b/tests/integration/update_cluster/public-jwks-apiserver/data/aws_launch_template_nodes.minimal.example.com_user_data
index 4d3f786959..ae0e38d7d1 100644
--- a/tests/integration/update_cluster/public-jwks-apiserver/data/aws_launch_template_nodes.minimal.example.com_user_data
+++ b/tests/integration/update_cluster/public-jwks-apiserver/data/aws_launch_template_nodes.minimal.example.com_user_data
@@ -151,7 +151,7 @@ ConfigServer:
   - https://kops-controller.internal.minimal.example.com:3988/
 InstanceGroupName: nodes
 InstanceGroupRole: Node
-NodeupConfigHash: 24vHb76lMot1N5ZiCvdNAVIl0MLLxfon3CNiAgKXhFc=
+NodeupConfigHash: ph+Lczz6YXbsJAKHQ9FbNdE+/UGY6c170Fht1gjuAjI=
 
 __EOF_KUBE_ENV
 
diff --git a/tests/integration/update_cluster/public-jwks-apiserver/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/public-jwks-apiserver/data/aws_s3_object_cluster-completed.spec_content
index 23ccbb9451..0ca41b128b 100644
--- a/tests/integration/update_cluster/public-jwks-apiserver/data/aws_s3_object_cluster-completed.spec_content
+++ b/tests/integration/update_cluster/public-jwks-apiserver/data/aws_s3_object_cluster-completed.spec_content
@@ -25,15 +25,12 @@ spec:
   cloudProvider: aws
   clusterDNSDomain: cluster.local
   configBase: memfs://clusters.example.com/minimal.example.com
-  containerRuntime: containerd
   containerd:
     logLevel: info
     runc:
       version: 1.1.5
     version: 1.6.20
   dnsZone: Z1AFAKE1ZON3YO
-  docker:
-    skipInstall: true
   etcdClusters:
   - backups:
       backupStore: memfs://clusters.example.com/minimal.example.com/backups/etcd/main
diff --git a/tests/integration/update_cluster/public-jwks-apiserver/data/aws_s3_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/public-jwks-apiserver/data/aws_s3_object_nodeupconfig-master-us-test-1a_content
index 5abc4ae79c..2a24d7b0e5 100644
--- a/tests/integration/update_cluster/public-jwks-apiserver/data/aws_s3_object_nodeupconfig-master-us-test-1a_content
+++ b/tests/integration/update_cluster/public-jwks-apiserver/data/aws_s3_object_nodeupconfig-master-us-test-1a_content
@@ -228,7 +228,6 @@ CAs:
     9B7UD2ushcVFPtaeoL9Gfu8aY4KJBeqqg5ojl4qmRnThjw==
     -----END CERTIFICATE-----
 ClusterName: minimal.example.com
-ContainerRuntime: containerd
 ControlPlaneConfig:
   KubeControllerManager:
     allocateNodeCIDRs: true
@@ -322,8 +321,6 @@ containerdConfig:
   runc:
     version: 1.1.5
   version: 1.6.20
-docker:
-  skipInstall: true
 etcdManifests:
 - memfs://clusters.example.com/minimal.example.com/manifests/etcd/main-master-us-test-1a.yaml
 - memfs://clusters.example.com/minimal.example.com/manifests/etcd/events-master-us-test-1a.yaml
diff --git a/tests/integration/update_cluster/public-jwks-apiserver/data/aws_s3_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/public-jwks-apiserver/data/aws_s3_object_nodeupconfig-nodes_content
index 3daa4fc59c..b7cb4c7311 100644
--- a/tests/integration/update_cluster/public-jwks-apiserver/data/aws_s3_object_nodeupconfig-nodes_content
+++ b/tests/integration/update_cluster/public-jwks-apiserver/data/aws_s3_object_nodeupconfig-nodes_content
@@ -13,7 +13,6 @@ Assets:
   - 54e79e4d48b9e191767e4abc08be1a8476a1c757e9a9f8c45c6ded001226867f@https://github.com/opencontainers/runc/releases/download/v1.1.5/runc.arm64
 CAs: {}
 ClusterName: minimal.example.com
-ContainerRuntime: containerd
 Hooks:
 - null
 - null
@@ -56,7 +55,5 @@ containerdConfig:
   runc:
     version: 1.1.5
   version: 1.6.20
-docker:
-  skipInstall: true
 usesLegacyGossip: false
 usesNoneDNS: false
diff --git a/tests/integration/update_cluster/shared_subnet/data/aws_launch_template_master-us-test-1a.masters.sharedsubnet.example.com_user_data b/tests/integration/update_cluster/shared_subnet/data/aws_launch_template_master-us-test-1a.masters.sharedsubnet.example.com_user_data
index c790635b73..ef7180d614 100644
--- a/tests/integration/update_cluster/shared_subnet/data/aws_launch_template_master-us-test-1a.masters.sharedsubnet.example.com_user_data
+++ b/tests/integration/update_cluster/shared_subnet/data/aws_launch_template_master-us-test-1a.masters.sharedsubnet.example.com_user_data
@@ -128,7 +128,7 @@ ClusterName: sharedsubnet.example.com
 ConfigBase: memfs://clusters.example.com/sharedsubnet.example.com
 InstanceGroupName: master-us-test-1a
 InstanceGroupRole: ControlPlane
-NodeupConfigHash: kU3AxeXAnxK2HRvZCvdVdJd6QZJPGqv5P5jLWCEg6Zo=
+NodeupConfigHash: UJa19CGU1cRzvRILfe8rNVvz//K/ItpSfL6vD6YHPJU=
 
 __EOF_KUBE_ENV
 
diff --git a/tests/integration/update_cluster/shared_subnet/data/aws_launch_template_nodes.sharedsubnet.example.com_user_data b/tests/integration/update_cluster/shared_subnet/data/aws_launch_template_nodes.sharedsubnet.example.com_user_data
index 3d154938f0..082a41af73 100644
--- a/tests/integration/update_cluster/shared_subnet/data/aws_launch_template_nodes.sharedsubnet.example.com_user_data
+++ b/tests/integration/update_cluster/shared_subnet/data/aws_launch_template_nodes.sharedsubnet.example.com_user_data
@@ -151,7 +151,7 @@ ConfigServer:
   - https://kops-controller.internal.sharedsubnet.example.com:3988/
 InstanceGroupName: nodes
 InstanceGroupRole: Node
-NodeupConfigHash: XVGl5m6M2rrACWwA5cqnjCCsTcO0UP2/2C4JrrZhs6o=
+NodeupConfigHash: Z14gdEG2EjVsuerkXvqO3OeeCXcm8cPqJDv/j4/SN84=
 
 __EOF_KUBE_ENV
 
diff --git a/tests/integration/update_cluster/shared_subnet/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/shared_subnet/data/aws_s3_object_cluster-completed.spec_content
index 2ec06d822c..ff46a246dc 100644
--- a/tests/integration/update_cluster/shared_subnet/data/aws_s3_object_cluster-completed.spec_content
+++ b/tests/integration/update_cluster/shared_subnet/data/aws_s3_object_cluster-completed.spec_content
@@ -24,15 +24,12 @@ spec:
   cloudProvider: aws
   clusterDNSDomain: cluster.local
   configBase: memfs://clusters.example.com/sharedsubnet.example.com
-  containerRuntime: containerd
   containerd:
     logLevel: info
     runc:
       version: 1.1.5
     version: 1.6.20
   dnsZone: Z1AFAKE1ZON3YO
-  docker:
-    skipInstall: true
   etcdClusters:
   - backups:
       backupStore: memfs://clusters.example.com/sharedsubnet.example.com/backups/etcd/main
diff --git a/tests/integration/update_cluster/shared_subnet/data/aws_s3_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/shared_subnet/data/aws_s3_object_nodeupconfig-master-us-test-1a_content
index 24ae5e8a66..db15b82aa4 100644
--- a/tests/integration/update_cluster/shared_subnet/data/aws_s3_object_nodeupconfig-master-us-test-1a_content
+++ b/tests/integration/update_cluster/shared_subnet/data/aws_s3_object_nodeupconfig-master-us-test-1a_content
@@ -227,7 +227,6 @@ CAs:
     9B7UD2ushcVFPtaeoL9Gfu8aY4KJBeqqg5ojl4qmRnThjw==
     -----END CERTIFICATE-----
 ClusterName: sharedsubnet.example.com
-ContainerRuntime: containerd
 ControlPlaneConfig:
   KubeControllerManager:
     allocateNodeCIDRs: true
@@ -321,8 +320,6 @@ containerdConfig:
   runc:
     version: 1.1.5
   version: 1.6.20
-docker:
-  skipInstall: true
 etcdManifests:
 - memfs://clusters.example.com/sharedsubnet.example.com/manifests/etcd/main-master-us-test-1a.yaml
 - memfs://clusters.example.com/sharedsubnet.example.com/manifests/etcd/events-master-us-test-1a.yaml
diff --git a/tests/integration/update_cluster/shared_subnet/data/aws_s3_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/shared_subnet/data/aws_s3_object_nodeupconfig-nodes_content
index b78ac4fb26..349b9bd58c 100644
--- a/tests/integration/update_cluster/shared_subnet/data/aws_s3_object_nodeupconfig-nodes_content
+++ b/tests/integration/update_cluster/shared_subnet/data/aws_s3_object_nodeupconfig-nodes_content
@@ -13,7 +13,6 @@ Assets:
   - 54e79e4d48b9e191767e4abc08be1a8476a1c757e9a9f8c45c6ded001226867f@https://github.com/opencontainers/runc/releases/download/v1.1.5/runc.arm64
 CAs: {}
 ClusterName: sharedsubnet.example.com
-ContainerRuntime: containerd
 Hooks:
 - null
 - null
@@ -56,7 +55,5 @@ containerdConfig:
   runc:
     version: 1.1.5
   version: 1.6.20
-docker:
-  skipInstall: true
 usesLegacyGossip: false
 usesNoneDNS: false
diff --git a/tests/integration/update_cluster/shared_vpc/data/aws_launch_template_master-us-test-1a.masters.sharedvpc.example.com_user_data b/tests/integration/update_cluster/shared_vpc/data/aws_launch_template_master-us-test-1a.masters.sharedvpc.example.com_user_data
index 8a7b2e766c..4d98cc2ec6 100644
--- a/tests/integration/update_cluster/shared_vpc/data/aws_launch_template_master-us-test-1a.masters.sharedvpc.example.com_user_data
+++ b/tests/integration/update_cluster/shared_vpc/data/aws_launch_template_master-us-test-1a.masters.sharedvpc.example.com_user_data
@@ -128,7 +128,7 @@ ClusterName: sharedvpc.example.com
 ConfigBase: memfs://clusters.example.com/sharedvpc.example.com
 InstanceGroupName: master-us-test-1a
 InstanceGroupRole: ControlPlane
-NodeupConfigHash: bKGKLr8S2ma4PAYXUjSqPSOrC+dmqDvsMCczCR6s6SE=
+NodeupConfigHash: +h+r8AI5ukp+TL5aAhhBR1xkWOxTQcvGowITTjg5iV8=
 
 __EOF_KUBE_ENV
 
diff --git a/tests/integration/update_cluster/shared_vpc/data/aws_launch_template_nodes.sharedvpc.example.com_user_data b/tests/integration/update_cluster/shared_vpc/data/aws_launch_template_nodes.sharedvpc.example.com_user_data
index 15c3966852..a885a0cf64 100644
--- a/tests/integration/update_cluster/shared_vpc/data/aws_launch_template_nodes.sharedvpc.example.com_user_data
+++ b/tests/integration/update_cluster/shared_vpc/data/aws_launch_template_nodes.sharedvpc.example.com_user_data
@@ -151,7 +151,7 @@ ConfigServer:
   - https://kops-controller.internal.sharedvpc.example.com:3988/
 InstanceGroupName: nodes
 InstanceGroupRole: Node
-NodeupConfigHash: 36ai3ZZFjmQ5O93qjejBLtqSvaqGH1VzPpFco4wYwww=
+NodeupConfigHash: S9BXmViQsJFphEF0tX3H8uRmD6x0jYGtFOL3NEmZil0=
 
 __EOF_KUBE_ENV
 
diff --git a/tests/integration/update_cluster/shared_vpc/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/shared_vpc/data/aws_s3_object_cluster-completed.spec_content
index 6679872a9b..6068fa7149 100644
--- a/tests/integration/update_cluster/shared_vpc/data/aws_s3_object_cluster-completed.spec_content
+++ b/tests/integration/update_cluster/shared_vpc/data/aws_s3_object_cluster-completed.spec_content
@@ -24,15 +24,12 @@ spec:
   cloudProvider: aws
   clusterDNSDomain: cluster.local
   configBase: memfs://clusters.example.com/sharedvpc.example.com
-  containerRuntime: containerd
   containerd:
     logLevel: info
     runc:
       version: 1.1.5
     version: 1.6.20
   dnsZone: Z1AFAKE1ZON3YO
-  docker:
-    skipInstall: true
   etcdClusters:
   - backups:
       backupStore: memfs://clusters.example.com/sharedvpc.example.com/backups/etcd/main
diff --git a/tests/integration/update_cluster/shared_vpc/data/aws_s3_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/shared_vpc/data/aws_s3_object_nodeupconfig-master-us-test-1a_content
index 9858c2d91d..8bbd479da6 100644
--- a/tests/integration/update_cluster/shared_vpc/data/aws_s3_object_nodeupconfig-master-us-test-1a_content
+++ b/tests/integration/update_cluster/shared_vpc/data/aws_s3_object_nodeupconfig-master-us-test-1a_content
@@ -227,7 +227,6 @@ CAs:
     9B7UD2ushcVFPtaeoL9Gfu8aY4KJBeqqg5ojl4qmRnThjw==
     -----END CERTIFICATE-----
 ClusterName: sharedvpc.example.com
-ContainerRuntime: containerd
 ControlPlaneConfig:
   KubeControllerManager:
     allocateNodeCIDRs: true
@@ -321,8 +320,6 @@ containerdConfig:
   runc:
     version: 1.1.5
   version: 1.6.20
-docker:
-  skipInstall: true
 etcdManifests:
 - memfs://clusters.example.com/sharedvpc.example.com/manifests/etcd/main-master-us-test-1a.yaml
 - memfs://clusters.example.com/sharedvpc.example.com/manifests/etcd/events-master-us-test-1a.yaml
diff --git a/tests/integration/update_cluster/shared_vpc/data/aws_s3_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/shared_vpc/data/aws_s3_object_nodeupconfig-nodes_content
index 564f9d995b..55c7c9a14c 100644
--- a/tests/integration/update_cluster/shared_vpc/data/aws_s3_object_nodeupconfig-nodes_content
+++ b/tests/integration/update_cluster/shared_vpc/data/aws_s3_object_nodeupconfig-nodes_content
@@ -13,7 +13,6 @@ Assets:
   - 54e79e4d48b9e191767e4abc08be1a8476a1c757e9a9f8c45c6ded001226867f@https://github.com/opencontainers/runc/releases/download/v1.1.5/runc.arm64
 CAs: {}
 ClusterName: sharedvpc.example.com
-ContainerRuntime: containerd
 Hooks:
 - null
 - null
@@ -56,7 +55,5 @@ containerdConfig:
   runc:
     version: 1.1.5
   version: 1.6.20
-docker:
-  skipInstall: true
 usesLegacyGossip: false
 usesNoneDNS: false
diff --git a/tests/integration/update_cluster/shared_vpc_ipv6/data/aws_launch_template_master-us-test-1a.masters.minimal-ipv6.example.com_user_data b/tests/integration/update_cluster/shared_vpc_ipv6/data/aws_launch_template_master-us-test-1a.masters.minimal-ipv6.example.com_user_data
index b3e65e1aa5..6ea78e043c 100644
--- a/tests/integration/update_cluster/shared_vpc_ipv6/data/aws_launch_template_master-us-test-1a.masters.minimal-ipv6.example.com_user_data
+++ b/tests/integration/update_cluster/shared_vpc_ipv6/data/aws_launch_template_master-us-test-1a.masters.minimal-ipv6.example.com_user_data
@@ -128,7 +128,7 @@ ClusterName: minimal-ipv6.example.com
 ConfigBase: memfs://clusters.example.com/minimal-ipv6.example.com
 InstanceGroupName: master-us-test-1a
 InstanceGroupRole: ControlPlane
-NodeupConfigHash: G7OfePOaOKHX1n1TdUcLJud8xoaPruBJVetp6J/OIqw=
+NodeupConfigHash: +TtM1FR2/n+SRvoQxZTMOK9el4NBwjQ1NkkqbqT8yhk=
 
 __EOF_KUBE_ENV
 
diff --git a/tests/integration/update_cluster/shared_vpc_ipv6/data/aws_launch_template_nodes.minimal-ipv6.example.com_user_data b/tests/integration/update_cluster/shared_vpc_ipv6/data/aws_launch_template_nodes.minimal-ipv6.example.com_user_data
index cef5f36d8f..cd1134d8ba 100644
--- a/tests/integration/update_cluster/shared_vpc_ipv6/data/aws_launch_template_nodes.minimal-ipv6.example.com_user_data
+++ b/tests/integration/update_cluster/shared_vpc_ipv6/data/aws_launch_template_nodes.minimal-ipv6.example.com_user_data
@@ -151,7 +151,7 @@ ConfigServer:
   - https://kops-controller.internal.minimal-ipv6.example.com:3988/
 InstanceGroupName: nodes
 InstanceGroupRole: Node
-NodeupConfigHash: Fyq1nPHVX1gVN9zblQQINjkgrZKVNmERUCa0x5v7Il8=
+NodeupConfigHash: GP8MRP/yUD7ZRbDc6COSxQV3j90Xk4S7+RPvdqETYfo=
 
 __EOF_KUBE_ENV
 
diff --git a/tests/integration/update_cluster/shared_vpc_ipv6/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/shared_vpc_ipv6/data/aws_s3_object_cluster-completed.spec_content
index 24758a499e..3f6ee5c505 100644
--- a/tests/integration/update_cluster/shared_vpc_ipv6/data/aws_s3_object_cluster-completed.spec_content
+++ b/tests/integration/update_cluster/shared_vpc_ipv6/data/aws_s3_object_cluster-completed.spec_content
@@ -28,15 +28,12 @@ spec:
   cloudProvider: aws
   clusterDNSDomain: cluster.local
   configBase: memfs://clusters.example.com/minimal-ipv6.example.com
-  containerRuntime: containerd
   containerd:
     logLevel: info
     runc:
       version: 1.1.5
     version: 1.6.20
   dnsZone: Z1AFAKE1ZON3YO
-  docker:
-    skipInstall: true
   etcdClusters:
   - backups:
       backupStore: memfs://clusters.example.com/minimal-ipv6.example.com/backups/etcd/main
diff --git a/tests/integration/update_cluster/shared_vpc_ipv6/data/aws_s3_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/shared_vpc_ipv6/data/aws_s3_object_nodeupconfig-master-us-test-1a_content
index 43e6217b26..4def1257ab 100644
--- a/tests/integration/update_cluster/shared_vpc_ipv6/data/aws_s3_object_nodeupconfig-master-us-test-1a_content
+++ b/tests/integration/update_cluster/shared_vpc_ipv6/data/aws_s3_object_nodeupconfig-master-us-test-1a_content
@@ -226,7 +226,6 @@ CAs:
     9B7UD2ushcVFPtaeoL9Gfu8aY4KJBeqqg5ojl4qmRnThjw==
     -----END CERTIFICATE-----
 ClusterName: minimal-ipv6.example.com
-ContainerRuntime: containerd
 ControlPlaneConfig:
   KubeControllerManager:
     allocateNodeCIDRs: false
@@ -321,8 +320,6 @@ containerdConfig:
   runc:
     version: 1.1.5
   version: 1.6.20
-docker:
-  skipInstall: true
 etcdManifests:
 - memfs://clusters.example.com/minimal-ipv6.example.com/manifests/etcd/main-master-us-test-1a.yaml
 - memfs://clusters.example.com/minimal-ipv6.example.com/manifests/etcd/events-master-us-test-1a.yaml
diff --git a/tests/integration/update_cluster/shared_vpc_ipv6/data/aws_s3_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/shared_vpc_ipv6/data/aws_s3_object_nodeupconfig-nodes_content
index 53610796b9..34d4b27f27 100644
--- a/tests/integration/update_cluster/shared_vpc_ipv6/data/aws_s3_object_nodeupconfig-nodes_content
+++ b/tests/integration/update_cluster/shared_vpc_ipv6/data/aws_s3_object_nodeupconfig-nodes_content
@@ -13,7 +13,6 @@ Assets:
   - 54e79e4d48b9e191767e4abc08be1a8476a1c757e9a9f8c45c6ded001226867f@https://github.com/opencontainers/runc/releases/download/v1.1.5/runc.arm64
 CAs: {}
 ClusterName: minimal-ipv6.example.com
-ContainerRuntime: containerd
 Hooks:
 - null
 - null
@@ -55,7 +54,5 @@ containerdConfig:
   runc:
     version: 1.1.5
   version: 1.6.20
-docker:
-  skipInstall: true
 usesLegacyGossip: false
 usesNoneDNS: false
diff --git a/tests/integration/update_cluster/unmanaged/data/aws_launch_template_master-us-test-1a.masters.unmanaged.example.com_user_data b/tests/integration/update_cluster/unmanaged/data/aws_launch_template_master-us-test-1a.masters.unmanaged.example.com_user_data
index c4e92df1d0..f358246a6b 100644
--- a/tests/integration/update_cluster/unmanaged/data/aws_launch_template_master-us-test-1a.masters.unmanaged.example.com_user_data
+++ b/tests/integration/update_cluster/unmanaged/data/aws_launch_template_master-us-test-1a.masters.unmanaged.example.com_user_data
@@ -128,7 +128,7 @@ ClusterName: unmanaged.example.com
 ConfigBase: memfs://clusters.example.com/unmanaged.example.com
 InstanceGroupName: master-us-test-1a
 InstanceGroupRole: ControlPlane
-NodeupConfigHash: WbwzLDugLfXeFnoW2TjFrkfCsl80hx1lLpuYUofL2AQ=
+NodeupConfigHash: XBDDl0pNI9lHhjsMFfBgQpHoxFBmj60xY9yI2o4UCgk=
 
 __EOF_KUBE_ENV
 
diff --git a/tests/integration/update_cluster/unmanaged/data/aws_launch_template_nodes.unmanaged.example.com_user_data b/tests/integration/update_cluster/unmanaged/data/aws_launch_template_nodes.unmanaged.example.com_user_data
index 128ff9ed08..ee0f7b1480 100644
--- a/tests/integration/update_cluster/unmanaged/data/aws_launch_template_nodes.unmanaged.example.com_user_data
+++ b/tests/integration/update_cluster/unmanaged/data/aws_launch_template_nodes.unmanaged.example.com_user_data
@@ -151,7 +151,7 @@ ConfigServer:
   - https://kops-controller.internal.unmanaged.example.com:3988/
 InstanceGroupName: nodes
 InstanceGroupRole: Node
-NodeupConfigHash: C6bYunql2r/FYKsbS4PIr1Yu9DN4FwTy3oSOcSJH8HM=
+NodeupConfigHash: kTYOaBeOxsS9aR6MrBfsIsBzmhpjbkzA5rwyGVwKFF4=
 
 __EOF_KUBE_ENV
 
diff --git a/tests/integration/update_cluster/unmanaged/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/unmanaged/data/aws_s3_object_cluster-completed.spec_content
index 8f99523882..df8a7b0166 100644
--- a/tests/integration/update_cluster/unmanaged/data/aws_s3_object_cluster-completed.spec_content
+++ b/tests/integration/update_cluster/unmanaged/data/aws_s3_object_cluster-completed.spec_content
@@ -26,15 +26,12 @@ spec:
   cloudProvider: aws
   clusterDNSDomain: cluster.local
   configBase: memfs://clusters.example.com/unmanaged.example.com
-  containerRuntime: containerd
   containerd:
     logLevel: info
     runc:
       version: 1.1.5
     version: 1.6.20
   dnsZone: Z1AFAKE1ZON3YO
-  docker:
-    skipInstall: true
   etcdClusters:
   - backups:
       backupStore: memfs://clusters.example.com/unmanaged.example.com/backups/etcd/main
diff --git a/tests/integration/update_cluster/unmanaged/data/aws_s3_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/unmanaged/data/aws_s3_object_nodeupconfig-master-us-test-1a_content
index bfcd1c31b1..f482964e37 100644
--- a/tests/integration/update_cluster/unmanaged/data/aws_s3_object_nodeupconfig-master-us-test-1a_content
+++ b/tests/integration/update_cluster/unmanaged/data/aws_s3_object_nodeupconfig-master-us-test-1a_content
@@ -226,7 +226,6 @@ CAs:
     9B7UD2ushcVFPtaeoL9Gfu8aY4KJBeqqg5ojl4qmRnThjw==
     -----END CERTIFICATE-----
 ClusterName: unmanaged.example.com
-ContainerRuntime: containerd
 ControlPlaneConfig:
   KubeControllerManager:
     allocateNodeCIDRs: true
@@ -320,8 +319,6 @@ containerdConfig:
   runc:
     version: 1.1.5
   version: 1.6.20
-docker:
-  skipInstall: true
 etcdManifests:
 - memfs://clusters.example.com/unmanaged.example.com/manifests/etcd/main-master-us-test-1a.yaml
 - memfs://clusters.example.com/unmanaged.example.com/manifests/etcd/events-master-us-test-1a.yaml
diff --git a/tests/integration/update_cluster/unmanaged/data/aws_s3_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/unmanaged/data/aws_s3_object_nodeupconfig-nodes_content
index 195735903c..99586ec3c6 100644
--- a/tests/integration/update_cluster/unmanaged/data/aws_s3_object_nodeupconfig-nodes_content
+++ b/tests/integration/update_cluster/unmanaged/data/aws_s3_object_nodeupconfig-nodes_content
@@ -13,7 +13,6 @@ Assets:
   - 54e79e4d48b9e191767e4abc08be1a8476a1c757e9a9f8c45c6ded001226867f@https://github.com/opencontainers/runc/releases/download/v1.1.5/runc.arm64
 CAs: {}
 ClusterName: unmanaged.example.com
-ContainerRuntime: containerd
 Hooks:
 - null
 - null
@@ -56,7 +55,5 @@ containerdConfig:
   runc:
     version: 1.1.5
   version: 1.6.20
-docker:
-  skipInstall: true
 usesLegacyGossip: false
 usesNoneDNS: false
diff --git a/tests/integration/update_cluster/vfs-said/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data b/tests/integration/update_cluster/vfs-said/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data
index 7ecad213da..8d70694d88 100644
--- a/tests/integration/update_cluster/vfs-said/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data
+++ b/tests/integration/update_cluster/vfs-said/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data
@@ -128,7 +128,7 @@ ClusterName: minimal.example.com
 ConfigBase: memfs://clusters.example.com/minimal.example.com
 InstanceGroupName: master-us-test-1a
 InstanceGroupRole: ControlPlane
-NodeupConfigHash: qcmONpsVF20J10Q8aBxO9+mfsTE1CZ9VyWOT+Cf3Qrw=
+NodeupConfigHash: utGE2ktbT8LJDFeHLDc54JKqFfbNF/2Q3+rBhbuIDqw=
 
 __EOF_KUBE_ENV
 
diff --git a/tests/integration/update_cluster/vfs-said/data/aws_launch_template_nodes.minimal.example.com_user_data b/tests/integration/update_cluster/vfs-said/data/aws_launch_template_nodes.minimal.example.com_user_data
index 0915bd9981..661841cc5b 100644
--- a/tests/integration/update_cluster/vfs-said/data/aws_launch_template_nodes.minimal.example.com_user_data
+++ b/tests/integration/update_cluster/vfs-said/data/aws_launch_template_nodes.minimal.example.com_user_data
@@ -151,7 +151,7 @@ ConfigServer:
   - https://kops-controller.internal.minimal.example.com:3988/
 InstanceGroupName: nodes
 InstanceGroupRole: Node
-NodeupConfigHash: q+zd9qOWcsPuVG5sYSiAcphkD0PBPRnWbw9yRz0MRLA=
+NodeupConfigHash: 1AGiv4MNUt9ZDs4jDI6wLlDP7gNbhcdFx4N5IrqMuj0=
 
 __EOF_KUBE_ENV
 
diff --git a/tests/integration/update_cluster/vfs-said/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/vfs-said/data/aws_s3_object_cluster-completed.spec_content
index 4b88f90993..e851f4c18b 100644
--- a/tests/integration/update_cluster/vfs-said/data/aws_s3_object_cluster-completed.spec_content
+++ b/tests/integration/update_cluster/vfs-said/data/aws_s3_object_cluster-completed.spec_content
@@ -24,15 +24,12 @@ spec:
   cloudProvider: aws
   clusterDNSDomain: cluster.local
   configBase: memfs://clusters.example.com/minimal.example.com
-  containerRuntime: containerd
   containerd:
     logLevel: info
     runc:
       version: 1.1.5
     version: 1.6.20
   dnsZone: Z1AFAKE1ZON3YO
-  docker:
-    skipInstall: true
   etcdClusters:
   - backups:
       backupStore: memfs://clusters.example.com/minimal.example.com/backups/etcd/main
diff --git a/tests/integration/update_cluster/vfs-said/data/aws_s3_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/vfs-said/data/aws_s3_object_nodeupconfig-master-us-test-1a_content
index 71e4cd6fe5..1aa6180910 100644
--- a/tests/integration/update_cluster/vfs-said/data/aws_s3_object_nodeupconfig-master-us-test-1a_content
+++ b/tests/integration/update_cluster/vfs-said/data/aws_s3_object_nodeupconfig-master-us-test-1a_content
@@ -227,7 +227,6 @@ CAs:
     9B7UD2ushcVFPtaeoL9Gfu8aY4KJBeqqg5ojl4qmRnThjw==
     -----END CERTIFICATE-----
 ClusterName: minimal.example.com
-ContainerRuntime: containerd
 ControlPlaneConfig:
   KubeControllerManager:
     allocateNodeCIDRs: true
@@ -321,8 +320,6 @@ containerdConfig:
   runc:
     version: 1.1.5
   version: 1.6.20
-docker:
-  skipInstall: true
 etcdManifests:
 - memfs://clusters.example.com/minimal.example.com/manifests/etcd/main-master-us-test-1a.yaml
 - memfs://clusters.example.com/minimal.example.com/manifests/etcd/events-master-us-test-1a.yaml
diff --git a/tests/integration/update_cluster/vfs-said/data/aws_s3_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/vfs-said/data/aws_s3_object_nodeupconfig-nodes_content
index 55e7649533..552bc4ab5e 100644
--- a/tests/integration/update_cluster/vfs-said/data/aws_s3_object_nodeupconfig-nodes_content
+++ b/tests/integration/update_cluster/vfs-said/data/aws_s3_object_nodeupconfig-nodes_content
@@ -13,7 +13,6 @@ Assets:
   - 54e79e4d48b9e191767e4abc08be1a8476a1c757e9a9f8c45c6ded001226867f@https://github.com/opencontainers/runc/releases/download/v1.1.5/runc.arm64
 CAs: {}
 ClusterName: minimal.example.com
-ContainerRuntime: containerd
 Hooks:
 - null
 - null
@@ -56,7 +55,5 @@ containerdConfig:
   runc:
     version: 1.1.5
   version: 1.6.20
-docker:
-  skipInstall: true
 usesLegacyGossip: false
 usesNoneDNS: false