diff --git a/.github/renovate.json b/.github/renovate.json
index 782fe22d71a..25663674816 100644
--- a/.github/renovate.json
+++ b/.github/renovate.json
@@ -84,6 +84,10 @@
       "matchPackageNames": ["oss/kubernetes/coredns", "oss/v2/kubernetes/coredns"],
       "assignees": ["SriHarsha001"]
     },
+    {
+      "matchPackageNames": ["oss/binaries/kubernetes/azure-acr-credential-provider"],
+      "assignees": ["mainred"]
+    },
     {
       "matchPackageNames": ["moby-runc", "moby-containerd"],
       "extractVersion": "^v?(?<version>.+)$"
@@ -126,7 +130,7 @@
         "\"renovateTag\":\\s*\"OCI_registry=(?<registryUrl>[^,]+), name=(?<packageName>[^\"]+)\",\\s*\"latestVersion\":\\s*\"(?<currentValue>[^\"]+)\"(?:[^}]*\"previousLatestVersion\":\\s*\"(?<depType>[^\"]+)\")?"
       ],
       "datasourceTemplate": "docker",
-      "autoReplaceStringTemplate": "\"renovateTag\": \"OCI_registry={{{registryUrl}}}, name={{{packageName}}}\",\n          \"latestVersion\": \"{{{newValue}}}\"{{#if depType}},\n          \"previousLatestVersion\": \"{{{currentValue}}}\"{{/if}}"
+      "autoReplaceStringTemplate": "\"renovateTag\": \"OCI_registry={{{registryUrl}}}, name={{{packageName}}}\",\n                \"latestVersion\": \"{{{newValue}}}\"{{#if depType}},\n                \"previousLatestVersion\": \"{{{currentValue}}}\"{{/if}}"
     },
     {
       "customType": "regex",
diff --git a/.github/workflows/buf.yaml b/.github/workflows/buf.yaml
index 7b1751fad16..94ef4a31eb2 100644
--- a/.github/workflows/buf.yaml
+++ b/.github/workflows/buf.yaml
@@ -1,7 +1,15 @@
 name: Buf CI
 on:
   push:
+    paths:
+      - "aks-node-controller/proto/**"
+      - "aks-node-controller/buf.yaml"
+      - "aks-node-controller/buf.gen.yaml"
   pull_request:
+    paths:
+      - "aks-node-controller/proto/**"
+      - "aks-node-controller/buf.yaml"
+      - "aks-node-controller/buf.gen.yaml"
 permissions:
   contents: read
   pull-requests: write
@@ -12,4 +20,4 @@ jobs:
       - uses: actions/checkout@v4
       - uses: bufbuild/buf-action@v1
         with:
-          input: aks-node-controller
\ No newline at end of file
+          input: aks-node-controller
diff --git a/aks-node-controller/parser/helper.go b/aks-node-controller/parser/helper.go
index 9b5916bc50c..bfaefff7e2f 100644
--- a/aks-node-controller/parser/helper.go
+++ b/aks-node-controller/parser/helper.go
@@ -173,21 +173,21 @@ func getCustomCACertsStatus(customCACerts []string) bool {
 	return len(customCACerts) > 0
 }
 
-func getEnableTLSBootstrap(bootstrapConfig *aksnodeconfigv1.TlsBootstrappingConfig) bool {
+func getEnableTLSBootstrap(bootstrapConfig *aksnodeconfigv1.BootstrappingConfig) bool {
 	return bootstrapConfig.GetTlsBootstrappingToken() != ""
 }
 
-func getEnableSecureTLSBootstrap(bootstrapConfig *aksnodeconfigv1.TlsBootstrappingConfig) bool {
+func getEnableSecureTLSBootstrap(bootstrapConfig *aksnodeconfigv1.BootstrappingConfig) bool {
 	// TODO: Change logic to default to false once Secure TLS Bootstrapping is complete
-	return bootstrapConfig.GetEnableSecureTlsBootstrapping()
+	return bootstrapConfig.GetBootstrappingAuthMethod() == aksnodeconfigv1.BootstrappingAuthMethod_BOOTSTRAPPING_AUTH_METHOD_SECURE_TLS_BOOTSTRAPPING
 }
 
-func getTLSBootstrapToken(bootstrapConfig *aksnodeconfigv1.TlsBootstrappingConfig) string {
+func getTLSBootstrapToken(bootstrapConfig *aksnodeconfigv1.BootstrappingConfig) string {
 	return bootstrapConfig.GetTlsBootstrappingToken()
 }
 
-func getCustomSecureTLSBootstrapAADServerAppID(bootstrapConfig *aksnodeconfigv1.TlsBootstrappingConfig) string {
-	return bootstrapConfig.GetCustomSecureTlsBootstrappingAppserverAppid()
+func getCustomSecureTLSBootstrapAADServerAppID(bootstrapConfig *aksnodeconfigv1.BootstrappingConfig) string {
+	return bootstrapConfig.GetCustomAadResource()
 }
 
 func getIsKrustlet(wr aksnodeconfigv1.WorkloadRuntime) bool {
diff --git a/aks-node-controller/parser/parser.go b/aks-node-controller/parser/parser.go
index f8100ba4d17..69e7c1a0ff8 100644
--- a/aks-node-controller/parser/parser.go
+++ b/aks-node-controller/parser/parser.go
@@ -127,9 +127,9 @@ func getCSEEnv(config *aksnodeconfigv1.Configuration) map[string]string {
 		"HTTPS_PROXY_URLS":                               config.GetHttpProxyConfig().GetHttpsProxy(),
 		"NO_PROXY_URLS":                                  getStringifiedStringArray(config.GetHttpProxyConfig().GetNoProxyEntries(), ","),
 		"PROXY_VARS":                                     getProxyVariables(config.GetHttpProxyConfig()),
-		"ENABLE_TLS_BOOTSTRAPPING":                       fmt.Sprintf("%v", getEnableTLSBootstrap(config.GetTlsBootstrappingConfig())),
-		"ENABLE_SECURE_TLS_BOOTSTRAPPING":                fmt.Sprintf("%v", getEnableSecureTLSBootstrap(config.GetTlsBootstrappingConfig())),
-		"CUSTOM_SECURE_TLS_BOOTSTRAP_AAD_SERVER_APP_ID":  getCustomSecureTLSBootstrapAADServerAppID(config.GetTlsBootstrappingConfig()),
+		"ENABLE_TLS_BOOTSTRAPPING":                       fmt.Sprintf("%v", getEnableTLSBootstrap(config.GetBootstrappingConfig())),
+		"ENABLE_SECURE_TLS_BOOTSTRAPPING":                fmt.Sprintf("%v", getEnableSecureTLSBootstrap(config.GetBootstrappingConfig())),
+		"CUSTOM_SECURE_TLS_BOOTSTRAP_AAD_SERVER_APP_ID":  getCustomSecureTLSBootstrapAADServerAppID(config.GetBootstrappingConfig()),
 		"DHCPV6_SERVICE_FILEPATH":                        getDHCPV6ServiceFilepath(),
 		"DHCPV6_CONFIG_FILEPATH":                         getDHCPV6ConfigFilepath(),
 		"THP_ENABLED":                                    config.GetCustomLinuxOsConfig().GetTransparentHugepageSupport(),
@@ -149,7 +149,7 @@ func getCSEEnv(config *aksnodeconfigv1.Configuration) map[string]string {
 		"MESSAGE_OF_THE_DAY":                             config.GetMessageOfTheDay(),
 		"HAS_KUBELET_DISK_TYPE":                          fmt.Sprintf("%v", getHasKubeletDiskType(config.GetKubeletConfig())),
 		"NEEDS_CGROUPV2":                                 fmt.Sprintf("%v", config.GetNeedsCgroupv2()),
-		"TLS_BOOTSTRAP_TOKEN":                            getTLSBootstrapToken(config.GetTlsBootstrappingConfig()),
+		"TLS_BOOTSTRAP_TOKEN":                            getTLSBootstrapToken(config.GetBootstrappingConfig()),
 		"KUBELET_FLAGS":                                  createSortedKeyValuePairs(config.GetKubeletConfig().GetKubeletFlags(), " "),
 		"NETWORK_POLICY":                                 getStringFromNetworkPolicyType(config.GetNetworkConfig().GetNetworkPolicy()),
 		"KUBELET_NODE_LABELS":                            createSortedKeyValuePairs(config.GetKubeletConfig().GetKubeletNodeLabels(), ","),
diff --git a/aks-node-controller/parser/testdata/test_aksnodeconfig.json b/aks-node-controller/parser/testdata/test_aksnodeconfig.json
index 41375d4473c..979e0b1515c 100644
--- a/aks-node-controller/parser/testdata/test_aksnodeconfig.json
+++ b/aks-node-controller/parser/testdata/test_aksnodeconfig.json
@@ -1,7 +1,7 @@
 {
     "version": "v0",
-    "tls_bootstrapping_config": {
-        "enable_secure_tls_bootstrapping": false
+    "bootstrapping_config": {
+        "bootstrapping_auth_method": "BOOTSTRAPPING_AUTH_METHOD_BOOTSTRAP_TOKEN"
     },
     "cluster_config": {
         "vm_type": "VM_TYPE_VMSS",
diff --git a/aks-node-controller/parser/testdata/test_aksnodeconfig_fields_missing.json b/aks-node-controller/parser/testdata/test_aksnodeconfig_fields_missing.json
index c77043ec1b9..a3457202cad 100644
--- a/aks-node-controller/parser/testdata/test_aksnodeconfig_fields_missing.json
+++ b/aks-node-controller/parser/testdata/test_aksnodeconfig_fields_missing.json
@@ -1,7 +1,7 @@
 {
     "version": "v0",
-    "tls_bootstrapping_config": {
-        "enable_secure_tls_bootstrapping": false
+    "bootstrapping_config": {
+        "bootstrapping_auth_method": "BOOTSTRAPPING_AUTH_METHOD_BOOTSTRAP_TOKEN"
     },
     "cluster_config": {
         "vm_type": 2,
diff --git a/aks-node-controller/parser/testdata/test_aksnodeconfig_fields_unexpected.json b/aks-node-controller/parser/testdata/test_aksnodeconfig_fields_unexpected.json
index c3aabf339bc..e089f0c53f5 100644
--- a/aks-node-controller/parser/testdata/test_aksnodeconfig_fields_unexpected.json
+++ b/aks-node-controller/parser/testdata/test_aksnodeconfig_fields_unexpected.json
@@ -1,7 +1,7 @@
 {
     "version": "v0",
-    "tls_bootstrapping_config": {
-        "enable_secure_tls_bootstrapping": false
+    "bootstrapping_config": {
+        "bootstrapping_auth_method": "BOOTSTRAPPING_AUTH_METHOD_BOOTSTRAP_TOKEN"
     },
     "cluster_config": {
         "vm_type": 2,
diff --git a/aks-node-controller/pkg/gen/aksnodeconfig/v1/bootstrapping_config.pb.go b/aks-node-controller/pkg/gen/aksnodeconfig/v1/bootstrapping_config.pb.go
new file mode 100644
index 00000000000..a64e2ea6c58
--- /dev/null
+++ b/aks-node-controller/pkg/gen/aksnodeconfig/v1/bootstrapping_config.pb.go
@@ -0,0 +1,355 @@
+// Code generated by protoc-gen-go. DO NOT EDIT.
+// versions:
+// 	protoc-gen-go v1.35.2
+// 	protoc        (unknown)
+// source: aksnodeconfig/v1/bootstrapping_config.proto
+
+package aksnodeconfigv1
+
+import (
+	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
+	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+	reflect "reflect"
+	sync "sync"
+)
+
+const (
+	// Verify that this generated code is sufficiently up-to-date.
+	_ = protoimpl.EnforceVersion(20 - protoimpl.MinVersion)
+	// Verify that runtime/protoimpl is sufficiently up-to-date.
+	_ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20)
+)
+
+type BootstrappingAuthMethod int32
+
+const (
+	BootstrappingAuthMethod_BOOTSTRAPPING_AUTH_METHOD_UNSPECIFIED BootstrappingAuthMethod = 0
+	// This is the default K8s bootstrap authentication method - a time limited bootstrap token. It's stored as a secret
+	// with a particular type in the API server.
+	//
+	//nolint:gosec // this is a const string to use in switch statements, not hardcoded credentials
+	BootstrappingAuthMethod_BOOTSTRAPPING_AUTH_METHOD_BOOTSTRAP_TOKEN BootstrappingAuthMethod = 1
+	// Secure TLS bootstrapping is a process where the node can use signed metadata from the Azure IMDS service to authenticate
+	// against the api server
+	BootstrappingAuthMethod_BOOTSTRAPPING_AUTH_METHOD_SECURE_TLS_BOOTSTRAPPING BootstrappingAuthMethod = 2
+	// Nodes running outside Azure can use the Azure Arc MSI to authenticate to an API server. This only works when the cluster is
+	//
+	//	using AAD authentication.
+	BootstrappingAuthMethod_BOOTSTRAPPING_AUTH_METHOD_ARC_MSI BootstrappingAuthMethod = 3
+	// Nodes running inside Azure can use the Azure Arc MSI to authenticate to an API server. This only works when the cluster is
+	// using AAD authentication.
+	BootstrappingAuthMethod_BOOTSTRAPPING_AUTH_METHOD_AZURE_MSI BootstrappingAuthMethod = 4
+)
+
+// Enum value maps for BootstrappingAuthMethod.
+var (
+	BootstrappingAuthMethod_name = map[int32]string{
+		0: "BOOTSTRAPPING_AUTH_METHOD_UNSPECIFIED",
+		1: "BOOTSTRAPPING_AUTH_METHOD_BOOTSTRAP_TOKEN",
+		2: "BOOTSTRAPPING_AUTH_METHOD_SECURE_TLS_BOOTSTRAPPING",
+		3: "BOOTSTRAPPING_AUTH_METHOD_ARC_MSI",
+		4: "BOOTSTRAPPING_AUTH_METHOD_AZURE_MSI",
+	}
+	BootstrappingAuthMethod_value = map[string]int32{
+		"BOOTSTRAPPING_AUTH_METHOD_UNSPECIFIED":              0,
+		"BOOTSTRAPPING_AUTH_METHOD_BOOTSTRAP_TOKEN":          1,
+		"BOOTSTRAPPING_AUTH_METHOD_SECURE_TLS_BOOTSTRAPPING": 2,
+		"BOOTSTRAPPING_AUTH_METHOD_ARC_MSI":                  3,
+		"BOOTSTRAPPING_AUTH_METHOD_AZURE_MSI":                4,
+	}
+)
+
+func (x BootstrappingAuthMethod) Enum() *BootstrappingAuthMethod {
+	p := new(BootstrappingAuthMethod)
+	*p = x
+	return p
+}
+
+func (x BootstrappingAuthMethod) String() string {
+	return protoimpl.X.EnumStringOf(x.Descriptor(), protoreflect.EnumNumber(x))
+}
+
+func (BootstrappingAuthMethod) Descriptor() protoreflect.EnumDescriptor {
+	return file_aksnodeconfig_v1_bootstrapping_config_proto_enumTypes[0].Descriptor()
+}
+
+func (BootstrappingAuthMethod) Type() protoreflect.EnumType {
+	return &file_aksnodeconfig_v1_bootstrapping_config_proto_enumTypes[0]
+}
+
+func (x BootstrappingAuthMethod) Number() protoreflect.EnumNumber {
+	return protoreflect.EnumNumber(x)
+}
+
+// Deprecated: Use BootstrappingAuthMethod.Descriptor instead.
+func (BootstrappingAuthMethod) EnumDescriptor() ([]byte, []int) {
+	return file_aksnodeconfig_v1_bootstrapping_config_proto_rawDescGZIP(), []int{0}
+}
+
+type ClusterJoinMethod int32
+
+const (
+	ClusterJoinMethod_CLUSTER_JOIN_METHOD_UNSPECIFIED ClusterJoinMethod = 0
+	// The default behaviour is for the node to make a certificate signing request (CSR) and then
+	// use that CSR for ongoing communication.
+	ClusterJoinMethod_CLUSTER_JOIN_METHOD_GENERATE_CSR ClusterJoinMethod = 1
+	// In some cases, the node will use the bootstrapping auth to register itself as a node and for ongoing communications.
+	ClusterJoinMethod_CLUSTER_JOIN_METHOD_USE_BOOTSTRAPPING_AUTH ClusterJoinMethod = 2
+)
+
+// Enum value maps for ClusterJoinMethod.
+var (
+	ClusterJoinMethod_name = map[int32]string{
+		0: "CLUSTER_JOIN_METHOD_UNSPECIFIED",
+		1: "CLUSTER_JOIN_METHOD_GENERATE_CSR",
+		2: "CLUSTER_JOIN_METHOD_USE_BOOTSTRAPPING_AUTH",
+	}
+	ClusterJoinMethod_value = map[string]int32{
+		"CLUSTER_JOIN_METHOD_UNSPECIFIED":            0,
+		"CLUSTER_JOIN_METHOD_GENERATE_CSR":           1,
+		"CLUSTER_JOIN_METHOD_USE_BOOTSTRAPPING_AUTH": 2,
+	}
+)
+
+func (x ClusterJoinMethod) Enum() *ClusterJoinMethod {
+	p := new(ClusterJoinMethod)
+	*p = x
+	return p
+}
+
+func (x ClusterJoinMethod) String() string {
+	return protoimpl.X.EnumStringOf(x.Descriptor(), protoreflect.EnumNumber(x))
+}
+
+func (ClusterJoinMethod) Descriptor() protoreflect.EnumDescriptor {
+	return file_aksnodeconfig_v1_bootstrapping_config_proto_enumTypes[1].Descriptor()
+}
+
+func (ClusterJoinMethod) Type() protoreflect.EnumType {
+	return &file_aksnodeconfig_v1_bootstrapping_config_proto_enumTypes[1]
+}
+
+func (x ClusterJoinMethod) Number() protoreflect.EnumNumber {
+	return protoreflect.EnumNumber(x)
+}
+
+// Deprecated: Use ClusterJoinMethod.Descriptor instead.
+func (ClusterJoinMethod) EnumDescriptor() ([]byte, []int) {
+	return file_aksnodeconfig_v1_bootstrapping_config_proto_rawDescGZIP(), []int{1}
+}
+
+type BootstrappingConfig struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	// Method to authenticate the node to the API server
+	BootstrappingAuthMethod BootstrappingAuthMethod `protobuf:"varint,1,opt,name=bootstrapping_auth_method,json=bootstrappingAuthMethod,proto3,enum=aksnodeconfig.v1.BootstrappingAuthMethod" json:"bootstrapping_auth_method,omitempty"`
+	// how the node should join and communicate with the API server after authentication
+	ClusterJoinMethod ClusterJoinMethod `protobuf:"varint,2,opt,name=cluster_join_method,json=clusterJoinMethod,proto3,enum=aksnodeconfig.v1.ClusterJoinMethod" json:"cluster_join_method,omitempty"`
+	// Only required until Secure TLS bootstrapping in place. Would use kubelet identity after that.
+	TlsBootstrappingToken *string `protobuf:"bytes,3,opt,name=tls_bootstrapping_token,json=tlsBootstrappingToken,proto3,oneof" json:"tls_bootstrapping_token,omitempty"`
+	// Only used when secure TLS bootstrapping is enabled or one of the Azure/Arc methods. This is the appserver appid that the node will use to bootstrap.
+	CustomAadResource *string `protobuf:"bytes,4,opt,name=custom_aad_resource,json=customAadResource,proto3,oneof" json:"custom_aad_resource,omitempty"`
+	// Only used when one of the Azure/Arc methods is enabled. This is the client ID of the MSI that the node will use to bootstrap.
+	CustomAadClientId *string `protobuf:"bytes,5,opt,name=custom_aad_client_id,json=customAadClientId,proto3,oneof" json:"custom_aad_client_id,omitempty"`
+}
+
+func (x *BootstrappingConfig) Reset() {
+	*x = BootstrappingConfig{}
+	mi := &file_aksnodeconfig_v1_bootstrapping_config_proto_msgTypes[0]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
+}
+
+func (x *BootstrappingConfig) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*BootstrappingConfig) ProtoMessage() {}
+
+func (x *BootstrappingConfig) ProtoReflect() protoreflect.Message {
+	mi := &file_aksnodeconfig_v1_bootstrapping_config_proto_msgTypes[0]
+	if x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use BootstrappingConfig.ProtoReflect.Descriptor instead.
+func (*BootstrappingConfig) Descriptor() ([]byte, []int) {
+	return file_aksnodeconfig_v1_bootstrapping_config_proto_rawDescGZIP(), []int{0}
+}
+
+func (x *BootstrappingConfig) GetBootstrappingAuthMethod() BootstrappingAuthMethod {
+	if x != nil {
+		return x.BootstrappingAuthMethod
+	}
+	return BootstrappingAuthMethod_BOOTSTRAPPING_AUTH_METHOD_UNSPECIFIED
+}
+
+func (x *BootstrappingConfig) GetClusterJoinMethod() ClusterJoinMethod {
+	if x != nil {
+		return x.ClusterJoinMethod
+	}
+	return ClusterJoinMethod_CLUSTER_JOIN_METHOD_UNSPECIFIED
+}
+
+func (x *BootstrappingConfig) GetTlsBootstrappingToken() string {
+	if x != nil && x.TlsBootstrappingToken != nil {
+		return *x.TlsBootstrappingToken
+	}
+	return ""
+}
+
+func (x *BootstrappingConfig) GetCustomAadResource() string {
+	if x != nil && x.CustomAadResource != nil {
+		return *x.CustomAadResource
+	}
+	return ""
+}
+
+func (x *BootstrappingConfig) GetCustomAadClientId() string {
+	if x != nil && x.CustomAadClientId != nil {
+		return *x.CustomAadClientId
+	}
+	return ""
+}
+
+var File_aksnodeconfig_v1_bootstrapping_config_proto protoreflect.FileDescriptor
+
+var file_aksnodeconfig_v1_bootstrapping_config_proto_rawDesc = []byte{
+	0x0a, 0x2b, 0x61, 0x6b, 0x73, 0x6e, 0x6f, 0x64, 0x65, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2f,
+	0x76, 0x31, 0x2f, 0x62, 0x6f, 0x6f, 0x74, 0x73, 0x74, 0x72, 0x61, 0x70, 0x70, 0x69, 0x6e, 0x67,
+	0x5f, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x10, 0x61,
+	0x6b, 0x73, 0x6e, 0x6f, 0x64, 0x65, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x76, 0x31, 0x22,
+	0xc6, 0x03, 0x0a, 0x13, 0x42, 0x6f, 0x6f, 0x74, 0x73, 0x74, 0x72, 0x61, 0x70, 0x70, 0x69, 0x6e,
+	0x67, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x12, 0x65, 0x0a, 0x19, 0x62, 0x6f, 0x6f, 0x74, 0x73,
+	0x74, 0x72, 0x61, 0x70, 0x70, 0x69, 0x6e, 0x67, 0x5f, 0x61, 0x75, 0x74, 0x68, 0x5f, 0x6d, 0x65,
+	0x74, 0x68, 0x6f, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x29, 0x2e, 0x61, 0x6b, 0x73,
+	0x6e, 0x6f, 0x64, 0x65, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x76, 0x31, 0x2e, 0x42, 0x6f,
+	0x6f, 0x74, 0x73, 0x74, 0x72, 0x61, 0x70, 0x70, 0x69, 0x6e, 0x67, 0x41, 0x75, 0x74, 0x68, 0x4d,
+	0x65, 0x74, 0x68, 0x6f, 0x64, 0x52, 0x17, 0x62, 0x6f, 0x6f, 0x74, 0x73, 0x74, 0x72, 0x61, 0x70,
+	0x70, 0x69, 0x6e, 0x67, 0x41, 0x75, 0x74, 0x68, 0x4d, 0x65, 0x74, 0x68, 0x6f, 0x64, 0x12, 0x53,
+	0x0a, 0x13, 0x63, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x5f, 0x6a, 0x6f, 0x69, 0x6e, 0x5f, 0x6d,
+	0x65, 0x74, 0x68, 0x6f, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x23, 0x2e, 0x61, 0x6b,
+	0x73, 0x6e, 0x6f, 0x64, 0x65, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x76, 0x31, 0x2e, 0x43,
+	0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x4a, 0x6f, 0x69, 0x6e, 0x4d, 0x65, 0x74, 0x68, 0x6f, 0x64,
+	0x52, 0x11, 0x63, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x4a, 0x6f, 0x69, 0x6e, 0x4d, 0x65, 0x74,
+	0x68, 0x6f, 0x64, 0x12, 0x3b, 0x0a, 0x17, 0x74, 0x6c, 0x73, 0x5f, 0x62, 0x6f, 0x6f, 0x74, 0x73,
+	0x74, 0x72, 0x61, 0x70, 0x70, 0x69, 0x6e, 0x67, 0x5f, 0x74, 0x6f, 0x6b, 0x65, 0x6e, 0x18, 0x03,
+	0x20, 0x01, 0x28, 0x09, 0x48, 0x00, 0x52, 0x15, 0x74, 0x6c, 0x73, 0x42, 0x6f, 0x6f, 0x74, 0x73,
+	0x74, 0x72, 0x61, 0x70, 0x70, 0x69, 0x6e, 0x67, 0x54, 0x6f, 0x6b, 0x65, 0x6e, 0x88, 0x01, 0x01,
+	0x12, 0x33, 0x0a, 0x13, 0x63, 0x75, 0x73, 0x74, 0x6f, 0x6d, 0x5f, 0x61, 0x61, 0x64, 0x5f, 0x72,
+	0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x48, 0x01, 0x52,
+	0x11, 0x63, 0x75, 0x73, 0x74, 0x6f, 0x6d, 0x41, 0x61, 0x64, 0x52, 0x65, 0x73, 0x6f, 0x75, 0x72,
+	0x63, 0x65, 0x88, 0x01, 0x01, 0x12, 0x34, 0x0a, 0x14, 0x63, 0x75, 0x73, 0x74, 0x6f, 0x6d, 0x5f,
+	0x61, 0x61, 0x64, 0x5f, 0x63, 0x6c, 0x69, 0x65, 0x6e, 0x74, 0x5f, 0x69, 0x64, 0x18, 0x05, 0x20,
+	0x01, 0x28, 0x09, 0x48, 0x02, 0x52, 0x11, 0x63, 0x75, 0x73, 0x74, 0x6f, 0x6d, 0x41, 0x61, 0x64,
+	0x43, 0x6c, 0x69, 0x65, 0x6e, 0x74, 0x49, 0x64, 0x88, 0x01, 0x01, 0x42, 0x1a, 0x0a, 0x18, 0x5f,
+	0x74, 0x6c, 0x73, 0x5f, 0x62, 0x6f, 0x6f, 0x74, 0x73, 0x74, 0x72, 0x61, 0x70, 0x70, 0x69, 0x6e,
+	0x67, 0x5f, 0x74, 0x6f, 0x6b, 0x65, 0x6e, 0x42, 0x16, 0x0a, 0x14, 0x5f, 0x63, 0x75, 0x73, 0x74,
+	0x6f, 0x6d, 0x5f, 0x61, 0x61, 0x64, 0x5f, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x42,
+	0x17, 0x0a, 0x15, 0x5f, 0x63, 0x75, 0x73, 0x74, 0x6f, 0x6d, 0x5f, 0x61, 0x61, 0x64, 0x5f, 0x63,
+	0x6c, 0x69, 0x65, 0x6e, 0x74, 0x5f, 0x69, 0x64, 0x2a, 0xfb, 0x01, 0x0a, 0x17, 0x42, 0x6f, 0x6f,
+	0x74, 0x73, 0x74, 0x72, 0x61, 0x70, 0x70, 0x69, 0x6e, 0x67, 0x41, 0x75, 0x74, 0x68, 0x4d, 0x65,
+	0x74, 0x68, 0x6f, 0x64, 0x12, 0x29, 0x0a, 0x25, 0x42, 0x4f, 0x4f, 0x54, 0x53, 0x54, 0x52, 0x41,
+	0x50, 0x50, 0x49, 0x4e, 0x47, 0x5f, 0x41, 0x55, 0x54, 0x48, 0x5f, 0x4d, 0x45, 0x54, 0x48, 0x4f,
+	0x44, 0x5f, 0x55, 0x4e, 0x53, 0x50, 0x45, 0x43, 0x49, 0x46, 0x49, 0x45, 0x44, 0x10, 0x00, 0x12,
+	0x2d, 0x0a, 0x29, 0x42, 0x4f, 0x4f, 0x54, 0x53, 0x54, 0x52, 0x41, 0x50, 0x50, 0x49, 0x4e, 0x47,
+	0x5f, 0x41, 0x55, 0x54, 0x48, 0x5f, 0x4d, 0x45, 0x54, 0x48, 0x4f, 0x44, 0x5f, 0x42, 0x4f, 0x4f,
+	0x54, 0x53, 0x54, 0x52, 0x41, 0x50, 0x5f, 0x54, 0x4f, 0x4b, 0x45, 0x4e, 0x10, 0x01, 0x12, 0x36,
+	0x0a, 0x32, 0x42, 0x4f, 0x4f, 0x54, 0x53, 0x54, 0x52, 0x41, 0x50, 0x50, 0x49, 0x4e, 0x47, 0x5f,
+	0x41, 0x55, 0x54, 0x48, 0x5f, 0x4d, 0x45, 0x54, 0x48, 0x4f, 0x44, 0x5f, 0x53, 0x45, 0x43, 0x55,
+	0x52, 0x45, 0x5f, 0x54, 0x4c, 0x53, 0x5f, 0x42, 0x4f, 0x4f, 0x54, 0x53, 0x54, 0x52, 0x41, 0x50,
+	0x50, 0x49, 0x4e, 0x47, 0x10, 0x02, 0x12, 0x25, 0x0a, 0x21, 0x42, 0x4f, 0x4f, 0x54, 0x53, 0x54,
+	0x52, 0x41, 0x50, 0x50, 0x49, 0x4e, 0x47, 0x5f, 0x41, 0x55, 0x54, 0x48, 0x5f, 0x4d, 0x45, 0x54,
+	0x48, 0x4f, 0x44, 0x5f, 0x41, 0x52, 0x43, 0x5f, 0x4d, 0x53, 0x49, 0x10, 0x03, 0x12, 0x27, 0x0a,
+	0x23, 0x42, 0x4f, 0x4f, 0x54, 0x53, 0x54, 0x52, 0x41, 0x50, 0x50, 0x49, 0x4e, 0x47, 0x5f, 0x41,
+	0x55, 0x54, 0x48, 0x5f, 0x4d, 0x45, 0x54, 0x48, 0x4f, 0x44, 0x5f, 0x41, 0x5a, 0x55, 0x52, 0x45,
+	0x5f, 0x4d, 0x53, 0x49, 0x10, 0x04, 0x2a, 0x8e, 0x01, 0x0a, 0x11, 0x43, 0x6c, 0x75, 0x73, 0x74,
+	0x65, 0x72, 0x4a, 0x6f, 0x69, 0x6e, 0x4d, 0x65, 0x74, 0x68, 0x6f, 0x64, 0x12, 0x23, 0x0a, 0x1f,
+	0x43, 0x4c, 0x55, 0x53, 0x54, 0x45, 0x52, 0x5f, 0x4a, 0x4f, 0x49, 0x4e, 0x5f, 0x4d, 0x45, 0x54,
+	0x48, 0x4f, 0x44, 0x5f, 0x55, 0x4e, 0x53, 0x50, 0x45, 0x43, 0x49, 0x46, 0x49, 0x45, 0x44, 0x10,
+	0x00, 0x12, 0x24, 0x0a, 0x20, 0x43, 0x4c, 0x55, 0x53, 0x54, 0x45, 0x52, 0x5f, 0x4a, 0x4f, 0x49,
+	0x4e, 0x5f, 0x4d, 0x45, 0x54, 0x48, 0x4f, 0x44, 0x5f, 0x47, 0x45, 0x4e, 0x45, 0x52, 0x41, 0x54,
+	0x45, 0x5f, 0x43, 0x53, 0x52, 0x10, 0x01, 0x12, 0x2e, 0x0a, 0x2a, 0x43, 0x4c, 0x55, 0x53, 0x54,
+	0x45, 0x52, 0x5f, 0x4a, 0x4f, 0x49, 0x4e, 0x5f, 0x4d, 0x45, 0x54, 0x48, 0x4f, 0x44, 0x5f, 0x55,
+	0x53, 0x45, 0x5f, 0x42, 0x4f, 0x4f, 0x54, 0x53, 0x54, 0x52, 0x41, 0x50, 0x50, 0x49, 0x4e, 0x47,
+	0x5f, 0x41, 0x55, 0x54, 0x48, 0x10, 0x02, 0x42, 0xeb, 0x01, 0x0a, 0x14, 0x63, 0x6f, 0x6d, 0x2e,
+	0x61, 0x6b, 0x73, 0x6e, 0x6f, 0x64, 0x65, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x76, 0x31,
+	0x42, 0x18, 0x42, 0x6f, 0x6f, 0x74, 0x73, 0x74, 0x72, 0x61, 0x70, 0x70, 0x69, 0x6e, 0x67, 0x43,
+	0x6f, 0x6e, 0x66, 0x69, 0x67, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x58, 0x67, 0x69,
+	0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x61, 0x7a, 0x75, 0x72, 0x65, 0x2f, 0x61,
+	0x67, 0x65, 0x6e, 0x74, 0x42, 0x61, 0x6b, 0x65, 0x72, 0x2f, 0x61, 0x6b, 0x73, 0x2d, 0x6e, 0x6f,
+	0x64, 0x65, 0x2d, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x6c, 0x65, 0x72, 0x2f, 0x70, 0x6b,
+	0x67, 0x2f, 0x67, 0x65, 0x6e, 0x2f, 0x61, 0x6b, 0x73, 0x6e, 0x6f, 0x64, 0x65, 0x63, 0x6f, 0x6e,
+	0x66, 0x69, 0x67, 0x2f, 0x76, 0x31, 0x3b, 0x61, 0x6b, 0x73, 0x6e, 0x6f, 0x64, 0x65, 0x63, 0x6f,
+	0x6e, 0x66, 0x69, 0x67, 0x76, 0x31, 0xa2, 0x02, 0x03, 0x41, 0x58, 0x58, 0xaa, 0x02, 0x10, 0x41,
+	0x6b, 0x73, 0x6e, 0x6f, 0x64, 0x65, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x56, 0x31, 0xca,
+	0x02, 0x10, 0x41, 0x6b, 0x73, 0x6e, 0x6f, 0x64, 0x65, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x5c,
+	0x56, 0x31, 0xe2, 0x02, 0x1c, 0x41, 0x6b, 0x73, 0x6e, 0x6f, 0x64, 0x65, 0x63, 0x6f, 0x6e, 0x66,
+	0x69, 0x67, 0x5c, 0x56, 0x31, 0x5c, 0x47, 0x50, 0x42, 0x4d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74,
+	0x61, 0xea, 0x02, 0x11, 0x41, 0x6b, 0x73, 0x6e, 0x6f, 0x64, 0x65, 0x63, 0x6f, 0x6e, 0x66, 0x69,
+	0x67, 0x3a, 0x3a, 0x56, 0x31, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+}
+
+var (
+	file_aksnodeconfig_v1_bootstrapping_config_proto_rawDescOnce sync.Once
+	file_aksnodeconfig_v1_bootstrapping_config_proto_rawDescData = file_aksnodeconfig_v1_bootstrapping_config_proto_rawDesc
+)
+
+func file_aksnodeconfig_v1_bootstrapping_config_proto_rawDescGZIP() []byte {
+	file_aksnodeconfig_v1_bootstrapping_config_proto_rawDescOnce.Do(func() {
+		file_aksnodeconfig_v1_bootstrapping_config_proto_rawDescData = protoimpl.X.CompressGZIP(file_aksnodeconfig_v1_bootstrapping_config_proto_rawDescData)
+	})
+	return file_aksnodeconfig_v1_bootstrapping_config_proto_rawDescData
+}
+
+var file_aksnodeconfig_v1_bootstrapping_config_proto_enumTypes = make([]protoimpl.EnumInfo, 2)
+var file_aksnodeconfig_v1_bootstrapping_config_proto_msgTypes = make([]protoimpl.MessageInfo, 1)
+var file_aksnodeconfig_v1_bootstrapping_config_proto_goTypes = []any{
+	(BootstrappingAuthMethod)(0), // 0: aksnodeconfig.v1.BootstrappingAuthMethod
+	(ClusterJoinMethod)(0),       // 1: aksnodeconfig.v1.ClusterJoinMethod
+	(*BootstrappingConfig)(nil),  // 2: aksnodeconfig.v1.BootstrappingConfig
+}
+var file_aksnodeconfig_v1_bootstrapping_config_proto_depIdxs = []int32{
+	0, // 0: aksnodeconfig.v1.BootstrappingConfig.bootstrapping_auth_method:type_name -> aksnodeconfig.v1.BootstrappingAuthMethod
+	1, // 1: aksnodeconfig.v1.BootstrappingConfig.cluster_join_method:type_name -> aksnodeconfig.v1.ClusterJoinMethod
+	2, // [2:2] is the sub-list for method output_type
+	2, // [2:2] is the sub-list for method input_type
+	2, // [2:2] is the sub-list for extension type_name
+	2, // [2:2] is the sub-list for extension extendee
+	0, // [0:2] is the sub-list for field type_name
+}
+
+func init() { file_aksnodeconfig_v1_bootstrapping_config_proto_init() }
+func file_aksnodeconfig_v1_bootstrapping_config_proto_init() {
+	if File_aksnodeconfig_v1_bootstrapping_config_proto != nil {
+		return
+	}
+	file_aksnodeconfig_v1_bootstrapping_config_proto_msgTypes[0].OneofWrappers = []any{}
+	type x struct{}
+	out := protoimpl.TypeBuilder{
+		File: protoimpl.DescBuilder{
+			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
+			RawDescriptor: file_aksnodeconfig_v1_bootstrapping_config_proto_rawDesc,
+			NumEnums:      2,
+			NumMessages:   1,
+			NumExtensions: 0,
+			NumServices:   0,
+		},
+		GoTypes:           file_aksnodeconfig_v1_bootstrapping_config_proto_goTypes,
+		DependencyIndexes: file_aksnodeconfig_v1_bootstrapping_config_proto_depIdxs,
+		EnumInfos:         file_aksnodeconfig_v1_bootstrapping_config_proto_enumTypes,
+		MessageInfos:      file_aksnodeconfig_v1_bootstrapping_config_proto_msgTypes,
+	}.Build()
+	File_aksnodeconfig_v1_bootstrapping_config_proto = out.File
+	file_aksnodeconfig_v1_bootstrapping_config_proto_rawDesc = nil
+	file_aksnodeconfig_v1_bootstrapping_config_proto_goTypes = nil
+	file_aksnodeconfig_v1_bootstrapping_config_proto_depIdxs = nil
+}
diff --git a/aks-node-controller/pkg/gen/aksnodeconfig/v1/config.pb.go b/aks-node-controller/pkg/gen/aksnodeconfig/v1/config.pb.go
index f4be8e24660..42cb475fe1e 100644
--- a/aks-node-controller/pkg/gen/aksnodeconfig/v1/config.pb.go
+++ b/aks-node-controller/pkg/gen/aksnodeconfig/v1/config.pb.go
@@ -85,7 +85,7 @@ type Configuration struct {
 	// Various Kubernetes cluster level configuration
 	ClusterConfig *ClusterConfig `protobuf:"bytes,5,opt,name=cluster_config,json=clusterConfig,proto3" json:"cluster_config,omitempty"`
 	// TLS bootstrap config
-	TlsBootstrappingConfig *TlsBootstrappingConfig `protobuf:"bytes,6,opt,name=tls_bootstrapping_config,json=tlsBootstrappingConfig,proto3" json:"tls_bootstrapping_config,omitempty"`
+	BootstrappingConfig *BootstrappingConfig `protobuf:"bytes,6,opt,name=bootstrapping_config,json=bootstrappingConfig,proto3" json:"bootstrapping_config,omitempty"`
 	// Authentication configuration
 	AuthConfig *AuthConfig `protobuf:"bytes,7,opt,name=auth_config,json=authConfig,proto3" json:"auth_config,omitempty"`
 	// The CLI tool runc configuration
@@ -225,9 +225,9 @@ func (x *Configuration) GetClusterConfig() *ClusterConfig {
 	return nil
 }
 
-func (x *Configuration) GetTlsBootstrappingConfig() *TlsBootstrappingConfig {
+func (x *Configuration) GetBootstrappingConfig() *BootstrappingConfig {
 	if x != nil {
-		return x.TlsBootstrappingConfig
+		return x.BootstrappingConfig
 	}
 	return nil
 }
@@ -474,220 +474,219 @@ var file_aksnodeconfig_v1_config_proto_rawDesc = []byte{
 	0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x22, 0x61, 0x6b, 0x73,
 	0x6e, 0x6f, 0x64, 0x65, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2f, 0x76, 0x31, 0x2f, 0x61, 0x75,
 	0x74, 0x68, 0x5f, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a,
-	0x25, 0x61, 0x6b, 0x73, 0x6e, 0x6f, 0x64, 0x65, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2f, 0x76,
-	0x31, 0x2f, 0x63, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x5f, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67,
-	0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x28, 0x61, 0x6b, 0x73, 0x6e, 0x6f, 0x64, 0x65, 0x63,
-	0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2f, 0x76, 0x31, 0x2f, 0x63, 0x6f, 0x6e, 0x74, 0x61, 0x69, 0x6e,
-	0x65, 0x72, 0x64, 0x5f, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f,
-	0x1a, 0x2a, 0x61, 0x6b, 0x73, 0x6e, 0x6f, 0x64, 0x65, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2f,
-	0x76, 0x31, 0x2f, 0x63, 0x75, 0x73, 0x74, 0x6f, 0x6d, 0x5f, 0x63, 0x6c, 0x6f, 0x75, 0x64, 0x5f,
-	0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x2d, 0x61, 0x6b,
+	0x2b, 0x61, 0x6b, 0x73, 0x6e, 0x6f, 0x64, 0x65, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2f, 0x76,
+	0x31, 0x2f, 0x62, 0x6f, 0x6f, 0x74, 0x73, 0x74, 0x72, 0x61, 0x70, 0x70, 0x69, 0x6e, 0x67, 0x5f,
+	0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x25, 0x61, 0x6b,
 	0x73, 0x6e, 0x6f, 0x64, 0x65, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2f, 0x76, 0x31, 0x2f, 0x63,
-	0x75, 0x73, 0x74, 0x6f, 0x6d, 0x5f, 0x6c, 0x69, 0x6e, 0x75, 0x78, 0x5f, 0x6f, 0x73, 0x5f, 0x63,
-	0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x32, 0x61, 0x6b, 0x73,
-	0x6e, 0x6f, 0x64, 0x65, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2f, 0x76, 0x31, 0x2f, 0x63, 0x75,
-	0x73, 0x74, 0x6f, 0x6d, 0x5f, 0x73, 0x65, 0x61, 0x72, 0x63, 0x68, 0x5f, 0x64, 0x6f, 0x6d, 0x61,
-	0x69, 0x6e, 0x5f, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a,
-	0x21, 0x61, 0x6b, 0x73, 0x6e, 0x6f, 0x64, 0x65, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2f, 0x76,
-	0x31, 0x2f, 0x67, 0x70, 0x75, 0x5f, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x70, 0x72, 0x6f,
-	0x74, 0x6f, 0x1a, 0x28, 0x61, 0x6b, 0x73, 0x6e, 0x6f, 0x64, 0x65, 0x63, 0x6f, 0x6e, 0x66, 0x69,
-	0x67, 0x2f, 0x76, 0x31, 0x2f, 0x68, 0x74, 0x74, 0x70, 0x5f, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x5f,
-	0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x2e, 0x61, 0x6b,
-	0x73, 0x6e, 0x6f, 0x64, 0x65, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2f, 0x76, 0x31, 0x2f, 0x69,
-	0x6d, 0x64, 0x73, 0x5f, 0x72, 0x65, 0x73, 0x74, 0x72, 0x69, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x5f,
-	0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x29, 0x61, 0x6b,
-	0x73, 0x6e, 0x6f, 0x64, 0x65, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2f, 0x76, 0x31, 0x2f, 0x6b,
-	0x75, 0x62, 0x65, 0x5f, 0x62, 0x69, 0x6e, 0x61, 0x72, 0x79, 0x5f, 0x63, 0x6f, 0x6e, 0x66, 0x69,
-	0x67, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x25, 0x61, 0x6b, 0x73, 0x6e, 0x6f, 0x64, 0x65,
-	0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2f, 0x76, 0x31, 0x2f, 0x6b, 0x75, 0x62, 0x65, 0x6c, 0x65,
-	0x74, 0x5f, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x25,
-	0x61, 0x6b, 0x73, 0x6e, 0x6f, 0x64, 0x65, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2f, 0x76, 0x31,
-	0x2f, 0x6e, 0x65, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x5f, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e,
-	0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x22, 0x61, 0x6b, 0x73, 0x6e, 0x6f, 0x64, 0x65, 0x63, 0x6f,
-	0x6e, 0x66, 0x69, 0x67, 0x2f, 0x76, 0x31, 0x2f, 0x72, 0x75, 0x6e, 0x63, 0x5f, 0x63, 0x6f, 0x6e,
-	0x66, 0x69, 0x67, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x26, 0x61, 0x6b, 0x73, 0x6e, 0x6f,
-	0x64, 0x65, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2f, 0x76, 0x31, 0x2f, 0x74, 0x65, 0x6c, 0x65,
-	0x70, 0x6f, 0x72, 0x74, 0x5f, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x70, 0x72, 0x6f, 0x74,
-	0x6f, 0x1a, 0x2f, 0x61, 0x6b, 0x73, 0x6e, 0x6f, 0x64, 0x65, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67,
-	0x2f, 0x76, 0x31, 0x2f, 0x74, 0x6c, 0x73, 0x5f, 0x62, 0x6f, 0x6f, 0x74, 0x73, 0x74, 0x72, 0x61,
-	0x70, 0x70, 0x69, 0x6e, 0x67, 0x5f, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x70, 0x72, 0x6f,
-	0x74, 0x6f, 0x22, 0x9d, 0x13, 0x0a, 0x0d, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x75, 0x72, 0x61,
-	0x74, 0x69, 0x6f, 0x6e, 0x12, 0x18, 0x0a, 0x07, 0x76, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x18,
-	0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x76, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x12, 0x50,
-	0x0a, 0x12, 0x6b, 0x75, 0x62, 0x65, 0x5f, 0x62, 0x69, 0x6e, 0x61, 0x72, 0x79, 0x5f, 0x63, 0x6f,
-	0x6e, 0x66, 0x69, 0x67, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x22, 0x2e, 0x61, 0x6b, 0x73,
-	0x6e, 0x6f, 0x64, 0x65, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x76, 0x31, 0x2e, 0x4b, 0x75,
-	0x62, 0x65, 0x42, 0x69, 0x6e, 0x61, 0x72, 0x79, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x52, 0x10,
-	0x6b, 0x75, 0x62, 0x65, 0x42, 0x69, 0x6e, 0x61, 0x72, 0x79, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67,
-	0x12, 0x53, 0x0a, 0x13, 0x63, 0x75, 0x73, 0x74, 0x6f, 0x6d, 0x5f, 0x63, 0x6c, 0x6f, 0x75, 0x64,
-	0x5f, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x23, 0x2e,
-	0x61, 0x6b, 0x73, 0x6e, 0x6f, 0x64, 0x65, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x76, 0x31,
-	0x2e, 0x43, 0x75, 0x73, 0x74, 0x6f, 0x6d, 0x43, 0x6c, 0x6f, 0x75, 0x64, 0x43, 0x6f, 0x6e, 0x66,
-	0x69, 0x67, 0x52, 0x11, 0x63, 0x75, 0x73, 0x74, 0x6f, 0x6d, 0x43, 0x6c, 0x6f, 0x75, 0x64, 0x43,
-	0x6f, 0x6e, 0x66, 0x69, 0x67, 0x12, 0x4d, 0x0a, 0x11, 0x61, 0x70, 0x69, 0x5f, 0x73, 0x65, 0x72,
-	0x76, 0x65, 0x72, 0x5f, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0b,
-	0x32, 0x21, 0x2e, 0x61, 0x6b, 0x73, 0x6e, 0x6f, 0x64, 0x65, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67,
-	0x2e, 0x76, 0x31, 0x2e, 0x41, 0x70, 0x69, 0x53, 0x65, 0x72, 0x76, 0x65, 0x72, 0x43, 0x6f, 0x6e,
-	0x66, 0x69, 0x67, 0x52, 0x0f, 0x61, 0x70, 0x69, 0x53, 0x65, 0x72, 0x76, 0x65, 0x72, 0x43, 0x6f,
-	0x6e, 0x66, 0x69, 0x67, 0x12, 0x46, 0x0a, 0x0e, 0x63, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x5f,
-	0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x18, 0x05, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1f, 0x2e, 0x61,
+	0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x5f, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x70, 0x72,
+	0x6f, 0x74, 0x6f, 0x1a, 0x28, 0x61, 0x6b, 0x73, 0x6e, 0x6f, 0x64, 0x65, 0x63, 0x6f, 0x6e, 0x66,
+	0x69, 0x67, 0x2f, 0x76, 0x31, 0x2f, 0x63, 0x6f, 0x6e, 0x74, 0x61, 0x69, 0x6e, 0x65, 0x72, 0x64,
+	0x5f, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x2a, 0x61,
+	0x6b, 0x73, 0x6e, 0x6f, 0x64, 0x65, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2f, 0x76, 0x31, 0x2f,
+	0x63, 0x75, 0x73, 0x74, 0x6f, 0x6d, 0x5f, 0x63, 0x6c, 0x6f, 0x75, 0x64, 0x5f, 0x63, 0x6f, 0x6e,
+	0x66, 0x69, 0x67, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x2d, 0x61, 0x6b, 0x73, 0x6e, 0x6f,
+	0x64, 0x65, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2f, 0x76, 0x31, 0x2f, 0x63, 0x75, 0x73, 0x74,
+	0x6f, 0x6d, 0x5f, 0x6c, 0x69, 0x6e, 0x75, 0x78, 0x5f, 0x6f, 0x73, 0x5f, 0x63, 0x6f, 0x6e, 0x66,
+	0x69, 0x67, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x32, 0x61, 0x6b, 0x73, 0x6e, 0x6f, 0x64,
+	0x65, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2f, 0x76, 0x31, 0x2f, 0x63, 0x75, 0x73, 0x74, 0x6f,
+	0x6d, 0x5f, 0x73, 0x65, 0x61, 0x72, 0x63, 0x68, 0x5f, 0x64, 0x6f, 0x6d, 0x61, 0x69, 0x6e, 0x5f,
+	0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x21, 0x61, 0x6b,
+	0x73, 0x6e, 0x6f, 0x64, 0x65, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2f, 0x76, 0x31, 0x2f, 0x67,
+	0x70, 0x75, 0x5f, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a,
+	0x28, 0x61, 0x6b, 0x73, 0x6e, 0x6f, 0x64, 0x65, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2f, 0x76,
+	0x31, 0x2f, 0x68, 0x74, 0x74, 0x70, 0x5f, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x5f, 0x63, 0x6f, 0x6e,
+	0x66, 0x69, 0x67, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x2e, 0x61, 0x6b, 0x73, 0x6e, 0x6f,
+	0x64, 0x65, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2f, 0x76, 0x31, 0x2f, 0x69, 0x6d, 0x64, 0x73,
+	0x5f, 0x72, 0x65, 0x73, 0x74, 0x72, 0x69, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x63, 0x6f, 0x6e,
+	0x66, 0x69, 0x67, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x29, 0x61, 0x6b, 0x73, 0x6e, 0x6f,
+	0x64, 0x65, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2f, 0x76, 0x31, 0x2f, 0x6b, 0x75, 0x62, 0x65,
+	0x5f, 0x62, 0x69, 0x6e, 0x61, 0x72, 0x79, 0x5f, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x70,
+	0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x25, 0x61, 0x6b, 0x73, 0x6e, 0x6f, 0x64, 0x65, 0x63, 0x6f, 0x6e,
+	0x66, 0x69, 0x67, 0x2f, 0x76, 0x31, 0x2f, 0x6b, 0x75, 0x62, 0x65, 0x6c, 0x65, 0x74, 0x5f, 0x63,
+	0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x25, 0x61, 0x6b, 0x73,
+	0x6e, 0x6f, 0x64, 0x65, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2f, 0x76, 0x31, 0x2f, 0x6e, 0x65,
+	0x74, 0x77, 0x6f, 0x72, 0x6b, 0x5f, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x70, 0x72, 0x6f,
+	0x74, 0x6f, 0x1a, 0x22, 0x61, 0x6b, 0x73, 0x6e, 0x6f, 0x64, 0x65, 0x63, 0x6f, 0x6e, 0x66, 0x69,
+	0x67, 0x2f, 0x76, 0x31, 0x2f, 0x72, 0x75, 0x6e, 0x63, 0x5f, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67,
+	0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x26, 0x61, 0x6b, 0x73, 0x6e, 0x6f, 0x64, 0x65, 0x63,
+	0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2f, 0x76, 0x31, 0x2f, 0x74, 0x65, 0x6c, 0x65, 0x70, 0x6f, 0x72,
+	0x74, 0x5f, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x93,
+	0x13, 0x0a, 0x0d, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x75, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e,
+	0x12, 0x18, 0x0a, 0x07, 0x76, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x18, 0x01, 0x20, 0x01, 0x28,
+	0x09, 0x52, 0x07, 0x76, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x12, 0x50, 0x0a, 0x12, 0x6b, 0x75,
+	0x62, 0x65, 0x5f, 0x62, 0x69, 0x6e, 0x61, 0x72, 0x79, 0x5f, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67,
+	0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x22, 0x2e, 0x61, 0x6b, 0x73, 0x6e, 0x6f, 0x64, 0x65,
+	0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x76, 0x31, 0x2e, 0x4b, 0x75, 0x62, 0x65, 0x42, 0x69,
+	0x6e, 0x61, 0x72, 0x79, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x52, 0x10, 0x6b, 0x75, 0x62, 0x65,
+	0x42, 0x69, 0x6e, 0x61, 0x72, 0x79, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x12, 0x53, 0x0a, 0x13,
+	0x63, 0x75, 0x73, 0x74, 0x6f, 0x6d, 0x5f, 0x63, 0x6c, 0x6f, 0x75, 0x64, 0x5f, 0x63, 0x6f, 0x6e,
+	0x66, 0x69, 0x67, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x23, 0x2e, 0x61, 0x6b, 0x73, 0x6e,
+	0x6f, 0x64, 0x65, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x76, 0x31, 0x2e, 0x43, 0x75, 0x73,
+	0x74, 0x6f, 0x6d, 0x43, 0x6c, 0x6f, 0x75, 0x64, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x52, 0x11,
+	0x63, 0x75, 0x73, 0x74, 0x6f, 0x6d, 0x43, 0x6c, 0x6f, 0x75, 0x64, 0x43, 0x6f, 0x6e, 0x66, 0x69,
+	0x67, 0x12, 0x4d, 0x0a, 0x11, 0x61, 0x70, 0x69, 0x5f, 0x73, 0x65, 0x72, 0x76, 0x65, 0x72, 0x5f,
+	0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x21, 0x2e, 0x61,
 	0x6b, 0x73, 0x6e, 0x6f, 0x64, 0x65, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x76, 0x31, 0x2e,
-	0x43, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x52, 0x0d, 0x63,
-	0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x12, 0x62, 0x0a, 0x18,
-	0x74, 0x6c, 0x73, 0x5f, 0x62, 0x6f, 0x6f, 0x74, 0x73, 0x74, 0x72, 0x61, 0x70, 0x70, 0x69, 0x6e,
-	0x67, 0x5f, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x18, 0x06, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x28,
+	0x41, 0x70, 0x69, 0x53, 0x65, 0x72, 0x76, 0x65, 0x72, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x52,
+	0x0f, 0x61, 0x70, 0x69, 0x53, 0x65, 0x72, 0x76, 0x65, 0x72, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67,
+	0x12, 0x46, 0x0a, 0x0e, 0x63, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x5f, 0x63, 0x6f, 0x6e, 0x66,
+	0x69, 0x67, 0x18, 0x05, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1f, 0x2e, 0x61, 0x6b, 0x73, 0x6e, 0x6f,
+	0x64, 0x65, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x76, 0x31, 0x2e, 0x43, 0x6c, 0x75, 0x73,
+	0x74, 0x65, 0x72, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x52, 0x0d, 0x63, 0x6c, 0x75, 0x73, 0x74,
+	0x65, 0x72, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x12, 0x58, 0x0a, 0x14, 0x62, 0x6f, 0x6f, 0x74,
+	0x73, 0x74, 0x72, 0x61, 0x70, 0x70, 0x69, 0x6e, 0x67, 0x5f, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67,
+	0x18, 0x06, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x25, 0x2e, 0x61, 0x6b, 0x73, 0x6e, 0x6f, 0x64, 0x65,
+	0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x76, 0x31, 0x2e, 0x42, 0x6f, 0x6f, 0x74, 0x73, 0x74,
+	0x72, 0x61, 0x70, 0x70, 0x69, 0x6e, 0x67, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x52, 0x13, 0x62,
+	0x6f, 0x6f, 0x74, 0x73, 0x74, 0x72, 0x61, 0x70, 0x70, 0x69, 0x6e, 0x67, 0x43, 0x6f, 0x6e, 0x66,
+	0x69, 0x67, 0x12, 0x3d, 0x0a, 0x0b, 0x61, 0x75, 0x74, 0x68, 0x5f, 0x63, 0x6f, 0x6e, 0x66, 0x69,
+	0x67, 0x18, 0x07, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1c, 0x2e, 0x61, 0x6b, 0x73, 0x6e, 0x6f, 0x64,
+	0x65, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x76, 0x31, 0x2e, 0x41, 0x75, 0x74, 0x68, 0x43,
+	0x6f, 0x6e, 0x66, 0x69, 0x67, 0x52, 0x0a, 0x61, 0x75, 0x74, 0x68, 0x43, 0x6f, 0x6e, 0x66, 0x69,
+	0x67, 0x12, 0x3d, 0x0a, 0x0b, 0x72, 0x75, 0x6e, 0x63, 0x5f, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67,
+	0x18, 0x08, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1c, 0x2e, 0x61, 0x6b, 0x73, 0x6e, 0x6f, 0x64, 0x65,
+	0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x76, 0x31, 0x2e, 0x52, 0x75, 0x6e, 0x63, 0x43, 0x6f,
+	0x6e, 0x66, 0x69, 0x67, 0x52, 0x0a, 0x72, 0x75, 0x6e, 0x63, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67,
+	0x12, 0x4f, 0x0a, 0x11, 0x63, 0x6f, 0x6e, 0x74, 0x61, 0x69, 0x6e, 0x65, 0x72, 0x64, 0x5f, 0x63,
+	0x6f, 0x6e, 0x66, 0x69, 0x67, 0x18, 0x09, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x22, 0x2e, 0x61, 0x6b,
+	0x73, 0x6e, 0x6f, 0x64, 0x65, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x76, 0x31, 0x2e, 0x43,
+	0x6f, 0x6e, 0x74, 0x61, 0x69, 0x6e, 0x65, 0x72, 0x64, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x52,
+	0x10, 0x63, 0x6f, 0x6e, 0x74, 0x61, 0x69, 0x6e, 0x65, 0x72, 0x64, 0x43, 0x6f, 0x6e, 0x66, 0x69,
+	0x67, 0x12, 0x49, 0x0a, 0x0f, 0x74, 0x65, 0x6c, 0x65, 0x70, 0x6f, 0x72, 0x74, 0x5f, 0x63, 0x6f,
+	0x6e, 0x66, 0x69, 0x67, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x20, 0x2e, 0x61, 0x6b, 0x73,
+	0x6e, 0x6f, 0x64, 0x65, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x76, 0x31, 0x2e, 0x54, 0x65,
+	0x6c, 0x65, 0x70, 0x6f, 0x72, 0x74, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x52, 0x0e, 0x74, 0x65,
+	0x6c, 0x65, 0x70, 0x6f, 0x72, 0x74, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x12, 0x46, 0x0a, 0x0e,
+	0x6b, 0x75, 0x62, 0x65, 0x6c, 0x65, 0x74, 0x5f, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x18, 0x0b,
+	0x20, 0x01, 0x28, 0x0b, 0x32, 0x1f, 0x2e, 0x61, 0x6b, 0x73, 0x6e, 0x6f, 0x64, 0x65, 0x63, 0x6f,
+	0x6e, 0x66, 0x69, 0x67, 0x2e, 0x76, 0x31, 0x2e, 0x4b, 0x75, 0x62, 0x65, 0x6c, 0x65, 0x74, 0x43,
+	0x6f, 0x6e, 0x66, 0x69, 0x67, 0x52, 0x0d, 0x6b, 0x75, 0x62, 0x65, 0x6c, 0x65, 0x74, 0x43, 0x6f,
+	0x6e, 0x66, 0x69, 0x67, 0x12, 0x69, 0x0a, 0x1b, 0x63, 0x75, 0x73, 0x74, 0x6f, 0x6d, 0x5f, 0x73,
+	0x65, 0x61, 0x72, 0x63, 0x68, 0x5f, 0x64, 0x6f, 0x6d, 0x61, 0x69, 0x6e, 0x5f, 0x63, 0x6f, 0x6e,
+	0x66, 0x69, 0x67, 0x18, 0x0c, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x2a, 0x2e, 0x61, 0x6b, 0x73, 0x6e,
+	0x6f, 0x64, 0x65, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x76, 0x31, 0x2e, 0x43, 0x75, 0x73,
+	0x74, 0x6f, 0x6d, 0x53, 0x65, 0x61, 0x72, 0x63, 0x68, 0x44, 0x6f, 0x6d, 0x61, 0x69, 0x6e, 0x43,
+	0x6f, 0x6e, 0x66, 0x69, 0x67, 0x52, 0x18, 0x63, 0x75, 0x73, 0x74, 0x6f, 0x6d, 0x53, 0x65, 0x61,
+	0x72, 0x63, 0x68, 0x44, 0x6f, 0x6d, 0x61, 0x69, 0x6e, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x12,
+	0x5a, 0x0a, 0x16, 0x63, 0x75, 0x73, 0x74, 0x6f, 0x6d, 0x5f, 0x6c, 0x69, 0x6e, 0x75, 0x78, 0x5f,
+	0x6f, 0x73, 0x5f, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x18, 0x0d, 0x20, 0x01, 0x28, 0x0b, 0x32,
+	0x25, 0x2e, 0x61, 0x6b, 0x73, 0x6e, 0x6f, 0x64, 0x65, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e,
+	0x76, 0x31, 0x2e, 0x43, 0x75, 0x73, 0x74, 0x6f, 0x6d, 0x4c, 0x69, 0x6e, 0x75, 0x78, 0x4f, 0x73,
+	0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x52, 0x13, 0x63, 0x75, 0x73, 0x74, 0x6f, 0x6d, 0x4c, 0x69,
+	0x6e, 0x75, 0x78, 0x4f, 0x73, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x12, 0x4d, 0x0a, 0x11, 0x68,
+	0x74, 0x74, 0x70, 0x5f, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x5f, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67,
+	0x18, 0x0e, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x21, 0x2e, 0x61, 0x6b, 0x73, 0x6e, 0x6f, 0x64, 0x65,
+	0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x76, 0x31, 0x2e, 0x48, 0x74, 0x74, 0x70, 0x50, 0x72,
+	0x6f, 0x78, 0x79, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x52, 0x0f, 0x68, 0x74, 0x74, 0x70, 0x50,
+	0x72, 0x6f, 0x78, 0x79, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x12, 0x3a, 0x0a, 0x0a, 0x67, 0x70,
+	0x75, 0x5f, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x18, 0x0f, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1b,
+	0x2e, 0x61, 0x6b, 0x73, 0x6e, 0x6f, 0x64, 0x65, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x76,
+	0x31, 0x2e, 0x47, 0x70, 0x75, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x52, 0x09, 0x67, 0x70, 0x75,
+	0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x12, 0x46, 0x0a, 0x0e, 0x6e, 0x65, 0x74, 0x77, 0x6f, 0x72,
+	0x6b, 0x5f, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x18, 0x10, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1f,
 	0x2e, 0x61, 0x6b, 0x73, 0x6e, 0x6f, 0x64, 0x65, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x76,
-	0x31, 0x2e, 0x54, 0x6c, 0x73, 0x42, 0x6f, 0x6f, 0x74, 0x73, 0x74, 0x72, 0x61, 0x70, 0x70, 0x69,
-	0x6e, 0x67, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x52, 0x16, 0x74, 0x6c, 0x73, 0x42, 0x6f, 0x6f,
-	0x74, 0x73, 0x74, 0x72, 0x61, 0x70, 0x70, 0x69, 0x6e, 0x67, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67,
-	0x12, 0x3d, 0x0a, 0x0b, 0x61, 0x75, 0x74, 0x68, 0x5f, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x18,
-	0x07, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1c, 0x2e, 0x61, 0x6b, 0x73, 0x6e, 0x6f, 0x64, 0x65, 0x63,
-	0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x76, 0x31, 0x2e, 0x41, 0x75, 0x74, 0x68, 0x43, 0x6f, 0x6e,
-	0x66, 0x69, 0x67, 0x52, 0x0a, 0x61, 0x75, 0x74, 0x68, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x12,
-	0x3d, 0x0a, 0x0b, 0x72, 0x75, 0x6e, 0x63, 0x5f, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x18, 0x08,
-	0x20, 0x01, 0x28, 0x0b, 0x32, 0x1c, 0x2e, 0x61, 0x6b, 0x73, 0x6e, 0x6f, 0x64, 0x65, 0x63, 0x6f,
-	0x6e, 0x66, 0x69, 0x67, 0x2e, 0x76, 0x31, 0x2e, 0x52, 0x75, 0x6e, 0x63, 0x43, 0x6f, 0x6e, 0x66,
-	0x69, 0x67, 0x52, 0x0a, 0x72, 0x75, 0x6e, 0x63, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x12, 0x4f,
-	0x0a, 0x11, 0x63, 0x6f, 0x6e, 0x74, 0x61, 0x69, 0x6e, 0x65, 0x72, 0x64, 0x5f, 0x63, 0x6f, 0x6e,
-	0x66, 0x69, 0x67, 0x18, 0x09, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x22, 0x2e, 0x61, 0x6b, 0x73, 0x6e,
-	0x6f, 0x64, 0x65, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x76, 0x31, 0x2e, 0x43, 0x6f, 0x6e,
-	0x74, 0x61, 0x69, 0x6e, 0x65, 0x72, 0x64, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x52, 0x10, 0x63,
-	0x6f, 0x6e, 0x74, 0x61, 0x69, 0x6e, 0x65, 0x72, 0x64, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x12,
-	0x49, 0x0a, 0x0f, 0x74, 0x65, 0x6c, 0x65, 0x70, 0x6f, 0x72, 0x74, 0x5f, 0x63, 0x6f, 0x6e, 0x66,
-	0x69, 0x67, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x20, 0x2e, 0x61, 0x6b, 0x73, 0x6e, 0x6f,
-	0x64, 0x65, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x76, 0x31, 0x2e, 0x54, 0x65, 0x6c, 0x65,
-	0x70, 0x6f, 0x72, 0x74, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x52, 0x0e, 0x74, 0x65, 0x6c, 0x65,
-	0x70, 0x6f, 0x72, 0x74, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x12, 0x46, 0x0a, 0x0e, 0x6b, 0x75,
-	0x62, 0x65, 0x6c, 0x65, 0x74, 0x5f, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x18, 0x0b, 0x20, 0x01,
-	0x28, 0x0b, 0x32, 0x1f, 0x2e, 0x61, 0x6b, 0x73, 0x6e, 0x6f, 0x64, 0x65, 0x63, 0x6f, 0x6e, 0x66,
-	0x69, 0x67, 0x2e, 0x76, 0x31, 0x2e, 0x4b, 0x75, 0x62, 0x65, 0x6c, 0x65, 0x74, 0x43, 0x6f, 0x6e,
-	0x66, 0x69, 0x67, 0x52, 0x0d, 0x6b, 0x75, 0x62, 0x65, 0x6c, 0x65, 0x74, 0x43, 0x6f, 0x6e, 0x66,
-	0x69, 0x67, 0x12, 0x69, 0x0a, 0x1b, 0x63, 0x75, 0x73, 0x74, 0x6f, 0x6d, 0x5f, 0x73, 0x65, 0x61,
-	0x72, 0x63, 0x68, 0x5f, 0x64, 0x6f, 0x6d, 0x61, 0x69, 0x6e, 0x5f, 0x63, 0x6f, 0x6e, 0x66, 0x69,
-	0x67, 0x18, 0x0c, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x2a, 0x2e, 0x61, 0x6b, 0x73, 0x6e, 0x6f, 0x64,
-	0x65, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x76, 0x31, 0x2e, 0x43, 0x75, 0x73, 0x74, 0x6f,
-	0x6d, 0x53, 0x65, 0x61, 0x72, 0x63, 0x68, 0x44, 0x6f, 0x6d, 0x61, 0x69, 0x6e, 0x43, 0x6f, 0x6e,
-	0x66, 0x69, 0x67, 0x52, 0x18, 0x63, 0x75, 0x73, 0x74, 0x6f, 0x6d, 0x53, 0x65, 0x61, 0x72, 0x63,
-	0x68, 0x44, 0x6f, 0x6d, 0x61, 0x69, 0x6e, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x12, 0x5a, 0x0a,
-	0x16, 0x63, 0x75, 0x73, 0x74, 0x6f, 0x6d, 0x5f, 0x6c, 0x69, 0x6e, 0x75, 0x78, 0x5f, 0x6f, 0x73,
-	0x5f, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x18, 0x0d, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x25, 0x2e,
+	0x31, 0x2e, 0x4e, 0x65, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x52,
+	0x0d, 0x6e, 0x65, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x12, 0x2c,
+	0x0a, 0x12, 0x6b, 0x75, 0x62, 0x65, 0x72, 0x6e, 0x65, 0x74, 0x65, 0x73, 0x5f, 0x63, 0x61, 0x5f,
+	0x63, 0x65, 0x72, 0x74, 0x18, 0x11, 0x20, 0x01, 0x28, 0x09, 0x52, 0x10, 0x6b, 0x75, 0x62, 0x65,
+	0x72, 0x6e, 0x65, 0x74, 0x65, 0x73, 0x43, 0x61, 0x43, 0x65, 0x72, 0x74, 0x12, 0x2d, 0x0a, 0x12,
+	0x6b, 0x75, 0x62, 0x65, 0x72, 0x6e, 0x65, 0x74, 0x65, 0x73, 0x5f, 0x76, 0x65, 0x72, 0x73, 0x69,
+	0x6f, 0x6e, 0x18, 0x12, 0x20, 0x01, 0x28, 0x09, 0x52, 0x11, 0x6b, 0x75, 0x62, 0x65, 0x72, 0x6e,
+	0x65, 0x74, 0x65, 0x73, 0x56, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x12, 0x24, 0x0a, 0x0e, 0x6b,
+	0x75, 0x62, 0x65, 0x5f, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x5f, 0x75, 0x72, 0x6c, 0x18, 0x13, 0x20,
+	0x01, 0x28, 0x09, 0x52, 0x0c, 0x6b, 0x75, 0x62, 0x65, 0x50, 0x72, 0x6f, 0x78, 0x79, 0x55, 0x72,
+	0x6c, 0x12, 0x17, 0x0a, 0x07, 0x76, 0x6d, 0x5f, 0x73, 0x69, 0x7a, 0x65, 0x18, 0x14, 0x20, 0x01,
+	0x28, 0x09, 0x52, 0x06, 0x76, 0x6d, 0x53, 0x69, 0x7a, 0x65, 0x12, 0x30, 0x0a, 0x14, 0x6c, 0x69,
+	0x6e, 0x75, 0x78, 0x5f, 0x61, 0x64, 0x6d, 0x69, 0x6e, 0x5f, 0x75, 0x73, 0x65, 0x72, 0x6e, 0x61,
+	0x6d, 0x65, 0x18, 0x15, 0x20, 0x01, 0x28, 0x09, 0x52, 0x12, 0x6c, 0x69, 0x6e, 0x75, 0x78, 0x41,
+	0x64, 0x6d, 0x69, 0x6e, 0x55, 0x73, 0x65, 0x72, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x1a, 0x0a, 0x06,
+	0x69, 0x73, 0x5f, 0x76, 0x68, 0x64, 0x18, 0x16, 0x20, 0x01, 0x28, 0x08, 0x48, 0x00, 0x52, 0x05,
+	0x69, 0x73, 0x56, 0x68, 0x64, 0x88, 0x01, 0x01, 0x12, 0x22, 0x0a, 0x0a, 0x65, 0x6e, 0x61, 0x62,
+	0x6c, 0x65, 0x5f, 0x73, 0x73, 0x68, 0x18, 0x17, 0x20, 0x01, 0x28, 0x08, 0x48, 0x01, 0x52, 0x09,
+	0x65, 0x6e, 0x61, 0x62, 0x6c, 0x65, 0x53, 0x73, 0x68, 0x88, 0x01, 0x01, 0x12, 0x3a, 0x0a, 0x19,
+	0x65, 0x6e, 0x61, 0x62, 0x6c, 0x65, 0x5f, 0x75, 0x6e, 0x61, 0x74, 0x74, 0x65, 0x6e, 0x64, 0x65,
+	0x64, 0x5f, 0x75, 0x70, 0x67, 0x72, 0x61, 0x64, 0x65, 0x18, 0x18, 0x20, 0x01, 0x28, 0x08, 0x52,
+	0x17, 0x65, 0x6e, 0x61, 0x62, 0x6c, 0x65, 0x55, 0x6e, 0x61, 0x74, 0x74, 0x65, 0x6e, 0x64, 0x65,
+	0x64, 0x55, 0x70, 0x67, 0x72, 0x61, 0x64, 0x65, 0x12, 0x2b, 0x0a, 0x12, 0x6d, 0x65, 0x73, 0x73,
+	0x61, 0x67, 0x65, 0x5f, 0x6f, 0x66, 0x5f, 0x74, 0x68, 0x65, 0x5f, 0x64, 0x61, 0x79, 0x18, 0x19,
+	0x20, 0x01, 0x28, 0x09, 0x52, 0x0f, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x4f, 0x66, 0x54,
+	0x68, 0x65, 0x44, 0x61, 0x79, 0x12, 0x39, 0x0a, 0x19, 0x65, 0x6e, 0x61, 0x62, 0x6c, 0x65, 0x5f,
+	0x68, 0x6f, 0x73, 0x74, 0x73, 0x5f, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x5f, 0x61, 0x67, 0x65,
+	0x6e, 0x74, 0x18, 0x1a, 0x20, 0x01, 0x28, 0x08, 0x52, 0x16, 0x65, 0x6e, 0x61, 0x62, 0x6c, 0x65,
+	0x48, 0x6f, 0x73, 0x74, 0x73, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x41, 0x67, 0x65, 0x6e, 0x74,
+	0x12, 0x26, 0x0a, 0x0f, 0x63, 0x75, 0x73, 0x74, 0x6f, 0x6d, 0x5f, 0x63, 0x61, 0x5f, 0x63, 0x65,
+	0x72, 0x74, 0x73, 0x18, 0x1b, 0x20, 0x03, 0x28, 0x09, 0x52, 0x0d, 0x63, 0x75, 0x73, 0x74, 0x6f,
+	0x6d, 0x43, 0x61, 0x43, 0x65, 0x72, 0x74, 0x73, 0x12, 0x29, 0x0a, 0x10, 0x70, 0x72, 0x6f, 0x76,
+	0x69, 0x73, 0x69, 0x6f, 0x6e, 0x5f, 0x6f, 0x75, 0x74, 0x70, 0x75, 0x74, 0x18, 0x1c, 0x20, 0x01,
+	0x28, 0x09, 0x52, 0x0f, 0x70, 0x72, 0x6f, 0x76, 0x69, 0x73, 0x69, 0x6f, 0x6e, 0x4f, 0x75, 0x74,
+	0x70, 0x75, 0x74, 0x12, 0x4c, 0x0a, 0x10, 0x77, 0x6f, 0x72, 0x6b, 0x6c, 0x6f, 0x61, 0x64, 0x5f,
+	0x72, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x18, 0x1d, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x21, 0x2e,
 	0x61, 0x6b, 0x73, 0x6e, 0x6f, 0x64, 0x65, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x76, 0x31,
-	0x2e, 0x43, 0x75, 0x73, 0x74, 0x6f, 0x6d, 0x4c, 0x69, 0x6e, 0x75, 0x78, 0x4f, 0x73, 0x43, 0x6f,
-	0x6e, 0x66, 0x69, 0x67, 0x52, 0x13, 0x63, 0x75, 0x73, 0x74, 0x6f, 0x6d, 0x4c, 0x69, 0x6e, 0x75,
-	0x78, 0x4f, 0x73, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x12, 0x4d, 0x0a, 0x11, 0x68, 0x74, 0x74,
-	0x70, 0x5f, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x5f, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x18, 0x0e,
-	0x20, 0x01, 0x28, 0x0b, 0x32, 0x21, 0x2e, 0x61, 0x6b, 0x73, 0x6e, 0x6f, 0x64, 0x65, 0x63, 0x6f,
-	0x6e, 0x66, 0x69, 0x67, 0x2e, 0x76, 0x31, 0x2e, 0x48, 0x74, 0x74, 0x70, 0x50, 0x72, 0x6f, 0x78,
-	0x79, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x52, 0x0f, 0x68, 0x74, 0x74, 0x70, 0x50, 0x72, 0x6f,
-	0x78, 0x79, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x12, 0x3a, 0x0a, 0x0a, 0x67, 0x70, 0x75, 0x5f,
-	0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x18, 0x0f, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1b, 0x2e, 0x61,
-	0x6b, 0x73, 0x6e, 0x6f, 0x64, 0x65, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x76, 0x31, 0x2e,
-	0x47, 0x70, 0x75, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x52, 0x09, 0x67, 0x70, 0x75, 0x43, 0x6f,
-	0x6e, 0x66, 0x69, 0x67, 0x12, 0x46, 0x0a, 0x0e, 0x6e, 0x65, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x5f,
-	0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x18, 0x10, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1f, 0x2e, 0x61,
-	0x6b, 0x73, 0x6e, 0x6f, 0x64, 0x65, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x76, 0x31, 0x2e,
-	0x4e, 0x65, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x52, 0x0d, 0x6e,
-	0x65, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x12, 0x2c, 0x0a, 0x12,
-	0x6b, 0x75, 0x62, 0x65, 0x72, 0x6e, 0x65, 0x74, 0x65, 0x73, 0x5f, 0x63, 0x61, 0x5f, 0x63, 0x65,
-	0x72, 0x74, 0x18, 0x11, 0x20, 0x01, 0x28, 0x09, 0x52, 0x10, 0x6b, 0x75, 0x62, 0x65, 0x72, 0x6e,
-	0x65, 0x74, 0x65, 0x73, 0x43, 0x61, 0x43, 0x65, 0x72, 0x74, 0x12, 0x2d, 0x0a, 0x12, 0x6b, 0x75,
-	0x62, 0x65, 0x72, 0x6e, 0x65, 0x74, 0x65, 0x73, 0x5f, 0x76, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e,
-	0x18, 0x12, 0x20, 0x01, 0x28, 0x09, 0x52, 0x11, 0x6b, 0x75, 0x62, 0x65, 0x72, 0x6e, 0x65, 0x74,
-	0x65, 0x73, 0x56, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x12, 0x24, 0x0a, 0x0e, 0x6b, 0x75, 0x62,
-	0x65, 0x5f, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x5f, 0x75, 0x72, 0x6c, 0x18, 0x13, 0x20, 0x01, 0x28,
-	0x09, 0x52, 0x0c, 0x6b, 0x75, 0x62, 0x65, 0x50, 0x72, 0x6f, 0x78, 0x79, 0x55, 0x72, 0x6c, 0x12,
-	0x17, 0x0a, 0x07, 0x76, 0x6d, 0x5f, 0x73, 0x69, 0x7a, 0x65, 0x18, 0x14, 0x20, 0x01, 0x28, 0x09,
-	0x52, 0x06, 0x76, 0x6d, 0x53, 0x69, 0x7a, 0x65, 0x12, 0x30, 0x0a, 0x14, 0x6c, 0x69, 0x6e, 0x75,
-	0x78, 0x5f, 0x61, 0x64, 0x6d, 0x69, 0x6e, 0x5f, 0x75, 0x73, 0x65, 0x72, 0x6e, 0x61, 0x6d, 0x65,
-	0x18, 0x15, 0x20, 0x01, 0x28, 0x09, 0x52, 0x12, 0x6c, 0x69, 0x6e, 0x75, 0x78, 0x41, 0x64, 0x6d,
-	0x69, 0x6e, 0x55, 0x73, 0x65, 0x72, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x1a, 0x0a, 0x06, 0x69, 0x73,
-	0x5f, 0x76, 0x68, 0x64, 0x18, 0x16, 0x20, 0x01, 0x28, 0x08, 0x48, 0x00, 0x52, 0x05, 0x69, 0x73,
-	0x56, 0x68, 0x64, 0x88, 0x01, 0x01, 0x12, 0x22, 0x0a, 0x0a, 0x65, 0x6e, 0x61, 0x62, 0x6c, 0x65,
-	0x5f, 0x73, 0x73, 0x68, 0x18, 0x17, 0x20, 0x01, 0x28, 0x08, 0x48, 0x01, 0x52, 0x09, 0x65, 0x6e,
-	0x61, 0x62, 0x6c, 0x65, 0x53, 0x73, 0x68, 0x88, 0x01, 0x01, 0x12, 0x3a, 0x0a, 0x19, 0x65, 0x6e,
-	0x61, 0x62, 0x6c, 0x65, 0x5f, 0x75, 0x6e, 0x61, 0x74, 0x74, 0x65, 0x6e, 0x64, 0x65, 0x64, 0x5f,
-	0x75, 0x70, 0x67, 0x72, 0x61, 0x64, 0x65, 0x18, 0x18, 0x20, 0x01, 0x28, 0x08, 0x52, 0x17, 0x65,
-	0x6e, 0x61, 0x62, 0x6c, 0x65, 0x55, 0x6e, 0x61, 0x74, 0x74, 0x65, 0x6e, 0x64, 0x65, 0x64, 0x55,
-	0x70, 0x67, 0x72, 0x61, 0x64, 0x65, 0x12, 0x2b, 0x0a, 0x12, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67,
-	0x65, 0x5f, 0x6f, 0x66, 0x5f, 0x74, 0x68, 0x65, 0x5f, 0x64, 0x61, 0x79, 0x18, 0x19, 0x20, 0x01,
-	0x28, 0x09, 0x52, 0x0f, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x4f, 0x66, 0x54, 0x68, 0x65,
-	0x44, 0x61, 0x79, 0x12, 0x39, 0x0a, 0x19, 0x65, 0x6e, 0x61, 0x62, 0x6c, 0x65, 0x5f, 0x68, 0x6f,
-	0x73, 0x74, 0x73, 0x5f, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x5f, 0x61, 0x67, 0x65, 0x6e, 0x74,
-	0x18, 0x1a, 0x20, 0x01, 0x28, 0x08, 0x52, 0x16, 0x65, 0x6e, 0x61, 0x62, 0x6c, 0x65, 0x48, 0x6f,
-	0x73, 0x74, 0x73, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x41, 0x67, 0x65, 0x6e, 0x74, 0x12, 0x26,
-	0x0a, 0x0f, 0x63, 0x75, 0x73, 0x74, 0x6f, 0x6d, 0x5f, 0x63, 0x61, 0x5f, 0x63, 0x65, 0x72, 0x74,
-	0x73, 0x18, 0x1b, 0x20, 0x03, 0x28, 0x09, 0x52, 0x0d, 0x63, 0x75, 0x73, 0x74, 0x6f, 0x6d, 0x43,
-	0x61, 0x43, 0x65, 0x72, 0x74, 0x73, 0x12, 0x29, 0x0a, 0x10, 0x70, 0x72, 0x6f, 0x76, 0x69, 0x73,
-	0x69, 0x6f, 0x6e, 0x5f, 0x6f, 0x75, 0x74, 0x70, 0x75, 0x74, 0x18, 0x1c, 0x20, 0x01, 0x28, 0x09,
-	0x52, 0x0f, 0x70, 0x72, 0x6f, 0x76, 0x69, 0x73, 0x69, 0x6f, 0x6e, 0x4f, 0x75, 0x74, 0x70, 0x75,
-	0x74, 0x12, 0x4c, 0x0a, 0x10, 0x77, 0x6f, 0x72, 0x6b, 0x6c, 0x6f, 0x61, 0x64, 0x5f, 0x72, 0x75,
-	0x6e, 0x74, 0x69, 0x6d, 0x65, 0x18, 0x1d, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x21, 0x2e, 0x61, 0x6b,
-	0x73, 0x6e, 0x6f, 0x64, 0x65, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x76, 0x31, 0x2e, 0x57,
-	0x6f, 0x72, 0x6b, 0x6c, 0x6f, 0x61, 0x64, 0x52, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x52, 0x0f,
-	0x77, 0x6f, 0x72, 0x6b, 0x6c, 0x6f, 0x61, 0x64, 0x52, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x12,
-	0x35, 0x0a, 0x17, 0x69, 0x70, 0x76, 0x36, 0x5f, 0x64, 0x75, 0x61, 0x6c, 0x5f, 0x73, 0x74, 0x61,
-	0x63, 0x6b, 0x5f, 0x65, 0x6e, 0x61, 0x62, 0x6c, 0x65, 0x64, 0x18, 0x1e, 0x20, 0x01, 0x28, 0x08,
-	0x52, 0x14, 0x69, 0x70, 0x76, 0x36, 0x44, 0x75, 0x61, 0x6c, 0x53, 0x74, 0x61, 0x63, 0x6b, 0x45,
-	0x6e, 0x61, 0x62, 0x6c, 0x65, 0x64, 0x12, 0x29, 0x0a, 0x10, 0x6f, 0x75, 0x74, 0x62, 0x6f, 0x75,
-	0x6e, 0x64, 0x5f, 0x63, 0x6f, 0x6d, 0x6d, 0x61, 0x6e, 0x64, 0x18, 0x1f, 0x20, 0x01, 0x28, 0x09,
-	0x52, 0x0f, 0x6f, 0x75, 0x74, 0x62, 0x6f, 0x75, 0x6e, 0x64, 0x43, 0x6f, 0x6d, 0x6d, 0x61, 0x6e,
-	0x64, 0x12, 0x41, 0x0a, 0x1d, 0x61, 0x7a, 0x75, 0x72, 0x65, 0x5f, 0x70, 0x72, 0x69, 0x76, 0x61,
-	0x74, 0x65, 0x5f, 0x72, 0x65, 0x67, 0x69, 0x73, 0x74, 0x72, 0x79, 0x5f, 0x73, 0x65, 0x72, 0x76,
-	0x65, 0x72, 0x18, 0x20, 0x20, 0x01, 0x28, 0x09, 0x52, 0x1a, 0x61, 0x7a, 0x75, 0x72, 0x65, 0x50,
-	0x72, 0x69, 0x76, 0x61, 0x74, 0x65, 0x52, 0x65, 0x67, 0x69, 0x73, 0x74, 0x72, 0x79, 0x53, 0x65,
-	0x72, 0x76, 0x65, 0x72, 0x12, 0x3f, 0x0a, 0x1c, 0x70, 0x72, 0x69, 0x76, 0x61, 0x74, 0x65, 0x5f,
-	0x65, 0x67, 0x72, 0x65, 0x73, 0x73, 0x5f, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x5f, 0x61, 0x64, 0x64,
-	0x72, 0x65, 0x73, 0x73, 0x18, 0x21, 0x20, 0x01, 0x28, 0x09, 0x52, 0x19, 0x70, 0x72, 0x69, 0x76,
-	0x61, 0x74, 0x65, 0x45, 0x67, 0x72, 0x65, 0x73, 0x73, 0x50, 0x72, 0x6f, 0x78, 0x79, 0x41, 0x64,
-	0x64, 0x72, 0x65, 0x73, 0x73, 0x12, 0x3a, 0x0a, 0x19, 0x65, 0x6e, 0x61, 0x62, 0x6c, 0x65, 0x5f,
-	0x61, 0x72, 0x74, 0x69, 0x66, 0x61, 0x63, 0x74, 0x5f, 0x73, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x69,
-	0x6e, 0x67, 0x18, 0x22, 0x20, 0x01, 0x28, 0x08, 0x52, 0x17, 0x65, 0x6e, 0x61, 0x62, 0x6c, 0x65,
-	0x41, 0x72, 0x74, 0x69, 0x66, 0x61, 0x63, 0x74, 0x53, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x69, 0x6e,
-	0x67, 0x12, 0x17, 0x0a, 0x07, 0x69, 0x73, 0x5f, 0x6b, 0x61, 0x74, 0x61, 0x18, 0x23, 0x20, 0x01,
-	0x28, 0x08, 0x52, 0x06, 0x69, 0x73, 0x4b, 0x61, 0x74, 0x61, 0x12, 0x2a, 0x0a, 0x0e, 0x6e, 0x65,
-	0x65, 0x64, 0x73, 0x5f, 0x63, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x76, 0x32, 0x18, 0x24, 0x20, 0x01,
-	0x28, 0x08, 0x48, 0x02, 0x52, 0x0d, 0x6e, 0x65, 0x65, 0x64, 0x73, 0x43, 0x67, 0x72, 0x6f, 0x75,
-	0x70, 0x76, 0x32, 0x88, 0x01, 0x01, 0x12, 0x2e, 0x0a, 0x13, 0x64, 0x69, 0x73, 0x61, 0x62, 0x6c,
-	0x65, 0x5f, 0x63, 0x75, 0x73, 0x74, 0x6f, 0x6d, 0x5f, 0x64, 0x61, 0x74, 0x61, 0x18, 0x25, 0x20,
-	0x01, 0x28, 0x08, 0x52, 0x11, 0x64, 0x69, 0x73, 0x61, 0x62, 0x6c, 0x65, 0x43, 0x75, 0x73, 0x74,
-	0x6f, 0x6d, 0x44, 0x61, 0x74, 0x61, 0x12, 0x5c, 0x0a, 0x2b, 0x62, 0x6f, 0x6f, 0x74, 0x73, 0x74,
-	0x72, 0x61, 0x70, 0x5f, 0x70, 0x72, 0x6f, 0x66, 0x69, 0x6c, 0x65, 0x5f, 0x63, 0x6f, 0x6e, 0x74,
-	0x61, 0x69, 0x6e, 0x65, 0x72, 0x5f, 0x72, 0x65, 0x67, 0x69, 0x73, 0x74, 0x72, 0x79, 0x5f, 0x73,
-	0x65, 0x72, 0x76, 0x65, 0x72, 0x18, 0x26, 0x20, 0x01, 0x28, 0x09, 0x52, 0x27, 0x62, 0x6f, 0x6f,
-	0x74, 0x73, 0x74, 0x72, 0x61, 0x70, 0x50, 0x72, 0x6f, 0x66, 0x69, 0x6c, 0x65, 0x43, 0x6f, 0x6e,
-	0x74, 0x61, 0x69, 0x6e, 0x65, 0x72, 0x52, 0x65, 0x67, 0x69, 0x73, 0x74, 0x72, 0x79, 0x53, 0x65,
-	0x72, 0x76, 0x65, 0x72, 0x12, 0x5f, 0x0a, 0x17, 0x69, 0x6d, 0x64, 0x73, 0x5f, 0x72, 0x65, 0x73,
-	0x74, 0x72, 0x69, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x18,
-	0x27, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x27, 0x2e, 0x61, 0x6b, 0x73, 0x6e, 0x6f, 0x64, 0x65, 0x63,
-	0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x76, 0x31, 0x2e, 0x49, 0x6d, 0x64, 0x73, 0x52, 0x65, 0x73,
-	0x74, 0x72, 0x69, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x52, 0x15,
-	0x69, 0x6d, 0x64, 0x73, 0x52, 0x65, 0x73, 0x74, 0x72, 0x69, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x43,
-	0x6f, 0x6e, 0x66, 0x69, 0x67, 0x42, 0x09, 0x0a, 0x07, 0x5f, 0x69, 0x73, 0x5f, 0x76, 0x68, 0x64,
-	0x42, 0x0d, 0x0a, 0x0b, 0x5f, 0x65, 0x6e, 0x61, 0x62, 0x6c, 0x65, 0x5f, 0x73, 0x73, 0x68, 0x42,
-	0x11, 0x0a, 0x0f, 0x5f, 0x6e, 0x65, 0x65, 0x64, 0x73, 0x5f, 0x63, 0x67, 0x72, 0x6f, 0x75, 0x70,
-	0x76, 0x32, 0x2a, 0x77, 0x0a, 0x0f, 0x57, 0x6f, 0x72, 0x6b, 0x6c, 0x6f, 0x61, 0x64, 0x52, 0x75,
-	0x6e, 0x74, 0x69, 0x6d, 0x65, 0x12, 0x20, 0x0a, 0x1c, 0x57, 0x4f, 0x52, 0x4b, 0x4c, 0x4f, 0x41,
-	0x44, 0x5f, 0x52, 0x55, 0x4e, 0x54, 0x49, 0x4d, 0x45, 0x5f, 0x55, 0x4e, 0x53, 0x50, 0x45, 0x43,
-	0x49, 0x46, 0x49, 0x45, 0x44, 0x10, 0x00, 0x12, 0x22, 0x0a, 0x1e, 0x57, 0x4f, 0x52, 0x4b, 0x4c,
-	0x4f, 0x41, 0x44, 0x5f, 0x52, 0x55, 0x4e, 0x54, 0x49, 0x4d, 0x45, 0x5f, 0x4f, 0x43, 0x49, 0x5f,
-	0x43, 0x4f, 0x4e, 0x54, 0x41, 0x49, 0x4e, 0x45, 0x52, 0x10, 0x01, 0x12, 0x1e, 0x0a, 0x1a, 0x57,
-	0x4f, 0x52, 0x4b, 0x4c, 0x4f, 0x41, 0x44, 0x5f, 0x52, 0x55, 0x4e, 0x54, 0x49, 0x4d, 0x45, 0x5f,
-	0x57, 0x41, 0x53, 0x4d, 0x5f, 0x57, 0x41, 0x53, 0x49, 0x10, 0x02, 0x42, 0xde, 0x01, 0x0a, 0x14,
-	0x63, 0x6f, 0x6d, 0x2e, 0x61, 0x6b, 0x73, 0x6e, 0x6f, 0x64, 0x65, 0x63, 0x6f, 0x6e, 0x66, 0x69,
-	0x67, 0x2e, 0x76, 0x31, 0x42, 0x0b, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x50, 0x72, 0x6f, 0x74,
-	0x6f, 0x50, 0x01, 0x5a, 0x58, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f,
-	0x61, 0x7a, 0x75, 0x72, 0x65, 0x2f, 0x61, 0x67, 0x65, 0x6e, 0x74, 0x42, 0x61, 0x6b, 0x65, 0x72,
-	0x2f, 0x61, 0x6b, 0x73, 0x2d, 0x6e, 0x6f, 0x64, 0x65, 0x2d, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f,
-	0x6c, 0x6c, 0x65, 0x72, 0x2f, 0x70, 0x6b, 0x67, 0x2f, 0x67, 0x65, 0x6e, 0x2f, 0x61, 0x6b, 0x73,
-	0x6e, 0x6f, 0x64, 0x65, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2f, 0x76, 0x31, 0x3b, 0x61, 0x6b,
-	0x73, 0x6e, 0x6f, 0x64, 0x65, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x76, 0x31, 0xa2, 0x02, 0x03,
-	0x41, 0x58, 0x58, 0xaa, 0x02, 0x10, 0x41, 0x6b, 0x73, 0x6e, 0x6f, 0x64, 0x65, 0x63, 0x6f, 0x6e,
-	0x66, 0x69, 0x67, 0x2e, 0x56, 0x31, 0xca, 0x02, 0x10, 0x41, 0x6b, 0x73, 0x6e, 0x6f, 0x64, 0x65,
-	0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x5c, 0x56, 0x31, 0xe2, 0x02, 0x1c, 0x41, 0x6b, 0x73, 0x6e,
-	0x6f, 0x64, 0x65, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x5c, 0x56, 0x31, 0x5c, 0x47, 0x50, 0x42,
-	0x4d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0xea, 0x02, 0x11, 0x41, 0x6b, 0x73, 0x6e, 0x6f,
-	0x64, 0x65, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x3a, 0x3a, 0x56, 0x31, 0x62, 0x06, 0x70, 0x72,
-	0x6f, 0x74, 0x6f, 0x33,
+	0x2e, 0x57, 0x6f, 0x72, 0x6b, 0x6c, 0x6f, 0x61, 0x64, 0x52, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65,
+	0x52, 0x0f, 0x77, 0x6f, 0x72, 0x6b, 0x6c, 0x6f, 0x61, 0x64, 0x52, 0x75, 0x6e, 0x74, 0x69, 0x6d,
+	0x65, 0x12, 0x35, 0x0a, 0x17, 0x69, 0x70, 0x76, 0x36, 0x5f, 0x64, 0x75, 0x61, 0x6c, 0x5f, 0x73,
+	0x74, 0x61, 0x63, 0x6b, 0x5f, 0x65, 0x6e, 0x61, 0x62, 0x6c, 0x65, 0x64, 0x18, 0x1e, 0x20, 0x01,
+	0x28, 0x08, 0x52, 0x14, 0x69, 0x70, 0x76, 0x36, 0x44, 0x75, 0x61, 0x6c, 0x53, 0x74, 0x61, 0x63,
+	0x6b, 0x45, 0x6e, 0x61, 0x62, 0x6c, 0x65, 0x64, 0x12, 0x29, 0x0a, 0x10, 0x6f, 0x75, 0x74, 0x62,
+	0x6f, 0x75, 0x6e, 0x64, 0x5f, 0x63, 0x6f, 0x6d, 0x6d, 0x61, 0x6e, 0x64, 0x18, 0x1f, 0x20, 0x01,
+	0x28, 0x09, 0x52, 0x0f, 0x6f, 0x75, 0x74, 0x62, 0x6f, 0x75, 0x6e, 0x64, 0x43, 0x6f, 0x6d, 0x6d,
+	0x61, 0x6e, 0x64, 0x12, 0x41, 0x0a, 0x1d, 0x61, 0x7a, 0x75, 0x72, 0x65, 0x5f, 0x70, 0x72, 0x69,
+	0x76, 0x61, 0x74, 0x65, 0x5f, 0x72, 0x65, 0x67, 0x69, 0x73, 0x74, 0x72, 0x79, 0x5f, 0x73, 0x65,
+	0x72, 0x76, 0x65, 0x72, 0x18, 0x20, 0x20, 0x01, 0x28, 0x09, 0x52, 0x1a, 0x61, 0x7a, 0x75, 0x72,
+	0x65, 0x50, 0x72, 0x69, 0x76, 0x61, 0x74, 0x65, 0x52, 0x65, 0x67, 0x69, 0x73, 0x74, 0x72, 0x79,
+	0x53, 0x65, 0x72, 0x76, 0x65, 0x72, 0x12, 0x3f, 0x0a, 0x1c, 0x70, 0x72, 0x69, 0x76, 0x61, 0x74,
+	0x65, 0x5f, 0x65, 0x67, 0x72, 0x65, 0x73, 0x73, 0x5f, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x5f, 0x61,
+	0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x18, 0x21, 0x20, 0x01, 0x28, 0x09, 0x52, 0x19, 0x70, 0x72,
+	0x69, 0x76, 0x61, 0x74, 0x65, 0x45, 0x67, 0x72, 0x65, 0x73, 0x73, 0x50, 0x72, 0x6f, 0x78, 0x79,
+	0x41, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x12, 0x3a, 0x0a, 0x19, 0x65, 0x6e, 0x61, 0x62, 0x6c,
+	0x65, 0x5f, 0x61, 0x72, 0x74, 0x69, 0x66, 0x61, 0x63, 0x74, 0x5f, 0x73, 0x74, 0x72, 0x65, 0x61,
+	0x6d, 0x69, 0x6e, 0x67, 0x18, 0x22, 0x20, 0x01, 0x28, 0x08, 0x52, 0x17, 0x65, 0x6e, 0x61, 0x62,
+	0x6c, 0x65, 0x41, 0x72, 0x74, 0x69, 0x66, 0x61, 0x63, 0x74, 0x53, 0x74, 0x72, 0x65, 0x61, 0x6d,
+	0x69, 0x6e, 0x67, 0x12, 0x17, 0x0a, 0x07, 0x69, 0x73, 0x5f, 0x6b, 0x61, 0x74, 0x61, 0x18, 0x23,
+	0x20, 0x01, 0x28, 0x08, 0x52, 0x06, 0x69, 0x73, 0x4b, 0x61, 0x74, 0x61, 0x12, 0x2a, 0x0a, 0x0e,
+	0x6e, 0x65, 0x65, 0x64, 0x73, 0x5f, 0x63, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x76, 0x32, 0x18, 0x24,
+	0x20, 0x01, 0x28, 0x08, 0x48, 0x02, 0x52, 0x0d, 0x6e, 0x65, 0x65, 0x64, 0x73, 0x43, 0x67, 0x72,
+	0x6f, 0x75, 0x70, 0x76, 0x32, 0x88, 0x01, 0x01, 0x12, 0x2e, 0x0a, 0x13, 0x64, 0x69, 0x73, 0x61,
+	0x62, 0x6c, 0x65, 0x5f, 0x63, 0x75, 0x73, 0x74, 0x6f, 0x6d, 0x5f, 0x64, 0x61, 0x74, 0x61, 0x18,
+	0x25, 0x20, 0x01, 0x28, 0x08, 0x52, 0x11, 0x64, 0x69, 0x73, 0x61, 0x62, 0x6c, 0x65, 0x43, 0x75,
+	0x73, 0x74, 0x6f, 0x6d, 0x44, 0x61, 0x74, 0x61, 0x12, 0x5c, 0x0a, 0x2b, 0x62, 0x6f, 0x6f, 0x74,
+	0x73, 0x74, 0x72, 0x61, 0x70, 0x5f, 0x70, 0x72, 0x6f, 0x66, 0x69, 0x6c, 0x65, 0x5f, 0x63, 0x6f,
+	0x6e, 0x74, 0x61, 0x69, 0x6e, 0x65, 0x72, 0x5f, 0x72, 0x65, 0x67, 0x69, 0x73, 0x74, 0x72, 0x79,
+	0x5f, 0x73, 0x65, 0x72, 0x76, 0x65, 0x72, 0x18, 0x26, 0x20, 0x01, 0x28, 0x09, 0x52, 0x27, 0x62,
+	0x6f, 0x6f, 0x74, 0x73, 0x74, 0x72, 0x61, 0x70, 0x50, 0x72, 0x6f, 0x66, 0x69, 0x6c, 0x65, 0x43,
+	0x6f, 0x6e, 0x74, 0x61, 0x69, 0x6e, 0x65, 0x72, 0x52, 0x65, 0x67, 0x69, 0x73, 0x74, 0x72, 0x79,
+	0x53, 0x65, 0x72, 0x76, 0x65, 0x72, 0x12, 0x5f, 0x0a, 0x17, 0x69, 0x6d, 0x64, 0x73, 0x5f, 0x72,
+	0x65, 0x73, 0x74, 0x72, 0x69, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x63, 0x6f, 0x6e, 0x66, 0x69,
+	0x67, 0x18, 0x27, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x27, 0x2e, 0x61, 0x6b, 0x73, 0x6e, 0x6f, 0x64,
+	0x65, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x76, 0x31, 0x2e, 0x49, 0x6d, 0x64, 0x73, 0x52,
+	0x65, 0x73, 0x74, 0x72, 0x69, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67,
+	0x52, 0x15, 0x69, 0x6d, 0x64, 0x73, 0x52, 0x65, 0x73, 0x74, 0x72, 0x69, 0x63, 0x74, 0x69, 0x6f,
+	0x6e, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x42, 0x09, 0x0a, 0x07, 0x5f, 0x69, 0x73, 0x5f, 0x76,
+	0x68, 0x64, 0x42, 0x0d, 0x0a, 0x0b, 0x5f, 0x65, 0x6e, 0x61, 0x62, 0x6c, 0x65, 0x5f, 0x73, 0x73,
+	0x68, 0x42, 0x11, 0x0a, 0x0f, 0x5f, 0x6e, 0x65, 0x65, 0x64, 0x73, 0x5f, 0x63, 0x67, 0x72, 0x6f,
+	0x75, 0x70, 0x76, 0x32, 0x2a, 0x77, 0x0a, 0x0f, 0x57, 0x6f, 0x72, 0x6b, 0x6c, 0x6f, 0x61, 0x64,
+	0x52, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x12, 0x20, 0x0a, 0x1c, 0x57, 0x4f, 0x52, 0x4b, 0x4c,
+	0x4f, 0x41, 0x44, 0x5f, 0x52, 0x55, 0x4e, 0x54, 0x49, 0x4d, 0x45, 0x5f, 0x55, 0x4e, 0x53, 0x50,
+	0x45, 0x43, 0x49, 0x46, 0x49, 0x45, 0x44, 0x10, 0x00, 0x12, 0x22, 0x0a, 0x1e, 0x57, 0x4f, 0x52,
+	0x4b, 0x4c, 0x4f, 0x41, 0x44, 0x5f, 0x52, 0x55, 0x4e, 0x54, 0x49, 0x4d, 0x45, 0x5f, 0x4f, 0x43,
+	0x49, 0x5f, 0x43, 0x4f, 0x4e, 0x54, 0x41, 0x49, 0x4e, 0x45, 0x52, 0x10, 0x01, 0x12, 0x1e, 0x0a,
+	0x1a, 0x57, 0x4f, 0x52, 0x4b, 0x4c, 0x4f, 0x41, 0x44, 0x5f, 0x52, 0x55, 0x4e, 0x54, 0x49, 0x4d,
+	0x45, 0x5f, 0x57, 0x41, 0x53, 0x4d, 0x5f, 0x57, 0x41, 0x53, 0x49, 0x10, 0x02, 0x42, 0xde, 0x01,
+	0x0a, 0x14, 0x63, 0x6f, 0x6d, 0x2e, 0x61, 0x6b, 0x73, 0x6e, 0x6f, 0x64, 0x65, 0x63, 0x6f, 0x6e,
+	0x66, 0x69, 0x67, 0x2e, 0x76, 0x31, 0x42, 0x0b, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x50, 0x72,
+	0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x58, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f,
+	0x6d, 0x2f, 0x61, 0x7a, 0x75, 0x72, 0x65, 0x2f, 0x61, 0x67, 0x65, 0x6e, 0x74, 0x42, 0x61, 0x6b,
+	0x65, 0x72, 0x2f, 0x61, 0x6b, 0x73, 0x2d, 0x6e, 0x6f, 0x64, 0x65, 0x2d, 0x63, 0x6f, 0x6e, 0x74,
+	0x72, 0x6f, 0x6c, 0x6c, 0x65, 0x72, 0x2f, 0x70, 0x6b, 0x67, 0x2f, 0x67, 0x65, 0x6e, 0x2f, 0x61,
+	0x6b, 0x73, 0x6e, 0x6f, 0x64, 0x65, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2f, 0x76, 0x31, 0x3b,
+	0x61, 0x6b, 0x73, 0x6e, 0x6f, 0x64, 0x65, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x76, 0x31, 0xa2,
+	0x02, 0x03, 0x41, 0x58, 0x58, 0xaa, 0x02, 0x10, 0x41, 0x6b, 0x73, 0x6e, 0x6f, 0x64, 0x65, 0x63,
+	0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x56, 0x31, 0xca, 0x02, 0x10, 0x41, 0x6b, 0x73, 0x6e, 0x6f,
+	0x64, 0x65, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x5c, 0x56, 0x31, 0xe2, 0x02, 0x1c, 0x41, 0x6b,
+	0x73, 0x6e, 0x6f, 0x64, 0x65, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x5c, 0x56, 0x31, 0x5c, 0x47,
+	0x50, 0x42, 0x4d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0xea, 0x02, 0x11, 0x41, 0x6b, 0x73,
+	0x6e, 0x6f, 0x64, 0x65, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x3a, 0x3a, 0x56, 0x31, 0x62, 0x06,
+	0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (
@@ -711,7 +710,7 @@ var file_aksnodeconfig_v1_config_proto_goTypes = []any{
 	(*CustomCloudConfig)(nil),        // 3: aksnodeconfig.v1.CustomCloudConfig
 	(*ApiServerConfig)(nil),          // 4: aksnodeconfig.v1.ApiServerConfig
 	(*ClusterConfig)(nil),            // 5: aksnodeconfig.v1.ClusterConfig
-	(*TlsBootstrappingConfig)(nil),   // 6: aksnodeconfig.v1.TlsBootstrappingConfig
+	(*BootstrappingConfig)(nil),      // 6: aksnodeconfig.v1.BootstrappingConfig
 	(*AuthConfig)(nil),               // 7: aksnodeconfig.v1.AuthConfig
 	(*RuncConfig)(nil),               // 8: aksnodeconfig.v1.RuncConfig
 	(*ContainerdConfig)(nil),         // 9: aksnodeconfig.v1.ContainerdConfig
@@ -729,7 +728,7 @@ var file_aksnodeconfig_v1_config_proto_depIdxs = []int32{
 	3,  // 1: aksnodeconfig.v1.Configuration.custom_cloud_config:type_name -> aksnodeconfig.v1.CustomCloudConfig
 	4,  // 2: aksnodeconfig.v1.Configuration.api_server_config:type_name -> aksnodeconfig.v1.ApiServerConfig
 	5,  // 3: aksnodeconfig.v1.Configuration.cluster_config:type_name -> aksnodeconfig.v1.ClusterConfig
-	6,  // 4: aksnodeconfig.v1.Configuration.tls_bootstrapping_config:type_name -> aksnodeconfig.v1.TlsBootstrappingConfig
+	6,  // 4: aksnodeconfig.v1.Configuration.bootstrapping_config:type_name -> aksnodeconfig.v1.BootstrappingConfig
 	7,  // 5: aksnodeconfig.v1.Configuration.auth_config:type_name -> aksnodeconfig.v1.AuthConfig
 	8,  // 6: aksnodeconfig.v1.Configuration.runc_config:type_name -> aksnodeconfig.v1.RuncConfig
 	9,  // 7: aksnodeconfig.v1.Configuration.containerd_config:type_name -> aksnodeconfig.v1.ContainerdConfig
@@ -756,6 +755,7 @@ func file_aksnodeconfig_v1_config_proto_init() {
 	}
 	file_aksnodeconfig_v1_api_server_config_proto_init()
 	file_aksnodeconfig_v1_auth_config_proto_init()
+	file_aksnodeconfig_v1_bootstrapping_config_proto_init()
 	file_aksnodeconfig_v1_cluster_config_proto_init()
 	file_aksnodeconfig_v1_containerd_config_proto_init()
 	file_aksnodeconfig_v1_custom_cloud_config_proto_init()
@@ -769,7 +769,6 @@ func file_aksnodeconfig_v1_config_proto_init() {
 	file_aksnodeconfig_v1_network_config_proto_init()
 	file_aksnodeconfig_v1_runc_config_proto_init()
 	file_aksnodeconfig_v1_teleport_config_proto_init()
-	file_aksnodeconfig_v1_tls_bootstrapping_config_proto_init()
 	file_aksnodeconfig_v1_config_proto_msgTypes[0].OneofWrappers = []any{}
 	type x struct{}
 	out := protoimpl.TypeBuilder{
diff --git a/aks-node-controller/pkg/gen/aksnodeconfig/v1/tls_bootstrapping_config.pb.go b/aks-node-controller/pkg/gen/aksnodeconfig/v1/tls_bootstrapping_config.pb.go
deleted file mode 100644
index dd764018f9a..00000000000
--- a/aks-node-controller/pkg/gen/aksnodeconfig/v1/tls_bootstrapping_config.pb.go
+++ /dev/null
@@ -1,179 +0,0 @@
-// Code generated by protoc-gen-go. DO NOT EDIT.
-// versions:
-// 	protoc-gen-go v1.35.2
-// 	protoc        (unknown)
-// source: aksnodeconfig/v1/tls_bootstrapping_config.proto
-
-package aksnodeconfigv1
-
-import (
-	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
-	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
-	reflect "reflect"
-	sync "sync"
-)
-
-const (
-	// Verify that this generated code is sufficiently up-to-date.
-	_ = protoimpl.EnforceVersion(20 - protoimpl.MinVersion)
-	// Verify that runtime/protoimpl is sufficiently up-to-date.
-	_ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20)
-)
-
-type TlsBootstrappingConfig struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	// Enable secure TLS bootstrapping for the node.
-	EnableSecureTlsBootstrapping *bool `protobuf:"varint,1,opt,name=enable_secure_tls_bootstrapping,json=enableSecureTlsBootstrapping,proto3,oneof" json:"enable_secure_tls_bootstrapping,omitempty"`
-	// Only required until Secure TLS bootstrapping in place. Would use kubelet identity after that.
-	TlsBootstrappingToken string `protobuf:"bytes,2,opt,name=tls_bootstrapping_token,json=tlsBootstrappingToken,proto3" json:"tls_bootstrapping_token,omitempty"`
-	// Only used when secure TLS bootstrapping is enabled. This is the appserver appid that the node will use to bootstrap.
-	CustomSecureTlsBootstrappingAppserverAppid string `protobuf:"bytes,3,opt,name=custom_secure_tls_bootstrapping_appserver_appid,json=customSecureTlsBootstrappingAppserverAppid,proto3" json:"custom_secure_tls_bootstrapping_appserver_appid,omitempty"`
-}
-
-func (x *TlsBootstrappingConfig) Reset() {
-	*x = TlsBootstrappingConfig{}
-	mi := &file_aksnodeconfig_v1_tls_bootstrapping_config_proto_msgTypes[0]
-	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-	ms.StoreMessageInfo(mi)
-}
-
-func (x *TlsBootstrappingConfig) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*TlsBootstrappingConfig) ProtoMessage() {}
-
-func (x *TlsBootstrappingConfig) ProtoReflect() protoreflect.Message {
-	mi := &file_aksnodeconfig_v1_tls_bootstrapping_config_proto_msgTypes[0]
-	if x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use TlsBootstrappingConfig.ProtoReflect.Descriptor instead.
-func (*TlsBootstrappingConfig) Descriptor() ([]byte, []int) {
-	return file_aksnodeconfig_v1_tls_bootstrapping_config_proto_rawDescGZIP(), []int{0}
-}
-
-func (x *TlsBootstrappingConfig) GetEnableSecureTlsBootstrapping() bool {
-	if x != nil && x.EnableSecureTlsBootstrapping != nil {
-		return *x.EnableSecureTlsBootstrapping
-	}
-	return false
-}
-
-func (x *TlsBootstrappingConfig) GetTlsBootstrappingToken() string {
-	if x != nil {
-		return x.TlsBootstrappingToken
-	}
-	return ""
-}
-
-func (x *TlsBootstrappingConfig) GetCustomSecureTlsBootstrappingAppserverAppid() string {
-	if x != nil {
-		return x.CustomSecureTlsBootstrappingAppserverAppid
-	}
-	return ""
-}
-
-var File_aksnodeconfig_v1_tls_bootstrapping_config_proto protoreflect.FileDescriptor
-
-var file_aksnodeconfig_v1_tls_bootstrapping_config_proto_rawDesc = []byte{
-	0x0a, 0x2f, 0x61, 0x6b, 0x73, 0x6e, 0x6f, 0x64, 0x65, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2f,
-	0x76, 0x31, 0x2f, 0x74, 0x6c, 0x73, 0x5f, 0x62, 0x6f, 0x6f, 0x74, 0x73, 0x74, 0x72, 0x61, 0x70,
-	0x70, 0x69, 0x6e, 0x67, 0x5f, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x70, 0x72, 0x6f, 0x74,
-	0x6f, 0x12, 0x10, 0x61, 0x6b, 0x73, 0x6e, 0x6f, 0x64, 0x65, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67,
-	0x2e, 0x76, 0x31, 0x22, 0xa5, 0x02, 0x0a, 0x16, 0x54, 0x6c, 0x73, 0x42, 0x6f, 0x6f, 0x74, 0x73,
-	0x74, 0x72, 0x61, 0x70, 0x70, 0x69, 0x6e, 0x67, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x12, 0x4a,
-	0x0a, 0x1f, 0x65, 0x6e, 0x61, 0x62, 0x6c, 0x65, 0x5f, 0x73, 0x65, 0x63, 0x75, 0x72, 0x65, 0x5f,
-	0x74, 0x6c, 0x73, 0x5f, 0x62, 0x6f, 0x6f, 0x74, 0x73, 0x74, 0x72, 0x61, 0x70, 0x70, 0x69, 0x6e,
-	0x67, 0x18, 0x01, 0x20, 0x01, 0x28, 0x08, 0x48, 0x00, 0x52, 0x1c, 0x65, 0x6e, 0x61, 0x62, 0x6c,
-	0x65, 0x53, 0x65, 0x63, 0x75, 0x72, 0x65, 0x54, 0x6c, 0x73, 0x42, 0x6f, 0x6f, 0x74, 0x73, 0x74,
-	0x72, 0x61, 0x70, 0x70, 0x69, 0x6e, 0x67, 0x88, 0x01, 0x01, 0x12, 0x36, 0x0a, 0x17, 0x74, 0x6c,
-	0x73, 0x5f, 0x62, 0x6f, 0x6f, 0x74, 0x73, 0x74, 0x72, 0x61, 0x70, 0x70, 0x69, 0x6e, 0x67, 0x5f,
-	0x74, 0x6f, 0x6b, 0x65, 0x6e, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x15, 0x74, 0x6c, 0x73,
-	0x42, 0x6f, 0x6f, 0x74, 0x73, 0x74, 0x72, 0x61, 0x70, 0x70, 0x69, 0x6e, 0x67, 0x54, 0x6f, 0x6b,
-	0x65, 0x6e, 0x12, 0x63, 0x0a, 0x2f, 0x63, 0x75, 0x73, 0x74, 0x6f, 0x6d, 0x5f, 0x73, 0x65, 0x63,
-	0x75, 0x72, 0x65, 0x5f, 0x74, 0x6c, 0x73, 0x5f, 0x62, 0x6f, 0x6f, 0x74, 0x73, 0x74, 0x72, 0x61,
-	0x70, 0x70, 0x69, 0x6e, 0x67, 0x5f, 0x61, 0x70, 0x70, 0x73, 0x65, 0x72, 0x76, 0x65, 0x72, 0x5f,
-	0x61, 0x70, 0x70, 0x69, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x2a, 0x63, 0x75, 0x73,
-	0x74, 0x6f, 0x6d, 0x53, 0x65, 0x63, 0x75, 0x72, 0x65, 0x54, 0x6c, 0x73, 0x42, 0x6f, 0x6f, 0x74,
-	0x73, 0x74, 0x72, 0x61, 0x70, 0x70, 0x69, 0x6e, 0x67, 0x41, 0x70, 0x70, 0x73, 0x65, 0x72, 0x76,
-	0x65, 0x72, 0x41, 0x70, 0x70, 0x69, 0x64, 0x42, 0x22, 0x0a, 0x20, 0x5f, 0x65, 0x6e, 0x61, 0x62,
-	0x6c, 0x65, 0x5f, 0x73, 0x65, 0x63, 0x75, 0x72, 0x65, 0x5f, 0x74, 0x6c, 0x73, 0x5f, 0x62, 0x6f,
-	0x6f, 0x74, 0x73, 0x74, 0x72, 0x61, 0x70, 0x70, 0x69, 0x6e, 0x67, 0x42, 0xee, 0x01, 0x0a, 0x14,
-	0x63, 0x6f, 0x6d, 0x2e, 0x61, 0x6b, 0x73, 0x6e, 0x6f, 0x64, 0x65, 0x63, 0x6f, 0x6e, 0x66, 0x69,
-	0x67, 0x2e, 0x76, 0x31, 0x42, 0x1b, 0x54, 0x6c, 0x73, 0x42, 0x6f, 0x6f, 0x74, 0x73, 0x74, 0x72,
-	0x61, 0x70, 0x70, 0x69, 0x6e, 0x67, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x50, 0x72, 0x6f, 0x74,
-	0x6f, 0x50, 0x01, 0x5a, 0x58, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f,
-	0x61, 0x7a, 0x75, 0x72, 0x65, 0x2f, 0x61, 0x67, 0x65, 0x6e, 0x74, 0x42, 0x61, 0x6b, 0x65, 0x72,
-	0x2f, 0x61, 0x6b, 0x73, 0x2d, 0x6e, 0x6f, 0x64, 0x65, 0x2d, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f,
-	0x6c, 0x6c, 0x65, 0x72, 0x2f, 0x70, 0x6b, 0x67, 0x2f, 0x67, 0x65, 0x6e, 0x2f, 0x61, 0x6b, 0x73,
-	0x6e, 0x6f, 0x64, 0x65, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2f, 0x76, 0x31, 0x3b, 0x61, 0x6b,
-	0x73, 0x6e, 0x6f, 0x64, 0x65, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x76, 0x31, 0xa2, 0x02, 0x03,
-	0x41, 0x58, 0x58, 0xaa, 0x02, 0x10, 0x41, 0x6b, 0x73, 0x6e, 0x6f, 0x64, 0x65, 0x63, 0x6f, 0x6e,
-	0x66, 0x69, 0x67, 0x2e, 0x56, 0x31, 0xca, 0x02, 0x10, 0x41, 0x6b, 0x73, 0x6e, 0x6f, 0x64, 0x65,
-	0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x5c, 0x56, 0x31, 0xe2, 0x02, 0x1c, 0x41, 0x6b, 0x73, 0x6e,
-	0x6f, 0x64, 0x65, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x5c, 0x56, 0x31, 0x5c, 0x47, 0x50, 0x42,
-	0x4d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0xea, 0x02, 0x11, 0x41, 0x6b, 0x73, 0x6e, 0x6f,
-	0x64, 0x65, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x3a, 0x3a, 0x56, 0x31, 0x62, 0x06, 0x70, 0x72,
-	0x6f, 0x74, 0x6f, 0x33,
-}
-
-var (
-	file_aksnodeconfig_v1_tls_bootstrapping_config_proto_rawDescOnce sync.Once
-	file_aksnodeconfig_v1_tls_bootstrapping_config_proto_rawDescData = file_aksnodeconfig_v1_tls_bootstrapping_config_proto_rawDesc
-)
-
-func file_aksnodeconfig_v1_tls_bootstrapping_config_proto_rawDescGZIP() []byte {
-	file_aksnodeconfig_v1_tls_bootstrapping_config_proto_rawDescOnce.Do(func() {
-		file_aksnodeconfig_v1_tls_bootstrapping_config_proto_rawDescData = protoimpl.X.CompressGZIP(file_aksnodeconfig_v1_tls_bootstrapping_config_proto_rawDescData)
-	})
-	return file_aksnodeconfig_v1_tls_bootstrapping_config_proto_rawDescData
-}
-
-var file_aksnodeconfig_v1_tls_bootstrapping_config_proto_msgTypes = make([]protoimpl.MessageInfo, 1)
-var file_aksnodeconfig_v1_tls_bootstrapping_config_proto_goTypes = []any{
-	(*TlsBootstrappingConfig)(nil), // 0: aksnodeconfig.v1.TlsBootstrappingConfig
-}
-var file_aksnodeconfig_v1_tls_bootstrapping_config_proto_depIdxs = []int32{
-	0, // [0:0] is the sub-list for method output_type
-	0, // [0:0] is the sub-list for method input_type
-	0, // [0:0] is the sub-list for extension type_name
-	0, // [0:0] is the sub-list for extension extendee
-	0, // [0:0] is the sub-list for field type_name
-}
-
-func init() { file_aksnodeconfig_v1_tls_bootstrapping_config_proto_init() }
-func file_aksnodeconfig_v1_tls_bootstrapping_config_proto_init() {
-	if File_aksnodeconfig_v1_tls_bootstrapping_config_proto != nil {
-		return
-	}
-	file_aksnodeconfig_v1_tls_bootstrapping_config_proto_msgTypes[0].OneofWrappers = []any{}
-	type x struct{}
-	out := protoimpl.TypeBuilder{
-		File: protoimpl.DescBuilder{
-			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
-			RawDescriptor: file_aksnodeconfig_v1_tls_bootstrapping_config_proto_rawDesc,
-			NumEnums:      0,
-			NumMessages:   1,
-			NumExtensions: 0,
-			NumServices:   0,
-		},
-		GoTypes:           file_aksnodeconfig_v1_tls_bootstrapping_config_proto_goTypes,
-		DependencyIndexes: file_aksnodeconfig_v1_tls_bootstrapping_config_proto_depIdxs,
-		MessageInfos:      file_aksnodeconfig_v1_tls_bootstrapping_config_proto_msgTypes,
-	}.Build()
-	File_aksnodeconfig_v1_tls_bootstrapping_config_proto = out.File
-	file_aksnodeconfig_v1_tls_bootstrapping_config_proto_rawDesc = nil
-	file_aksnodeconfig_v1_tls_bootstrapping_config_proto_goTypes = nil
-	file_aksnodeconfig_v1_tls_bootstrapping_config_proto_depIdxs = nil
-}
diff --git a/aks-node-controller/proto/README.md b/aks-node-controller/proto/README.md
index 991791027d7..c6be885d46b 100644
--- a/aks-node-controller/proto/README.md
+++ b/aks-node-controller/proto/README.md
@@ -7,48 +7,48 @@ make compile-proto-files
 # Public data contract `AKSNodeConfig`
 This table is describing the all the AKSNodeConfig Fields converted to .go files. The naming convention is a bit different in the .proto files. For example, in _config.proto_ file, you will see `api_server_config`, but in _config.pb.go_, it's automatically renamed to `ApiServerConfig`. In the following table, we will use the names defined in the .go files.
 
-| AKSNodeConfig Fields | Types | Descriptions | OLD CSE env variables mapping |
-|------------|------------|--------------|-------------------------------|
-| `Version` | `string` | Semantic version of this AKSNodeConfig | N/A, new |
-| `KubeBinaryConfig` | `KubeBinaryConfig` | Kubernetes binary URL configuration | `KUBE_BINARY_URL`, `CUSTOM_KUBE_BINARY_URL`, `PRIVATE_KUBE_BINARY_URL` , `CREDENTIAL_PROVIDER_DOWNLOAD_URL` |
-| `CustomCloudConfig` | `CustomCloudConfig` | Custom cloud configuration | `IS_CUSTOM_CLOUD`, `AKS_CUSTOM_CLOUD_CONTAINER_REGISTRY_DNS_SUFFIX`, `REPO_DEPOT_ENDPOINT`, `CUSTOM_ENV_JSON` |
-| `ApiServerConfig` | `ApiServerConfig` | Kubernetes API server configuration | `APISERVER_PUBLIC_KEY`, `API_SERVER_NAME` |
-| `ClusterConfig` | `ClusterConfig` | Various Kubernetes cluster level configuration | `RESOURCE_GROUP`, `LOCATION`, `VM_TYPE`, `PRIMARY_AVAILABILITY_SET`, `PRIMARY_SCALE_SET`, `USE_INSTANCE_METADATA` |
-| -`ClusterNetworkConfig` | `ClusterNetworkConfig` | Cluster network config. We assumed network mode is always "transparent" now so it's removed from the contract. | `VIRTUAL_NETWORK`, `VIRTUAL_NETWORK_RESOURCE_GROUP`, `SUBNET`, `NETWORK_SECURITY_GROUP`, `ROUTE_TABLE` |
-| -`LoadBalancerConfig` | `LoadBalancerConfig` | Load balancer config | `LOAD_BALANCER_SKU`, `EXCLUDE_MASTER_FROM_STANDARD_LB`, `MAXIMUM_LOADBALANCER_RULE_COUNT`, `LOAD_BALANCER_DISABLE_OUTBOUND_SNAT` |
-| `TlsBootstrappingConfig` | `TLSBootstrappingConfig` | TLS bootstrap configuration | `ENABLE_TLS_BOOTSTRAPPING`, `ENABLE_SECURE_TLS_BOOTSTRAPPING`, `CUSTOM_SECURE_TLS_BOOTSTRAP_AAD_SERVER_APP_ID` |
-| `AuthConfig` | `AuthConfig` | Authentication configuration | `TENANT_ID`, `SUBSCRIPTION_ID`, `SERVICE_PRINCIPAL_CLIENT_ID`, `SERVICE_PRINCIPAL_FILE_CONTENT`, `USER_ASSIGNED_IDENTITY_ID`, `USE_MANAGED_IDENTITY_EXTENSION` |
-| `RuncConfig` | `RuncConfig` | The CLI tool runc configuration | `RUNC_VERSION`, `RUNC_PACKAGE_URL` |
-| `ContainerdConfig` | `ContainerdConfig` | Containerd configuration | `CONTAINERD_DOWNLOAD_URL_BASE`, `CONTAINERD_VERSION`, `CONTAINERD_PACKAGE_URL` |
-| `TeleportConfig` | `TeleportConfig` | Teleport configuration | `TELEPORT_ENABLED`, `TELEPORTD_PLUGIN_DOWNLOAD_URL` |
-| `KubeletConfig` | `KubeletConfig` | Kubelet configuration | `KUBELET_FLAGS`, `KUBELET_NODE_LABELS`, `HAS_KUBELET_DISK_TYPE`, `KUBELET_CONFIG_FILE_ENABLED`, `KUBELET_CONFIG_FILE_CONTENT`, `KUBELET_CLIENT_CONTENT`, `KUBELET_CLIENT_CERT_CONTENT` |
-| `CustomSearchDomainConfig` | `CustomSearchDomainConfig` | Custom search domain configuration | `CUSTOM_SEARCH_DOMAIN_NAME`, `CUSTOM_SEARCH_REALM_USER`, `CUSTOM_SEARCH_REALM_PASSWORD` |
-| `CustomLinuxOSConfig` | `CustomLinuxOSConfig` | Custom Linux OS configurations including SwapFile, SysCtl configs, etc. | `SYSCTL_CONTENT`, `CONTAINERD_ULIMITS`, `SHOULD_CONFIG_SWAP_FILE`, `SWAP_FILE_SIZE_MB`, `THP_ENABLED`, `THP_DEFRAG`, `SHOULD_CONFIG_TRANSPARENT_HUGE_PAGE`, `SHOULD_CONFIG_CONTAINERD_ULIMITS` |
-| `HTTPProxyConfig` | `HTTPProxyConfig` | HTTP/HTTPS proxy configuration for the node | `SHOULD_CONFIGURE_HTTP_PROXY`, `SHOULD_CONFIGURE_HTTP_PROXY_CA`, `HTTP_PROXY_TRUSTED_CA`, `HTTP_PROXY_URLS`, `HTTPS_PROXY_URLS`, `NO_PROXY_URLS`, `PROXY_VARS` |
-| `GPUConfig` | `GPUConfig` | GPU configuration for the node | `GPU_NODE`, `CONFIG_GPU_DRIVER_IF_NEEDED`, `ENABLE_GPU_DEVICE_PLUGIN_IF_NEEDED`, `MIG_NODE`, `GPU_INSTANCE_PROFILE` |
-| `NetworkConfig` | `NetworkConfig` | Network configuration for the node | `NETWORK_PLUGIN`, `NETWORK_POLICY`, `VNET_CNI_PLUGINS_URL`, `ENSURE_NO_DUPE_PROMISCUOUS_BRIDGE` |
-| `KubernetesCaCert` | `string` | Kubernetes certificate authority (CA) certificate, required by the node to establish TLS with the API server | `KUBE_CA_CRT` |
-| `KubernetesVersion` | `string` | Kubernetes version | `KUBERNETES_VERSION` |
-| `KubeProxyUrl` | `string` | Kube proxy URL | `KUBEPROXY_URL` |
-| `VmSize` | `string` | The VM size of the node | N/A, new |
-| `LinuxAdminUsername` | `string` | Linux admin username. If not specified, the default value is `azureuser` | `ADMINUSER` |
-| `IsVhd` | `bool` | Specifies whether the node is a VHD node. This is still needed for some customized scenarios. This is labeled as `optional` (explicit presence) so that we know whether it's set or not. If it's not set, the default value will be nil. | `IS_VHD` |
-| `EnableSsh` | `bool` | Specifies if SSH is enabled on the VM node. This is labeled as `optional` (explicit presence) so that we know whether it's set or not. If it's not set, the default value will be nil, but will be set to true on the VHD. | `DISABLE_SSH` |
-| `EnableUnattendedUpgrade` | `bool` | Specifies whether unattended upgrade is enabled or disabled on the VM node | `ENABLE_UNATTENDED_UPGRADES` |
-| `MessageOfTheDay` | `string` | The message of the day that is displayed on the VM node when a user logs in | `MESSAGE_OF_THE_DAY` |
-| `EnableHostsConfigAgent` | `bool` | Specifies whether the hosts config agent is enabled or disabled on the VM node | `ENABLE_HOSTS_CONFIG_AGENT` |
-| `CustomCaCerts` | `[]string` | Custom CA certificates to be added to the system trust store | `SHOULD_CONFIGURE_CUSTOM_CA_TRUST`, `CUSTOM_CA_TRUST_COUNT`, `CUSTOM_CA_CERT_{{$i}}` |
-| `ProvisionOutput` | `string` | A local file path where cluster provision cse output should be stored | `PROVISION_OUTPUT` |
-| `WorkloadRuntime` | `WorkloadRuntime` | Workload runtime, e.g., either "OCIContainer" or "WasmWasi", currently. | `IS_KRUSTLET` |
-| `Ipv6DualStackEnabled` | `bool` | Specifies whether IPv6 dual stack is enabled or disabled on the VM node | `IPV6_DUAL_STACK_ENABLED` |
-| `OutboundCommand` | `bool` | Specifies whether IPv6 dual stack is enabled or disabled on the VM node | `OUTBOUND_COMMAND` |
-| `AzurePrivateRegistryServer` | `string` | Azure private registry server URI | `AZURE_PRIVATE_REGISTRY_SERVER` |
-| `PrivateEgressProxyAddress` | `string` | Private egress proxy address | `PRIVATE_EGRESS_PROXY_ADDRESS` |
-| `PrivateEgressProxyAddress` | `bool` | Specifies whether artifact streaming is enabled or disabled on the VM node | `ARTIFACT_STREAMING_ENABLED` |
-| `IsKata` | `bool` | Specifies if it is a Kata node | `IS_KATA` |
+| AKSNodeConfig Fields | Types | Descriptions                                                                                                                                                                                                                                                             | OLD CSE env variables mapping |
+|------------|------------|--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|-------------------------------|
+| `Version` | `string` | Semantic version of this AKSNodeConfig                                                                                                                                                                                                                                   | N/A, new |
+| `KubeBinaryConfig` | `KubeBinaryConfig` | Kubernetes binary URL configuration                                                                                                                                                                                                                                      | `KUBE_BINARY_URL`, `CUSTOM_KUBE_BINARY_URL`, `PRIVATE_KUBE_BINARY_URL` , `CREDENTIAL_PROVIDER_DOWNLOAD_URL` |
+| `CustomCloudConfig` | `CustomCloudConfig` | Custom cloud configuration                                                                                                                                                                                                                                               | `IS_CUSTOM_CLOUD`, `AKS_CUSTOM_CLOUD_CONTAINER_REGISTRY_DNS_SUFFIX`, `REPO_DEPOT_ENDPOINT`, `CUSTOM_ENV_JSON` |
+| `ApiServerConfig` | `ApiServerConfig` | Kubernetes API server configuration                                                                                                                                                                                                                                      | `APISERVER_PUBLIC_KEY`, `API_SERVER_NAME` |
+| `ClusterConfig` | `ClusterConfig` | Various Kubernetes cluster level configuration                                                                                                                                                                                                                           | `RESOURCE_GROUP`, `LOCATION`, `VM_TYPE`, `PRIMARY_AVAILABILITY_SET`, `PRIMARY_SCALE_SET`, `USE_INSTANCE_METADATA` |
+| -`ClusterNetworkConfig` | `ClusterNetworkConfig` | Cluster network config. We assumed network mode is always "transparent" now so it's removed from the contract.                                                                                                                                                           | `VIRTUAL_NETWORK`, `VIRTUAL_NETWORK_RESOURCE_GROUP`, `SUBNET`, `NETWORK_SECURITY_GROUP`, `ROUTE_TABLE` |
+| -`LoadBalancerConfig` | `LoadBalancerConfig` | Load balancer config                                                                                                                                                                                                                                                     | `LOAD_BALANCER_SKU`, `EXCLUDE_MASTER_FROM_STANDARD_LB`, `MAXIMUM_LOADBALANCER_RULE_COUNT`, `LOAD_BALANCER_DISABLE_OUTBOUND_SNAT` |
+| `BootstrappingConfig` | `BootstrappingConfig` | Bootstrap configuration                                                                                                                                                                                                                                                  | `ENABLE_TLS_BOOTSTRAPPING`, `ENABLE_SECURE_TLS_BOOTSTRAPPING`, `CUSTOM_SECURE_TLS_BOOTSTRAP_AAD_SERVER_APP_ID` |
+| `AuthConfig` | `AuthConfig` | Authentication configuration                                                                                                                                                                                                                                             | `TENANT_ID`, `SUBSCRIPTION_ID`, `SERVICE_PRINCIPAL_CLIENT_ID`, `SERVICE_PRINCIPAL_FILE_CONTENT`, `USER_ASSIGNED_IDENTITY_ID`, `USE_MANAGED_IDENTITY_EXTENSION` |
+| `RuncConfig` | `RuncConfig` | The CLI tool runc configuration                                                                                                                                                                                                                                          | `RUNC_VERSION`, `RUNC_PACKAGE_URL` |
+| `ContainerdConfig` | `ContainerdConfig` | Containerd configuration                                                                                                                                                                                                                                                 | `CONTAINERD_DOWNLOAD_URL_BASE`, `CONTAINERD_VERSION`, `CONTAINERD_PACKAGE_URL` |
+| `TeleportConfig` | `TeleportConfig` | Teleport configuration                                                                                                                                                                                                                                                   | `TELEPORT_ENABLED`, `TELEPORTD_PLUGIN_DOWNLOAD_URL` |
+| `KubeletConfig` | `KubeletConfig` | Kubelet configuration                                                                                                                                                                                                                                                    | `KUBELET_FLAGS`, `KUBELET_NODE_LABELS`, `HAS_KUBELET_DISK_TYPE`, `KUBELET_CONFIG_FILE_ENABLED`, `KUBELET_CONFIG_FILE_CONTENT`, `KUBELET_CLIENT_CONTENT`, `KUBELET_CLIENT_CERT_CONTENT` |
+| `CustomSearchDomainConfig` | `CustomSearchDomainConfig` | Custom search domain configuration                                                                                                                                                                                                                                       | `CUSTOM_SEARCH_DOMAIN_NAME`, `CUSTOM_SEARCH_REALM_USER`, `CUSTOM_SEARCH_REALM_PASSWORD` |
+| `CustomLinuxOSConfig` | `CustomLinuxOSConfig` | Custom Linux OS configurations including SwapFile, SysCtl configs, etc.                                                                                                                                                                                                  | `SYSCTL_CONTENT`, `CONTAINERD_ULIMITS`, `SHOULD_CONFIG_SWAP_FILE`, `SWAP_FILE_SIZE_MB`, `THP_ENABLED`, `THP_DEFRAG`, `SHOULD_CONFIG_TRANSPARENT_HUGE_PAGE`, `SHOULD_CONFIG_CONTAINERD_ULIMITS` |
+| `HTTPProxyConfig` | `HTTPProxyConfig` | HTTP/HTTPS proxy configuration for the node                                                                                                                                                                                                                              | `SHOULD_CONFIGURE_HTTP_PROXY`, `SHOULD_CONFIGURE_HTTP_PROXY_CA`, `HTTP_PROXY_TRUSTED_CA`, `HTTP_PROXY_URLS`, `HTTPS_PROXY_URLS`, `NO_PROXY_URLS`, `PROXY_VARS` |
+| `GPUConfig` | `GPUConfig` | GPU configuration for the node                                                                                                                                                                                                                                           | `GPU_NODE`, `CONFIG_GPU_DRIVER_IF_NEEDED`, `ENABLE_GPU_DEVICE_PLUGIN_IF_NEEDED`, `MIG_NODE`, `GPU_INSTANCE_PROFILE` |
+| `NetworkConfig` | `NetworkConfig` | Network configuration for the node                                                                                                                                                                                                                                       | `NETWORK_PLUGIN`, `NETWORK_POLICY`, `VNET_CNI_PLUGINS_URL`, `ENSURE_NO_DUPE_PROMISCUOUS_BRIDGE` |
+| `KubernetesCaCert` | `string` | Kubernetes certificate authority (CA) certificate, required by the node to establish TLS with the API server                                                                                                                                                             | `KUBE_CA_CRT` |
+| `KubernetesVersion` | `string` | Kubernetes version                                                                                                                                                                                                                                                       | `KUBERNETES_VERSION` |
+| `KubeProxyUrl` | `string` | Kube proxy URL                                                                                                                                                                                                                                                           | `KUBEPROXY_URL` |
+| `VmSize` | `string` | The VM size of the node                                                                                                                                                                                                                                                  | N/A, new |
+| `LinuxAdminUsername` | `string` | Linux admin username. If not specified, the default value is `azureuser`                                                                                                                                                                                                 | `ADMINUSER` |
+| `IsVhd` | `bool` | Specifies whether the node is a VHD node. This is still needed for some customized scenarios. This is labeled as `optional` (explicit presence) so that we know whether it's set or not. If it's not set, the default value will be nil.                                 | `IS_VHD` |
+| `EnableSsh` | `bool` | Specifies if SSH is enabled on the VM node. This is labeled as `optional` (explicit presence) so that we know whether it's set or not. If it's not set, the default value will be nil, but will be set to true on the VHD.                                               | `DISABLE_SSH` |
+| `EnableUnattendedUpgrade` | `bool` | Specifies whether unattended upgrade is enabled or disabled on the VM node                                                                                                                                                                                               | `ENABLE_UNATTENDED_UPGRADES` |
+| `MessageOfTheDay` | `string` | The message of the day that is displayed on the VM node when a user logs in                                                                                                                                                                                              | `MESSAGE_OF_THE_DAY` |
+| `EnableHostsConfigAgent` | `bool` | Specifies whether the hosts config agent is enabled or disabled on the VM node                                                                                                                                                                                           | `ENABLE_HOSTS_CONFIG_AGENT` |
+| `CustomCaCerts` | `[]string` | Custom CA certificates to be added to the system trust store                                                                                                                                                                                                             | `SHOULD_CONFIGURE_CUSTOM_CA_TRUST`, `CUSTOM_CA_TRUST_COUNT`, `CUSTOM_CA_CERT_{{$i}}` |
+| `ProvisionOutput` | `string` | A local file path where cluster provision cse output should be stored                                                                                                                                                                                                    | `PROVISION_OUTPUT` |
+| `WorkloadRuntime` | `WorkloadRuntime` | Workload runtime, e.g., either "OCIContainer" or "WasmWasi", currently.                                                                                                                                                                                                  | `IS_KRUSTLET` |
+| `Ipv6DualStackEnabled` | `bool` | Specifies whether IPv6 dual stack is enabled or disabled on the VM node                                                                                                                                                                                                  | `IPV6_DUAL_STACK_ENABLED` |
+| `OutboundCommand` | `bool` | Specifies whether IPv6 dual stack is enabled or disabled on the VM node                                                                                                                                                                                                  | `OUTBOUND_COMMAND` |
+| `AzurePrivateRegistryServer` | `string` | Azure private registry server URI                                                                                                                                                                                                                                        | `AZURE_PRIVATE_REGISTRY_SERVER` |
+| `PrivateEgressProxyAddress` | `string` | Private egress proxy address                                                                                                                                                                                                                                             | `PRIVATE_EGRESS_PROXY_ADDRESS` |
+| `PrivateEgressProxyAddress` | `bool` | Specifies whether artifact streaming is enabled or disabled on the VM node                                                                                                                                                                                               | `ARTIFACT_STREAMING_ENABLED` |
+| `IsKata` | `bool` | Specifies if it is a Kata node                                                                                                                                                                                                                                           | `IS_KATA` |
 | `NeedsCgroupv2` | `*bool` | Specifies whether the node needs cgroupv2. Labeled as `optional` (explicit presence) so that we know whether it's set or not. If it's not set, the default value will be nil and it's defaulted to false. Future plan is to get the value from VHD during bootstrapping. | `NEEDS_CGROUPV2` |
-| `BootstrapProfileContainerRegistryServer` | `string` | Bootstrap profile container registry server URI | `BOOTSTRAP_PROFILE_CONTAINER_REGISTRY_SERVER` |
-| `IMDSRestrictionConfig` | `IMDSRestrictionConfig` | IMDS restriction configuration | `ENABLE_IMDS_RESTRICTION`, `INSERT_IMDS_RESTRICTION_RULE_TO_MANGLE_TABLE`|
+| `BootstrapProfileContainerRegistryServer` | `string` | Bootstrap profile container registry server URI                                                                                                                                                                                                                          | `BOOTSTRAP_PROFILE_CONTAINER_REGISTRY_SERVER` |
+| `IMDSRestrictionConfig` | `IMDSRestrictionConfig` | IMDS restriction configuration                                                                                                                                                                                                                                           | `ENABLE_IMDS_RESTRICTION`, `INSERT_IMDS_RESTRICTION_RULE_TO_MANGLE_TABLE`|
 
 
 Removed old environment variables from cse_cmd.sh:
diff --git a/aks-node-controller/proto/aksnodeconfig/v1/bootstrapping_config.proto b/aks-node-controller/proto/aksnodeconfig/v1/bootstrapping_config.proto
new file mode 100644
index 00000000000..4a519377cbd
--- /dev/null
+++ b/aks-node-controller/proto/aksnodeconfig/v1/bootstrapping_config.proto
@@ -0,0 +1,47 @@
+syntax = "proto3";
+package aksnodeconfig.v1;
+
+enum BootstrappingAuthMethod {
+  BOOTSTRAPPING_AUTH_METHOD_UNSPECIFIED = 0;
+
+  // This is the default K8s bootstrap authentication method - a time limited bootstrap token. It's stored as a secret
+  // with a particular type in the API server.
+  //nolint:gosec // this is a const string to use in switch statements, not hardcoded credentials
+  BOOTSTRAPPING_AUTH_METHOD_BOOTSTRAP_TOKEN = 1;
+  // Secure TLS bootstrapping is a process where the node can use signed metadata from the Azure IMDS service to authenticate
+  // against the api server
+  BOOTSTRAPPING_AUTH_METHOD_SECURE_TLS_BOOTSTRAPPING = 2;
+  // Nodes running outside Azure can use the Azure Arc MSI to authenticate to an API server. This only works when the cluster is
+  //  using AAD authentication.
+  BOOTSTRAPPING_AUTH_METHOD_ARC_MSI = 3;
+  // Nodes running inside Azure can use the Azure Arc MSI to authenticate to an API server. This only works when the cluster is
+  // using AAD authentication.
+  BOOTSTRAPPING_AUTH_METHOD_AZURE_MSI = 4;
+}
+
+enum ClusterJoinMethod {
+  CLUSTER_JOIN_METHOD_UNSPECIFIED = 0;
+
+  // The default behaviour is for the node to make a certificate signing request (CSR) and then
+  // use that CSR for ongoing communication.
+  CLUSTER_JOIN_METHOD_GENERATE_CSR = 1;
+  // In some cases, the node will use the bootstrapping auth to register itself as a node and for ongoing communications.
+  CLUSTER_JOIN_METHOD_USE_BOOTSTRAPPING_AUTH = 2;
+}
+
+message BootstrappingConfig {
+  // Method to authenticate the node to the API server
+  BootstrappingAuthMethod bootstrapping_auth_method = 1;
+
+  // how the node should join and communicate with the API server after authentication
+  ClusterJoinMethod cluster_join_method = 2;
+
+  // Only required until Secure TLS bootstrapping in place. Would use kubelet identity after that.
+  optional string tls_bootstrapping_token = 3;
+
+  // Only used when secure TLS bootstrapping is enabled or one of the Azure/Arc methods. This is the appserver appid that the node will use to bootstrap.
+  optional string custom_aad_resource = 4;
+
+  // Only used when one of the Azure/Arc methods is enabled. This is the client ID of the MSI that the node will use to bootstrap.
+  optional string custom_aad_client_id = 5;
+}
diff --git a/aks-node-controller/proto/aksnodeconfig/v1/config.proto b/aks-node-controller/proto/aksnodeconfig/v1/config.proto
index 7a9fa0f12b3..f23ce298a41 100644
--- a/aks-node-controller/proto/aksnodeconfig/v1/config.proto
+++ b/aks-node-controller/proto/aksnodeconfig/v1/config.proto
@@ -4,6 +4,7 @@ package aksnodeconfig.v1;
 
 import "aksnodeconfig/v1/api_server_config.proto";
 import "aksnodeconfig/v1/auth_config.proto";
+import "aksnodeconfig/v1/bootstrapping_config.proto";
 import "aksnodeconfig/v1/cluster_config.proto";
 import "aksnodeconfig/v1/containerd_config.proto";
 import "aksnodeconfig/v1/custom_cloud_config.proto";
@@ -17,7 +18,6 @@ import "aksnodeconfig/v1/kubelet_config.proto";
 import "aksnodeconfig/v1/network_config.proto";
 import "aksnodeconfig/v1/runc_config.proto";
 import "aksnodeconfig/v1/teleport_config.proto";
-import "aksnodeconfig/v1/tls_bootstrapping_config.proto";
 
 enum WorkloadRuntime {
   WORKLOAD_RUNTIME_UNSPECIFIED = 0;
@@ -42,7 +42,7 @@ message Configuration {
   ClusterConfig cluster_config = 5;
 
   // TLS bootstrap config
-  TlsBootstrappingConfig tls_bootstrapping_config = 6;
+  BootstrappingConfig bootstrapping_config = 6;
 
   // Authentication configuration
   AuthConfig auth_config = 7;
diff --git a/aks-node-controller/proto/aksnodeconfig/v1/tls_bootstrapping_config.proto b/aks-node-controller/proto/aksnodeconfig/v1/tls_bootstrapping_config.proto
deleted file mode 100644
index 4442655eae4..00000000000
--- a/aks-node-controller/proto/aksnodeconfig/v1/tls_bootstrapping_config.proto
+++ /dev/null
@@ -1,13 +0,0 @@
-syntax = "proto3";
-package aksnodeconfig.v1;
-
-message TlsBootstrappingConfig {
-  // Enable secure TLS bootstrapping for the node.
-  optional bool enable_secure_tls_bootstrapping = 1;
-
-  // Only required until Secure TLS bootstrapping in place. Would use kubelet identity after that.
-  string tls_bootstrapping_token = 2;
-
-  // Only used when secure TLS bootstrapping is enabled. This is the appserver appid that the node will use to bootstrap.
-  string custom_secure_tls_bootstrapping_appserver_appid = 3;
-}
diff --git a/e2e/exec.go b/e2e/exec.go
index 6b473449d52..46c6e95de6c 100644
--- a/e2e/exec.go
+++ b/e2e/exec.go
@@ -4,12 +4,12 @@ import (
 	"bytes"
 	"context"
 	"fmt"
-	"strconv"
 	"strings"
 	"testing"
 
 	"github.com/stretchr/testify/require"
 	corev1 "k8s.io/api/core/v1"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/client-go/kubernetes/scheme"
 	"k8s.io/client-go/tools/remotecommand"
 )
@@ -71,11 +71,6 @@ func extractClusterParameters(ctx context.Context, t *testing.T, kube *Kubeclien
 	require.NoError(t, err)
 
 	bootstrapConfig := execResult.stdout.Bytes()
-	bootstrapToken, err := extractKeyValuePair("token", string(bootstrapConfig))
-	require.NoError(t, err)
-
-	bootstrapToken, err = strconv.Unquote(bootstrapToken)
-	require.NoError(t, err)
 
 	server, err := extractKeyValuePair("server", string(bootstrapConfig))
 	require.NoError(t, err)
@@ -95,13 +90,30 @@ func extractClusterParameters(ctx context.Context, t *testing.T, kube *Kubeclien
 
 	return &ClusterParams{
 		CACert:         caCert.stdout.Bytes(),
-		BootstrapToken: bootstrapToken,
+		BootstrapToken: getBootstrapToken(ctx, t, kube),
 		FQDN:           fqdn,
 		APIServerCert:  cmdAPIServer.stdout.Bytes(),
 		ClientKey:      clientKey.stdout.Bytes(),
 	}
 }
 
+func getBootstrapToken(ctx context.Context, t *testing.T, kube *Kubeclient) string {
+	secrets, err := kube.Typed.CoreV1().Secrets("kube-system").List(ctx, metav1.ListOptions{})
+	require.NoError(t, err)
+	secret := func() *corev1.Secret {
+		for _, secret := range secrets.Items {
+			if strings.HasPrefix(secret.Name, "bootstrap-token-") {
+				return &secret
+			}
+		}
+		t.Fatal("could not find secret with bootstrap-token- prefix")
+		return nil
+	}()
+	id := secret.Data["token-id"]
+	token := secret.Data["token-secret"]
+	return fmt.Sprintf("%s.%s", id, token)
+}
+
 func execOnVM(ctx context.Context, kube *Kubeclient, vmPrivateIP, jumpboxPodName, sshPrivateKey, command string, isShellBuiltIn bool) (*podExecResult, error) {
 	sshCommand := fmt.Sprintf(sshCommandTemplate, sshPrivateKey, strings.ReplaceAll(vmPrivateIP, ".", ""), vmPrivateIP)
 	if !isShellBuiltIn {
diff --git a/e2e/node_config.go b/e2e/node_config.go
index e2c9ee980dd..829fde1b704 100644
--- a/e2e/node_config.go
+++ b/e2e/node_config.go
@@ -102,8 +102,8 @@ func nbcToAKSNodeConfigV1(nbc *datamodel.NodeBootstrappingConfiguration) *aksnod
 			KubeletFlags:             helpers.GetKubeletConfigFlag(nbc.KubeletConfig, cs, agentPool, false),
 			KubeletNodeLabels:        helpers.GetKubeletNodeLabels(agentPool),
 		},
-		TlsBootstrappingConfig: &aksnodeconfigv1.TlsBootstrappingConfig{
-			TlsBootstrappingToken: *nbc.KubeletClientTLSBootstrapToken,
+		BootstrappingConfig: &aksnodeconfigv1.BootstrappingConfig{
+			TlsBootstrappingToken: nbc.KubeletClientTLSBootstrapToken,
 		},
 		KubernetesCaCert: base64.StdEncoding.EncodeToString([]byte(cs.Properties.CertificateProfile.CaCertificate)),
 		KubeBinaryConfig: &aksnodeconfigv1.KubeBinaryConfig{
diff --git a/e2e/validation.go b/e2e/validation.go
index 18150674ec3..efbcaf430e6 100644
--- a/e2e/validation.go
+++ b/e2e/validation.go
@@ -180,10 +180,15 @@ func leakedSecretsValidators(scenario *Scenario) []*LiveVMValidator {
 			"bootstrap token":          *scenario.Runtime.NBC.KubeletClientTLSBootstrapToken,
 		}
 	} else {
+		token := scenario.Runtime.AKSNodeConfig.BootstrappingConfig.TlsBootstrappingToken
+		strToken := ""
+		if token != nil {
+			strToken = *token
+		}
 		secrets = map[string]string{
 			"client private key":       b64Encoded(scenario.Runtime.AKSNodeConfig.KubeletConfig.KubeletClientKey),
 			"service principal secret": b64Encoded(scenario.Runtime.AKSNodeConfig.AuthConfig.ServicePrincipalSecret),
-			"bootstrap token":          scenario.Runtime.AKSNodeConfig.TlsBootstrappingConfig.TlsBootstrappingToken,
+			"bootstrap token":          strToken,
 		}
 	}
 
diff --git a/go.work b/go.work
index 93bb8ccb8de..9f62bfeeb15 100644
--- a/go.work
+++ b/go.work
@@ -2,6 +2,9 @@ go 1.23.0
 
 use (
 	.
+	./vhdbuilder/lister
+	./vhdbuilder/automation
+	./vhdbuilder/prefetch
 	./aks-node-controller
 	./e2e
 )
diff --git a/go.work.sum b/go.work.sum
index cf3aec25da3..fd150a85d55 100644
--- a/go.work.sum
+++ b/go.work.sum
@@ -1,10 +1,259 @@
+cloud.google.com/go v0.110.10 h1:LXy9GEO+timppncPIAZoOj3l58LIU9k+kn48AN7IO3Y=
+cloud.google.com/go v0.110.10/go.mod h1:v1OoFqYxiBkUrruItNM3eT4lLByNjxmJSV/xDKJNnic=
+cloud.google.com/go/accessapproval v1.7.4 h1:ZvLvJ952zK8pFHINjpMBY5k7LTAp/6pBf50RDMRgBUI=
+cloud.google.com/go/accessapproval v1.7.4/go.mod h1:/aTEh45LzplQgFYdQdwPMR9YdX0UlhBmvB84uAmQKUc=
+cloud.google.com/go/accesscontextmanager v1.8.4 h1:Yo4g2XrBETBCqyWIibN3NHNPQKUfQqti0lI+70rubeE=
+cloud.google.com/go/accesscontextmanager v1.8.4/go.mod h1:ParU+WbMpD34s5JFEnGAnPBYAgUHozaTmDJU7aCU9+M=
+cloud.google.com/go/aiplatform v1.54.0 h1:wH7OYl9Vq/5tupok0BPTFY9xaTLb0GxkReHtB5PF7cI=
+cloud.google.com/go/aiplatform v1.54.0/go.mod h1:pwZMGvqe0JRkI1GWSZCtnAfrR4K1bv65IHILGA//VEU=
+cloud.google.com/go/analytics v0.21.6 h1:fnV7B8lqyEYxCU0LKk+vUL7mTlqRAq4uFlIthIdr/iA=
+cloud.google.com/go/analytics v0.21.6/go.mod h1:eiROFQKosh4hMaNhF85Oc9WO97Cpa7RggD40e/RBy8w=
+cloud.google.com/go/apigateway v1.6.4 h1:VVIxCtVerchHienSlaGzV6XJGtEM9828Erzyr3miUGs=
+cloud.google.com/go/apigateway v1.6.4/go.mod h1:0EpJlVGH5HwAN4VF4Iec8TAzGN1aQgbxAWGJsnPCGGY=
+cloud.google.com/go/apigeeconnect v1.6.4 h1:jSoGITWKgAj/ssVogNE9SdsTqcXnryPzsulENSRlusI=
+cloud.google.com/go/apigeeconnect v1.6.4/go.mod h1:CapQCWZ8TCjnU0d7PobxhpOdVz/OVJ2Hr/Zcuu1xFx0=
+cloud.google.com/go/apigeeregistry v0.8.2 h1:DSaD1iiqvELag+lV4VnnqUUFd8GXELu01tKVdWZrviE=
+cloud.google.com/go/apigeeregistry v0.8.2/go.mod h1:h4v11TDGdeXJDJvImtgK2AFVvMIgGWjSb0HRnBSjcX8=
+cloud.google.com/go/appengine v1.8.4 h1:Qub3fqR7iA1daJWdzjp/Q0Jz0fUG0JbMc7Ui4E9IX/E=
+cloud.google.com/go/appengine v1.8.4/go.mod h1:TZ24v+wXBujtkK77CXCpjZbnuTvsFNT41MUaZ28D6vg=
+cloud.google.com/go/area120 v0.8.4 h1:YnSO8m02pOIo6AEOgiOoUDVbw4pf+bg2KLHi4rky320=
+cloud.google.com/go/area120 v0.8.4/go.mod h1:jfawXjxf29wyBXr48+W+GyX/f8fflxp642D/bb9v68M=
+cloud.google.com/go/artifactregistry v1.14.6 h1:/hQaadYytMdA5zBh+RciIrXZQBWK4vN7EUsrQHG+/t8=
+cloud.google.com/go/artifactregistry v1.14.6/go.mod h1:np9LSFotNWHcjnOgh8UVK0RFPCTUGbO0ve3384xyHfE=
+cloud.google.com/go/asset v1.15.3 h1:uI8Bdm81s0esVWbWrTHcjFDFKNOa9aB7rI1vud1hO84=
+cloud.google.com/go/asset v1.15.3/go.mod h1:yYLfUD4wL4X589A9tYrv4rFrba0QlDeag0CMcM5ggXU=
+cloud.google.com/go/assuredworkloads v1.11.4 h1:FsLSkmYYeNuzDm8L4YPfLWV+lQaUrJmH5OuD37t1k20=
+cloud.google.com/go/assuredworkloads v1.11.4/go.mod h1:4pwwGNwy1RP0m+y12ef3Q/8PaiWrIDQ6nD2E8kvWI9U=
+cloud.google.com/go/automl v1.13.4 h1:i9tOKXX+1gE7+rHpWKjiuPfGBVIYoWvLNIGpWgPtF58=
+cloud.google.com/go/automl v1.13.4/go.mod h1:ULqwX/OLZ4hBVfKQaMtxMSTlPx0GqGbWN8uA/1EqCP8=
+cloud.google.com/go/baremetalsolution v1.2.3 h1:oQiFYYCe0vwp7J8ZmF6siVKEumWtiPFJMJcGuyDVRUk=
+cloud.google.com/go/baremetalsolution v1.2.3/go.mod h1:/UAQ5xG3faDdy180rCUv47e0jvpp3BFxT+Cl0PFjw5g=
+cloud.google.com/go/batch v1.6.3 h1:mPiIH20a5NU02rucbAmLeO4sLPO9hrTK0BLjdHyW8xw=
+cloud.google.com/go/batch v1.6.3/go.mod h1:J64gD4vsNSA2O5TtDB5AAux3nJ9iV8U3ilg3JDBYejU=
+cloud.google.com/go/beyondcorp v1.0.3 h1:VXf9SnrnSmj2BF2cHkoTHvOUp8gjsz1KJFOMW7czdsY=
+cloud.google.com/go/beyondcorp v1.0.3/go.mod h1:HcBvnEd7eYr+HGDd5ZbuVmBYX019C6CEXBonXbCVwJo=
+cloud.google.com/go/bigquery v1.57.1 h1:FiULdbbzUxWD0Y4ZGPSVCDLvqRSyCIO6zKV7E2nf5uA=
+cloud.google.com/go/bigquery v1.57.1/go.mod h1:iYzC0tGVWt1jqSzBHqCr3lrRn0u13E8e+AqowBsDgug=
+cloud.google.com/go/billing v1.17.4 h1:77/4kCqzH6Ou5CCDzNmqmboE+WvbwFBJmw1QZQz19AI=
+cloud.google.com/go/billing v1.17.4/go.mod h1:5DOYQStCxquGprqfuid/7haD7th74kyMBHkjO/OvDtk=
+cloud.google.com/go/binaryauthorization v1.7.3 h1:3R6WYn1JKIaVicBmo18jXubu7xh4mMkmbIgsTXk0cBA=
+cloud.google.com/go/binaryauthorization v1.7.3/go.mod h1:VQ/nUGRKhrStlGr+8GMS8f6/vznYLkdK5vaKfdCIpvU=
+cloud.google.com/go/certificatemanager v1.7.4 h1:5YMQ3Q+dqGpwUZ9X5sipsOQ1fLPsxod9HNq0+nrqc6I=
+cloud.google.com/go/certificatemanager v1.7.4/go.mod h1:FHAylPe/6IIKuaRmHbjbdLhGhVQ+CWHSD5Jq0k4+cCE=
+cloud.google.com/go/channel v1.17.3 h1:Rd4+fBrjiN6tZ4TR8R/38elkyEkz6oogGDr7jDyjmMY=
+cloud.google.com/go/channel v1.17.3/go.mod h1:QcEBuZLGGrUMm7kNj9IbU1ZfmJq2apotsV83hbxX7eE=
+cloud.google.com/go/cloudbuild v1.15.0 h1:9IHfEMWdCklJ1cwouoiQrnxmP0q3pH7JUt8Hqx4Qbck=
+cloud.google.com/go/cloudbuild v1.15.0/go.mod h1:eIXYWmRt3UtggLnFGx4JvXcMj4kShhVzGndL1LwleEM=
+cloud.google.com/go/clouddms v1.7.3 h1:xe/wJKz55VO1+L891a1EG9lVUgfHr9Ju/I3xh1nwF84=
+cloud.google.com/go/clouddms v1.7.3/go.mod h1:fkN2HQQNUYInAU3NQ3vRLkV2iWs8lIdmBKOx4nrL6Hc=
+cloud.google.com/go/cloudtasks v1.12.4 h1:5xXuFfAjg0Z5Wb81j2GAbB3e0bwroCeSF+5jBn/L650=
+cloud.google.com/go/cloudtasks v1.12.4/go.mod h1:BEPu0Gtt2dU6FxZHNqqNdGqIG86qyWKBPGnsb7udGY0=
+cloud.google.com/go/compute v1.23.3 h1:6sVlXXBmbd7jNX0Ipq0trII3e4n1/MsADLK6a+aiVlk=
+cloud.google.com/go/compute v1.23.3/go.mod h1:VCgBUoMnIVIR0CscqQiPJLAG25E3ZRZMzcFZeQ+h8CI=
 cloud.google.com/go/compute/metadata v0.3.0 h1:Tz+eQXMEqDIKRsmY3cHTL6FVaynIjX2QxYC4trgAKZc=
 cloud.google.com/go/compute/metadata v0.3.0/go.mod h1:zFmK7XCadkQkj6TtorcaGlCW1hT1fIilQDwofLpJ20k=
+cloud.google.com/go/contactcenterinsights v1.12.0 h1:wP41IUA4ucMVooj/TP53jd7vbNjWrDkAPOeulVJGT5U=
+cloud.google.com/go/contactcenterinsights v1.12.0/go.mod h1:HHX5wrz5LHVAwfI2smIotQG9x8Qd6gYilaHcLLLmNis=
+cloud.google.com/go/container v1.28.0 h1:/o82CFWXIYnT9p/07SnRgybqL3Pmmu86jYIlzlJVUBY=
+cloud.google.com/go/container v1.28.0/go.mod h1:b1A1gJeTBXVLQ6GGw9/9M4FG94BEGsqJ5+t4d/3N7O4=
+cloud.google.com/go/containeranalysis v0.11.3 h1:5rhYLX+3a01drpREqBZVXR9YmWH45RnML++8NsCtuD8=
+cloud.google.com/go/containeranalysis v0.11.3/go.mod h1:kMeST7yWFQMGjiG9K7Eov+fPNQcGhb8mXj/UcTiWw9U=
+cloud.google.com/go/datacatalog v1.19.0 h1:rbYNmHwvAOOwnW2FPXYkaK3Mf1MmGqRzK0mMiIEyLdo=
+cloud.google.com/go/datacatalog v1.19.0/go.mod h1:5FR6ZIF8RZrtml0VUao22FxhdjkoG+a0866rEnObryM=
+cloud.google.com/go/dataflow v0.9.4 h1:7VmCNWcPJBS/srN2QnStTB6nu4Eb5TMcpkmtaPVhRt4=
+cloud.google.com/go/dataflow v0.9.4/go.mod h1:4G8vAkHYCSzU8b/kmsoR2lWyHJD85oMJPHMtan40K8w=
+cloud.google.com/go/dataform v0.9.1 h1:jV+EsDamGX6cE127+QAcCR/lergVeeZdEQ6DdrxW3sQ=
+cloud.google.com/go/dataform v0.9.1/go.mod h1:pWTg+zGQ7i16pyn0bS1ruqIE91SdL2FDMvEYu/8oQxs=
+cloud.google.com/go/datafusion v1.7.4 h1:Q90alBEYlMi66zL5gMSGQHfbZLB55mOAg03DhwTTfsk=
+cloud.google.com/go/datafusion v1.7.4/go.mod h1:BBs78WTOLYkT4GVZIXQCZT3GFpkpDN4aBY4NDX/jVlM=
+cloud.google.com/go/datalabeling v0.8.4 h1:zrq4uMmunf2KFDl/7dS6iCDBBAxBnKVDyw6+ajz3yu0=
+cloud.google.com/go/datalabeling v0.8.4/go.mod h1:Z1z3E6LHtffBGrNUkKwbwbDxTiXEApLzIgmymj8A3S8=
+cloud.google.com/go/dataplex v1.11.2 h1:AfFFR15Ifh4U+Me1IBztrSd5CrasTODzy3x8KtDyHdc=
+cloud.google.com/go/dataplex v1.11.2/go.mod h1:mHJYQQ2VEJHsyoC0OdNyy988DvEbPhqFs5OOLffLX0c=
+cloud.google.com/go/dataproc/v2 v2.3.0 h1:tTVP9tTxmc8fixxOd/8s6Q6Pz/+yzn7r7XdZHretQH0=
+cloud.google.com/go/dataproc/v2 v2.3.0/go.mod h1:G5R6GBc9r36SXv/RtZIVfB8SipI+xVn0bX5SxUzVYbY=
+cloud.google.com/go/dataqna v0.8.4 h1:NJnu1kAPamZDs/if3bJ3+Wb6tjADHKL83NUWsaIp2zg=
+cloud.google.com/go/dataqna v0.8.4/go.mod h1:mySRKjKg5Lz784P6sCov3p1QD+RZQONRMRjzGNcFd0c=
+cloud.google.com/go/datastore v1.15.0 h1:0P9WcsQeTWjuD1H14JIY7XQscIPQ4Laje8ti96IC5vg=
+cloud.google.com/go/datastore v1.15.0/go.mod h1:GAeStMBIt9bPS7jMJA85kgkpsMkvseWWXiaHya9Jes8=
+cloud.google.com/go/datastream v1.10.3 h1:Z2sKPIB7bT2kMW5Uhxy44ZgdJzxzE5uKjavoW+EuHEE=
+cloud.google.com/go/datastream v1.10.3/go.mod h1:YR0USzgjhqA/Id0Ycu1VvZe8hEWwrkjuXrGbzeDOSEA=
+cloud.google.com/go/deploy v1.15.0 h1:ZdmYzRMTGkVyP1nXEUat9FpbJGJemDcNcx82RSSOElc=
+cloud.google.com/go/deploy v1.15.0/go.mod h1:e5XOUI5D+YGldyLNZ21wbp9S8otJbBE4i88PtO9x/2g=
+cloud.google.com/go/dialogflow v1.44.3 h1:cK/f88KX+YVR4tLH4clMQlvrLWD2qmKJQziusjGPjmc=
+cloud.google.com/go/dialogflow v1.44.3/go.mod h1:mHly4vU7cPXVweuB5R0zsYKPMzy240aQdAu06SqBbAQ=
+cloud.google.com/go/dlp v1.11.1 h1:OFlXedmPP/5//X1hBEeq3D9kUVm9fb6ywYANlpv/EsQ=
+cloud.google.com/go/dlp v1.11.1/go.mod h1:/PA2EnioBeXTL/0hInwgj0rfsQb3lpE3R8XUJxqUNKI=
+cloud.google.com/go/documentai v1.23.5 h1:KAlzT+q8qvRxAmhsJUvLtfFHH0PNvz3M79H6CgVBKL8=
+cloud.google.com/go/documentai v1.23.5/go.mod h1:ghzBsyVTiVdkfKaUCum/9bGBEyBjDO4GfooEcYKhN+g=
+cloud.google.com/go/domains v0.9.4 h1:ua4GvsDztZ5F3xqjeLKVRDeOvJshf5QFgWGg1CKti3A=
+cloud.google.com/go/domains v0.9.4/go.mod h1:27jmJGShuXYdUNjyDG0SodTfT5RwLi7xmH334Gvi3fY=
+cloud.google.com/go/edgecontainer v1.1.4 h1:Szy3Q/N6bqgQGyxqjI+6xJZbmvPvnFHp3UZr95DKcQ0=
+cloud.google.com/go/edgecontainer v1.1.4/go.mod h1:AvFdVuZuVGdgaE5YvlL1faAoa1ndRR/5XhXZvPBHbsE=
+cloud.google.com/go/errorreporting v0.3.0 h1:kj1XEWMu8P0qlLhm3FwcaFsUvXChV/OraZwA70trRR0=
+cloud.google.com/go/errorreporting v0.3.0/go.mod h1:xsP2yaAp+OAW4OIm60An2bbLpqIhKXdWR/tawvl7QzU=
+cloud.google.com/go/essentialcontacts v1.6.5 h1:S2if6wkjR4JCEAfDtIiYtD+sTz/oXjh2NUG4cgT1y/Q=
+cloud.google.com/go/essentialcontacts v1.6.5/go.mod h1:jjYbPzw0x+yglXC890l6ECJWdYeZ5dlYACTFL0U/VuM=
+cloud.google.com/go/eventarc v1.13.3 h1:+pFmO4eu4dOVipSaFBLkmqrRYG94Xl/TQZFOeohkuqU=
+cloud.google.com/go/eventarc v1.13.3/go.mod h1:RWH10IAZIRcj1s/vClXkBgMHwh59ts7hSWcqD3kaclg=
+cloud.google.com/go/filestore v1.8.0 h1:/+wUEGwk3x3Kxomi2cP5dsR8+SIXxo7M0THDjreFSYo=
+cloud.google.com/go/filestore v1.8.0/go.mod h1:S5JCxIbFjeBhWMTfIYH2Jx24J6BqjwpkkPl+nBA5DlI=
+cloud.google.com/go/firestore v1.14.0 h1:8aLcKnMPoldYU3YHgu4t2exrKhLQkqaXAGqT0ljrFVw=
+cloud.google.com/go/firestore v1.14.0/go.mod h1:96MVaHLsEhbvkBEdZgfN+AS/GIkco1LRpH9Xp9YZfzQ=
+cloud.google.com/go/functions v1.15.4 h1:ZjdiV3MyumRM6++1Ixu6N0VV9LAGlCX4AhW6Yjr1t+U=
+cloud.google.com/go/functions v1.15.4/go.mod h1:CAsTc3VlRMVvx+XqXxKqVevguqJpnVip4DdonFsX28I=
+cloud.google.com/go/gkebackup v1.3.4 h1:KhnOrr9A1tXYIYeXKqCKbCI8TL2ZNGiD3dm+d7BDUBg=
+cloud.google.com/go/gkebackup v1.3.4/go.mod h1:gLVlbM8h/nHIs09ns1qx3q3eaXcGSELgNu1DWXYz1HI=
+cloud.google.com/go/gkeconnect v0.8.4 h1:1JLpZl31YhQDQeJ98tK6QiwTpgHFYRJwpntggpQQWis=
+cloud.google.com/go/gkeconnect v0.8.4/go.mod h1:84hZz4UMlDCKl8ifVW8layK4WHlMAFeq8vbzjU0yJkw=
+cloud.google.com/go/gkehub v0.14.4 h1:J5tYUtb3r0cl2mM7+YHvV32eL+uZQ7lONyUZnPikCEo=
+cloud.google.com/go/gkehub v0.14.4/go.mod h1:Xispfu2MqnnFt8rV/2/3o73SK1snL8s9dYJ9G2oQMfc=
+cloud.google.com/go/gkemulticloud v1.0.3 h1:NmJsNX9uQ2CT78957xnjXZb26TDIMvv+d5W2vVUt0Pg=
+cloud.google.com/go/gkemulticloud v1.0.3/go.mod h1:7NpJBN94U6DY1xHIbsDqB2+TFZUfjLUKLjUX8NGLor0=
+cloud.google.com/go/gsuiteaddons v1.6.4 h1:uuw2Xd37yHftViSI8J2hUcCS8S7SH3ZWH09sUDLW30Q=
+cloud.google.com/go/gsuiteaddons v1.6.4/go.mod h1:rxtstw7Fx22uLOXBpsvb9DUbC+fiXs7rF4U29KHM/pE=
+cloud.google.com/go/iam v1.1.5 h1:1jTsCu4bcsNsE4iiqNT5SHwrDRCfRmIaaaVFhRveTJI=
+cloud.google.com/go/iam v1.1.5/go.mod h1:rB6P/Ic3mykPbFio+vo7403drjlgvoWfYpJhMXEbzv8=
+cloud.google.com/go/iap v1.9.3 h1:M4vDbQ4TLXdaljXVZSwW7XtxpwXUUarY2lIs66m0aCM=
+cloud.google.com/go/iap v1.9.3/go.mod h1:DTdutSZBqkkOm2HEOTBzhZxh2mwwxshfD/h3yofAiCw=
+cloud.google.com/go/ids v1.4.4 h1:VuFqv2ctf/A7AyKlNxVvlHTzjrEvumWaZflUzBPz/M4=
+cloud.google.com/go/ids v1.4.4/go.mod h1:z+WUc2eEl6S/1aZWzwtVNWoSZslgzPxAboS0lZX0HjI=
+cloud.google.com/go/iot v1.7.4 h1:m1WljtkZnvLTIRYW1YTOv5A6H1yKgLHR6nU7O8yf27w=
+cloud.google.com/go/iot v1.7.4/go.mod h1:3TWqDVvsddYBG++nHSZmluoCAVGr1hAcabbWZNKEZLk=
+cloud.google.com/go/kms v1.15.5 h1:pj1sRfut2eRbD9pFRjNnPNg/CzJPuQAzUujMIM1vVeM=
+cloud.google.com/go/kms v1.15.5/go.mod h1:cU2H5jnp6G2TDpUGZyqTCoy1n16fbubHZjmVXSMtwDI=
+cloud.google.com/go/language v1.12.2 h1:zg9uq2yS9PGIOdc0Kz/l+zMtOlxKWonZjjo5w5YPG2A=
+cloud.google.com/go/language v1.12.2/go.mod h1:9idWapzr/JKXBBQ4lWqVX/hcadxB194ry20m/bTrhWc=
+cloud.google.com/go/lifesciences v0.9.4 h1:rZEI/UxcxVKEzyoRS/kdJ1VoolNItRWjNN0Uk9tfexg=
+cloud.google.com/go/lifesciences v0.9.4/go.mod h1:bhm64duKhMi7s9jR9WYJYvjAFJwRqNj+Nia7hF0Z7JA=
+cloud.google.com/go/logging v1.8.1 h1:26skQWPeYhvIasWKm48+Eq7oUqdcdbwsCVwz5Ys0FvU=
+cloud.google.com/go/logging v1.8.1/go.mod h1:TJjR+SimHwuC8MZ9cjByQulAMgni+RkXeI3wwctHJEI=
+cloud.google.com/go/longrunning v0.5.4 h1:w8xEcbZodnA2BbW6sVirkkoC+1gP8wS57EUUgGS0GVg=
+cloud.google.com/go/longrunning v0.5.4/go.mod h1:zqNVncI0BOP8ST6XQD1+VcvuShMmq7+xFSzOL++V0dI=
+cloud.google.com/go/managedidentities v1.6.4 h1:SF/u1IJduMqQQdJA4MDyivlIQ4SrV5qAawkr/ZEREkY=
+cloud.google.com/go/managedidentities v1.6.4/go.mod h1:WgyaECfHmF00t/1Uk8Oun3CQ2PGUtjc3e9Alh79wyiM=
+cloud.google.com/go/maps v1.6.1 h1:2+eMp/1MvMPp5qrSOd3vtnLKa/pylt+krVRqET3jWsM=
+cloud.google.com/go/maps v1.6.1/go.mod h1:4+buOHhYXFBp58Zj/K+Lc1rCmJssxxF4pJ5CJnhdz18=
+cloud.google.com/go/mediatranslation v0.8.4 h1:VRCQfZB4s6jN0CSy7+cO3m4ewNwgVnaePanVCQh/9Z4=
+cloud.google.com/go/mediatranslation v0.8.4/go.mod h1:9WstgtNVAdN53m6TQa5GjIjLqKQPXe74hwSCxUP6nj4=
+cloud.google.com/go/memcache v1.10.4 h1:cdex/ayDd294XBj2cGeMe6Y+H1JvhN8y78B9UW7pxuQ=
+cloud.google.com/go/memcache v1.10.4/go.mod h1:v/d8PuC8d1gD6Yn5+I3INzLR01IDn0N4Ym56RgikSI0=
+cloud.google.com/go/metastore v1.13.3 h1:94l/Yxg9oBZjin2bzI79oK05feYefieDq0o5fjLSkC8=
+cloud.google.com/go/metastore v1.13.3/go.mod h1:K+wdjXdtkdk7AQg4+sXS8bRrQa9gcOr+foOMF2tqINE=
+cloud.google.com/go/monitoring v1.16.3 h1:mf2SN9qSoBtIgiMA4R/y4VADPWZA7VCNJA079qLaZQ8=
+cloud.google.com/go/monitoring v1.16.3/go.mod h1:KwSsX5+8PnXv5NJnICZzW2R8pWTis8ypC4zmdRD63Tw=
+cloud.google.com/go/networkconnectivity v1.14.3 h1:e9lUkCe2BexsqsUc2bjV8+gFBpQa54J+/F3qKVtW+wA=
+cloud.google.com/go/networkconnectivity v1.14.3/go.mod h1:4aoeFdrJpYEXNvrnfyD5kIzs8YtHg945Og4koAjHQek=
+cloud.google.com/go/networkmanagement v1.9.3 h1:HsQk4FNKJUX04k3OI6gUsoveiHMGvDRqlaFM2xGyvqU=
+cloud.google.com/go/networkmanagement v1.9.3/go.mod h1:y7WMO1bRLaP5h3Obm4tey+NquUvB93Co1oh4wpL+XcU=
+cloud.google.com/go/networksecurity v0.9.4 h1:947tNIPnj1bMGTIEBo3fc4QrrFKS5hh0bFVsHmFm4Vo=
+cloud.google.com/go/networksecurity v0.9.4/go.mod h1:E9CeMZ2zDsNBkr8axKSYm8XyTqNhiCHf1JO/Vb8mD1w=
+cloud.google.com/go/notebooks v1.11.2 h1:eTOTfNL1yM6L/PCtquJwjWg7ZZGR0URFaFgbs8kllbM=
+cloud.google.com/go/notebooks v1.11.2/go.mod h1:z0tlHI/lREXC8BS2mIsUeR3agM1AkgLiS+Isov3SS70=
+cloud.google.com/go/optimization v1.6.2 h1:iFsoexcp13cGT3k/Hv8PA5aK+FP7FnbhwDO9llnruas=
+cloud.google.com/go/optimization v1.6.2/go.mod h1:mWNZ7B9/EyMCcwNl1frUGEuY6CPijSkz88Fz2vwKPOY=
+cloud.google.com/go/orchestration v1.8.4 h1:kgwZ2f6qMMYIVBtUGGoU8yjYWwMTHDanLwM/CQCFaoQ=
+cloud.google.com/go/orchestration v1.8.4/go.mod h1:d0lywZSVYtIoSZXb0iFjv9SaL13PGyVOKDxqGxEf/qI=
+cloud.google.com/go/orgpolicy v1.11.4 h1:RWuXQDr9GDYhjmrredQJC7aY7cbyqP9ZuLbq5GJGves=
+cloud.google.com/go/orgpolicy v1.11.4/go.mod h1:0+aNV/nrfoTQ4Mytv+Aw+stBDBjNf4d8fYRA9herfJI=
+cloud.google.com/go/osconfig v1.12.4 h1:OrRCIYEAbrbXdhm13/JINn9pQchvTTIzgmOCA7uJw8I=
+cloud.google.com/go/osconfig v1.12.4/go.mod h1:B1qEwJ/jzqSRslvdOCI8Kdnp0gSng0xW4LOnIebQomA=
+cloud.google.com/go/oslogin v1.12.2 h1:NP/KgsD9+0r9hmHC5wKye0vJXVwdciv219DtYKYjgqE=
+cloud.google.com/go/oslogin v1.12.2/go.mod h1:CQ3V8Jvw4Qo4WRhNPF0o+HAM4DiLuE27Ul9CX9g2QdY=
+cloud.google.com/go/phishingprotection v0.8.4 h1:sPLUQkHq6b4AL0czSJZ0jd6vL55GSTHz2B3Md+TCZI0=
+cloud.google.com/go/phishingprotection v0.8.4/go.mod h1:6b3kNPAc2AQ6jZfFHioZKg9MQNybDg4ixFd4RPZZ2nE=
+cloud.google.com/go/policytroubleshooter v1.10.2 h1:sq+ScLP83d7GJy9+wpwYJVnY+q6xNTXwOdRIuYjvHT4=
+cloud.google.com/go/policytroubleshooter v1.10.2/go.mod h1:m4uF3f6LseVEnMV6nknlN2vYGRb+75ylQwJdnOXfnv0=
+cloud.google.com/go/privatecatalog v0.9.4 h1:Vo10IpWKbNvc/z/QZPVXgCiwfjpWoZ/wbgful4Uh/4E=
+cloud.google.com/go/privatecatalog v0.9.4/go.mod h1:SOjm93f+5hp/U3PqMZAHTtBtluqLygrDrVO8X8tYtG0=
+cloud.google.com/go/pubsub v1.33.0 h1:6SPCPvWav64tj0sVX/+npCBKhUi/UjJehy9op/V3p2g=
+cloud.google.com/go/pubsub v1.33.0/go.mod h1:f+w71I33OMyxf9VpMVcZbnG5KSUkCOUHYpFd5U1GdRc=
+cloud.google.com/go/pubsublite v1.8.1 h1:pX+idpWMIH30/K7c0epN6V703xpIcMXWRjKJsz0tYGY=
+cloud.google.com/go/pubsublite v1.8.1/go.mod h1:fOLdU4f5xldK4RGJrBMm+J7zMWNj/k4PxwEZXy39QS0=
+cloud.google.com/go/recaptchaenterprise/v2 v2.8.4 h1:KOlLHLv3h3HwcZAkx91ubM3Oztz3JtT3ZacAJhWDorQ=
+cloud.google.com/go/recaptchaenterprise/v2 v2.8.4/go.mod h1:Dak54rw6lC2gBY8FBznpOCAR58wKf+R+ZSJRoeJok4w=
+cloud.google.com/go/recommendationengine v0.8.4 h1:JRiwe4hvu3auuh2hujiTc2qNgPPfVp+Q8KOpsXlEzKQ=
+cloud.google.com/go/recommendationengine v0.8.4/go.mod h1:GEteCf1PATl5v5ZsQ60sTClUE0phbWmo3rQ1Js8louU=
+cloud.google.com/go/recommender v1.11.3 h1:VndmgyS/J3+izR8V8BHa7HV/uun8//ivQ3k5eVKKyyM=
+cloud.google.com/go/recommender v1.11.3/go.mod h1:+FJosKKJSId1MBFeJ/TTyoGQZiEelQQIZMKYYD8ruK4=
+cloud.google.com/go/redis v1.14.1 h1:J9cEHxG9YLmA9o4jTSvWt/RuVEn6MTrPlYSCRHujxDQ=
+cloud.google.com/go/redis v1.14.1/go.mod h1:MbmBxN8bEnQI4doZPC1BzADU4HGocHBk2de3SbgOkqs=
+cloud.google.com/go/resourcemanager v1.9.4 h1:JwZ7Ggle54XQ/FVYSBrMLOQIKoIT/uer8mmNvNLK51k=
+cloud.google.com/go/resourcemanager v1.9.4/go.mod h1:N1dhP9RFvo3lUfwtfLWVxfUWq8+KUQ+XLlHLH3BoFJ0=
+cloud.google.com/go/resourcesettings v1.6.4 h1:yTIL2CsZswmMfFyx2Ic77oLVzfBFoWBYgpkgiSPnC4Y=
+cloud.google.com/go/resourcesettings v1.6.4/go.mod h1:pYTTkWdv2lmQcjsthbZLNBP4QW140cs7wqA3DuqErVI=
+cloud.google.com/go/retail v1.14.4 h1:geqdX1FNqqL2p0ADXjPpw8lq986iv5GrVcieTYafuJQ=
+cloud.google.com/go/retail v1.14.4/go.mod h1:l/N7cMtY78yRnJqp5JW8emy7MB1nz8E4t2yfOmklYfg=
+cloud.google.com/go/run v1.3.3 h1:qdfZteAm+vgzN1iXzILo3nJFQbzziudkJrvd9wCf3FQ=
+cloud.google.com/go/run v1.3.3/go.mod h1:WSM5pGyJ7cfYyYbONVQBN4buz42zFqwG67Q3ch07iK4=
+cloud.google.com/go/scheduler v1.10.5 h1:eMEettHlFhG5pXsoHouIM5nRT+k+zU4+GUvRtnxhuVI=
+cloud.google.com/go/scheduler v1.10.5/go.mod h1:MTuXcrJC9tqOHhixdbHDFSIuh7xZF2IysiINDuiq6NI=
+cloud.google.com/go/secretmanager v1.11.4 h1:krnX9qpG2kR2fJ+u+uNyNo+ACVhplIAS4Pu7u+4gd+k=
+cloud.google.com/go/secretmanager v1.11.4/go.mod h1:wreJlbS9Zdq21lMzWmJ0XhWW2ZxgPeahsqeV/vZoJ3w=
+cloud.google.com/go/security v1.15.4 h1:sdnh4Islb1ljaNhpIXlIPgb3eYj70QWgPVDKOUYvzJc=
+cloud.google.com/go/security v1.15.4/go.mod h1:oN7C2uIZKhxCLiAAijKUCuHLZbIt/ghYEo8MqwD/Ty4=
+cloud.google.com/go/securitycenter v1.24.2 h1:qCEyXoJoxNKKA1bDywBjjqCB7ODXazzHnVWnG5Uqd1M=
+cloud.google.com/go/securitycenter v1.24.2/go.mod h1:l1XejOngggzqwr4Fa2Cn+iWZGf+aBLTXtB/vXjy5vXM=
+cloud.google.com/go/servicedirectory v1.11.3 h1:5niCMfkw+jifmFtbBrtRedbXkJm3fubSR/KHbxSJZVM=
+cloud.google.com/go/servicedirectory v1.11.3/go.mod h1:LV+cHkomRLr67YoQy3Xq2tUXBGOs5z5bPofdq7qtiAw=
+cloud.google.com/go/shell v1.7.4 h1:nurhlJcSVFZneoRZgkBEHumTYf/kFJptCK2eBUq/88M=
+cloud.google.com/go/shell v1.7.4/go.mod h1:yLeXB8eKLxw0dpEmXQ/FjriYrBijNsONpwnWsdPqlKM=
+cloud.google.com/go/spanner v1.53.0 h1:/NzWQJ1MEhdRcffiutRKbW/AIGVKhcTeivWTDjEyCCo=
+cloud.google.com/go/spanner v1.53.0/go.mod h1:liG4iCeLqm5L3fFLU5whFITqP0e0orsAW1uUSrd4rws=
+cloud.google.com/go/speech v1.21.0 h1:qkxNao58oF8ghAHE1Eghen7XepawYEN5zuZXYWaUTA4=
+cloud.google.com/go/speech v1.21.0/go.mod h1:wwolycgONvfz2EDU8rKuHRW3+wc9ILPsAWoikBEWavY=
+cloud.google.com/go/storagetransfer v1.10.3 h1:YM1dnj5gLjfL6aDldO2s4GeU8JoAvH1xyIwXre63KmI=
+cloud.google.com/go/storagetransfer v1.10.3/go.mod h1:Up8LY2p6X68SZ+WToswpQbQHnJpOty/ACcMafuey8gc=
+cloud.google.com/go/talent v1.6.5 h1:LnRJhhYkODDBoTwf6BeYkiJHFw9k+1mAFNyArwZUZAs=
+cloud.google.com/go/talent v1.6.5/go.mod h1:Mf5cma696HmE+P2BWJ/ZwYqeJXEeU0UqjHFXVLadEDI=
+cloud.google.com/go/texttospeech v1.7.4 h1:ahrzTgr7uAbvebuhkBAAVU6kRwVD0HWsmDsvMhtad5Q=
+cloud.google.com/go/texttospeech v1.7.4/go.mod h1:vgv0002WvR4liGuSd5BJbWy4nDn5Ozco0uJymY5+U74=
+cloud.google.com/go/tpu v1.6.4 h1:XIEH5c0WeYGaVy9H+UueiTaf3NI6XNdB4/v6TFQJxtE=
+cloud.google.com/go/tpu v1.6.4/go.mod h1:NAm9q3Rq2wIlGnOhpYICNI7+bpBebMJbh0yyp3aNw1Y=
+cloud.google.com/go/trace v1.10.4 h1:2qOAuAzNezwW3QN+t41BtkDJOG42HywL73q8x/f6fnM=
+cloud.google.com/go/trace v1.10.4/go.mod h1:Nso99EDIK8Mj5/zmB+iGr9dosS/bzWCJ8wGmE6TXNWY=
+cloud.google.com/go/translate v1.9.3 h1:t5WXTqlrk8VVJu/i3WrYQACjzYJiff5szARHiyqqPzI=
+cloud.google.com/go/translate v1.9.3/go.mod h1:Kbq9RggWsbqZ9W5YpM94Q1Xv4dshw/gr/SHfsl5yCZ0=
+cloud.google.com/go/video v1.20.3 h1:Xrpbm2S9UFQ1pZEeJt9Vqm5t2T/z9y/M3rNXhFoo8Is=
+cloud.google.com/go/video v1.20.3/go.mod h1:TnH/mNZKVHeNtpamsSPygSR0iHtvrR/cW1/GDjN5+GU=
+cloud.google.com/go/videointelligence v1.11.4 h1:YS4j7lY0zxYyneTFXjBJUj2r4CFe/UoIi/PJG0Zt/Rg=
+cloud.google.com/go/videointelligence v1.11.4/go.mod h1:kPBMAYsTPFiQxMLmmjpcZUMklJp3nC9+ipJJtprccD8=
+cloud.google.com/go/vision/v2 v2.7.5 h1:T/ujUghvEaTb+YnFY/jiYwVAkMbIC8EieK0CJo6B4vg=
+cloud.google.com/go/vision/v2 v2.7.5/go.mod h1:GcviprJLFfK9OLf0z8Gm6lQb6ZFUulvpZws+mm6yPLM=
+cloud.google.com/go/vmmigration v1.7.4 h1:qPNdab4aGgtaRX+51jCOtJxlJp6P26qua4o1xxUDjpc=
+cloud.google.com/go/vmmigration v1.7.4/go.mod h1:yBXCmiLaB99hEl/G9ZooNx2GyzgsjKnw5fWcINRgD70=
+cloud.google.com/go/vmwareengine v1.0.3 h1:WY526PqM6QNmFHSqe2sRfK6gRpzWjmL98UFkql2+JDM=
+cloud.google.com/go/vmwareengine v1.0.3/go.mod h1:QSpdZ1stlbfKtyt6Iu19M6XRxjmXO+vb5a/R6Fvy2y4=
+cloud.google.com/go/vpcaccess v1.7.4 h1:zbs3V+9ux45KYq8lxxn/wgXole6SlBHHKKyZhNJoS+8=
+cloud.google.com/go/vpcaccess v1.7.4/go.mod h1:lA0KTvhtEOb/VOdnH/gwPuOzGgM+CWsmGu6bb4IoMKk=
+cloud.google.com/go/webrisk v1.9.4 h1:iceR3k0BCRZgf2D/NiKviVMFfuNC9LmeNLtxUFRB/wI=
+cloud.google.com/go/webrisk v1.9.4/go.mod h1:w7m4Ib4C+OseSr2GL66m0zMBywdrVNTDKsdEsfMl7X0=
+cloud.google.com/go/websecurityscanner v1.6.4 h1:5Gp7h5j7jywxLUp6NTpjNPkgZb3ngl0tUSw6ICWvtJQ=
+cloud.google.com/go/websecurityscanner v1.6.4/go.mod h1:mUiyMQ+dGpPPRkHgknIZeCzSHJ45+fY4F52nZFDHm2o=
+cloud.google.com/go/workflows v1.12.3 h1:qocsqETmLAl34mSa01hKZjcqAvt699gaoFbooGGMvaM=
+cloud.google.com/go/workflows v1.12.3/go.mod h1:fmOUeeqEwPzIU81foMjTRQIdwQHADi/vEr1cx9R1m5g=
+dario.cat/mergo v1.0.0 h1:AGCNq9Evsj31mOgNPcLyXc+4PNABt905YmuqPYYpBWk=
+dario.cat/mergo v1.0.0/go.mod h1:uNxQE+84aUszobStD9th8a29P2fMDhsBdgRYvZOxGmk=
 github.com/Azure/agentbaker v0.20240503.0/go.mod h1:4taz9ipeevqDxKnnLmD3+e/xBfsvj9MSuSjGXDSfK7Q=
+github.com/BurntSushi/toml v0.3.1 h1:WXkYYl6Yr3qBf1K79EBnL4mak0OimBfB0XUf9Vl28OQ=
 github.com/NYTimes/gziphandler v0.0.0-20170623195520-56545f4a5d46 h1:lsxEuwrXEAokXB9qhlbKWPpo3KMLZQ5WB5WLQRW1uq0=
 github.com/NYTimes/gziphandler v0.0.0-20170623195520-56545f4a5d46/go.mod h1:3wb06e3pkSAbeQ52E9H9iFoQsEEwGN64994WTCIhntQ=
+github.com/OneOfOne/xxhash v1.2.8 h1:31czK/TI9sNkxIKfaUfGlU47BAxQ0ztGgd9vPyqimf8=
+github.com/OneOfOne/xxhash v1.2.8/go.mod h1:eZbhyaAYD41SGSSsnmcpxVoRiQ/MPUTjUdIIOT9Um7Q=
+github.com/agnivade/levenshtein v1.0.1 h1:3oJU7J3FGFmyhn8KHjmVaZCN5hxTr7GxgRue+sxIXdQ=
+github.com/agnivade/levenshtein v1.0.1/go.mod h1:CURSv5d9Uaml+FovSIICkLbAUZ9S4RqaHDIsdSBg7lM=
+github.com/akavel/rsrc v0.10.2 h1:Zxm8V5eI1hW4gGaYsJQUhxpjkENuG91ki8B4zCrvEsw=
+github.com/akavel/rsrc v0.10.2/go.mod h1:uLoCtb9J+EyAqh+26kdrTgmzRBFPGOolLWKpdxkKq+c=
 github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a h1:idn718Q4B6AGu/h5Sxe66HYVdqdGu2l9Iebqhi/AEoA=
 github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a/go.mod h1:lB+ZfQJz7igIIfQNfa7Ml4HSf2uFQQRzpGGRXenZAgY=
+github.com/blang/semver/v4 v4.0.0 h1:1PFHFE6yCCTv8C1TeyNNarDzntLi7wMI5i/pzqYIsAM=
+github.com/blang/semver/v4 v4.0.0/go.mod h1:IbckMUScFkM3pff0VJDNKRiT6TG/YpiHIM2yvyW5YoQ=
+github.com/cenkalti/backoff/v4 v4.2.1 h1:y4OZtCnogmCPw98Zjyt5a6+QwPLGkiQsYW5oUqylYbM=
+github.com/cenkalti/backoff/v4 v4.2.1/go.mod h1:Y3VNntkOUPxTVeUxJ/G5vcM//AlwfmyYozVcomhLiZE=
+github.com/census-instrumentation/opencensus-proto v0.4.1 h1:iKLQ0xPNFxR/2hzXZMrBo8f1j86j5WHzznCCQxV/b8g=
+github.com/census-instrumentation/opencensus-proto v0.4.1/go.mod h1:4T9NM4+4Vw91VeyqjLS6ao50K5bOcLKN6Q42XnYaRYw=
+github.com/cespare/xxhash/v2 v2.2.0 h1:DC2CZ1Ep5Y4k3ZQ899DldepgrayRUGE6BBZ/cd9Cj44=
+github.com/cespare/xxhash/v2 v2.2.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
 github.com/chromedp/cdproto v0.0.0-20230802225258-3cf4e6d46a89 h1:aPflPkRFkVwbW6dmcVqfgwp1i+UWGFH6VgR1Jim5Ygc=
 github.com/chromedp/cdproto v0.0.0-20230802225258-3cf4e6d46a89/go.mod h1:GKljq0VrfU4D5yc+2qA6OVr8pmO/MBbPEWqWQ/oqGEs=
 github.com/chromedp/chromedp v0.9.2 h1:dKtNz4kApb06KuSXoTQIyUC2TrA0fhGDwNZf3bcgfKw=
@@ -17,66 +266,237 @@ github.com/chzyer/readline v1.5.1 h1:upd/6fQk4src78LMRzh5vItIt361/o4uq553V8B5sGI
 github.com/chzyer/readline v1.5.1/go.mod h1:Eh+b79XXUwfKfcPLepksvw2tcLE/Ct21YObkaSkeBlk=
 github.com/chzyer/test v1.0.0 h1:p3BQDXSxOhOG0P9z6/hGnII4LGiEPOYBhs8asl/fC04=
 github.com/chzyer/test v1.0.0/go.mod h1:2JlltgoNkt4TW/z9V/IzDdFaMTM2JPIi26O1pF38GC8=
+github.com/cilium/ebpf v0.9.1 h1:64sn2K3UKw8NbP/blsixRpF3nXuyhz/VjRlRzvlBRu4=
+github.com/cilium/ebpf v0.9.1/go.mod h1:+OhNOIXx/Fnu1IE8bJz2dzOA+VSfyTfdNUVdlQnxUFY=
+github.com/client9/misspell v0.3.4 h1:ta993UF76GwbvJcIo3Y68y/M3WxlpEHPWIGDkJYwzJI=
+github.com/cncf/udpa/go v0.0.0-20220112060539-c52dc94e7fbe h1:QQ3GSy+MqSHxm/d8nCtnAiZdYFd45cYZPs8vOOIYKfk=
+github.com/cncf/udpa/go v0.0.0-20220112060539-c52dc94e7fbe/go.mod h1:6pvJx4me5XPnfI9Z40ddWsdw2W/uZgQLFXToKeRcDiI=
+github.com/cncf/xds/go v0.0.0-20230607035331-e9ce68804cb4 h1:/inchEIKaYC1Akx+H+gqO04wryn5h75LSazbRlnya1k=
+github.com/cncf/xds/go v0.0.0-20230607035331-e9ce68804cb4/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs=
+github.com/containerd/aufs v1.0.0 h1:2oeJiwX5HstO7shSrPZjrohJZLzK36wvpdmzDRkL/LY=
+github.com/containerd/aufs v1.0.0/go.mod h1:kL5kd6KM5TzQjR79jljyi4olc1Vrx6XBlcyj3gNv2PU=
+github.com/containerd/btrfs/v2 v2.0.0 h1:FN4wsx7KQrYoLXN7uLP0vBV4oVWHOIKDRQ1G2Z0oL5M=
+github.com/containerd/btrfs/v2 v2.0.0/go.mod h1:swkD/7j9HApWpzl8OHfrHNxppPd9l44DFZdF94BUj9k=
+github.com/containerd/cgroups/v3 v3.0.2 h1:f5WFqIVSgo5IZmtTT3qVBo6TzI1ON6sycSBKkymb9L0=
+github.com/containerd/cgroups/v3 v3.0.2/go.mod h1:JUgITrzdFqp42uI2ryGA+ge0ap/nxzYgkGmIcetmErE=
+github.com/containerd/go-cni v1.1.9 h1:ORi7P1dYzCwVM6XPN4n3CbkuOx/NZ2DOqy+SHRdo9rU=
+github.com/containerd/go-cni v1.1.9/go.mod h1:XYrZJ1d5W6E2VOvjffL3IZq0Dz6bsVlERHbekNK90PM=
+github.com/containerd/go-runc v1.0.0 h1:oU+lLv1ULm5taqgV/CJivypVODI4SUz1znWjv3nNYS0=
+github.com/containerd/go-runc v1.0.0/go.mod h1:cNU0ZbCgCQVZK4lgG3P+9tn9/PaJNmoDXPpoJhDR+Ok=
+github.com/containerd/imgcrypt v1.1.8 h1:ZS7TuywcRNLoHpU0g+v4/PsKynl6TYlw5xDVWWoIyFA=
+github.com/containerd/imgcrypt v1.1.8/go.mod h1:x6QvFIkMyO2qGIY2zXc88ivEzcbgvLdWjoZyGqDap5U=
+github.com/containerd/nri v0.6.1 h1:xSQ6elnQ4Ynidm9u49ARK9wRKHs80HCUI+bkXOxV4mA=
+github.com/containerd/nri v0.6.1/go.mod h1:7+sX3wNx+LR7RzhjnJiUkFDhn18P5Bg/0VnJ/uXpRJM=
+github.com/containerd/stargz-snapshotter/estargz v0.14.3 h1:OqlDCK3ZVUO6C3B/5FSkDwbkEETK84kQgEeFwDC+62k=
+github.com/containerd/stargz-snapshotter/estargz v0.14.3/go.mod h1:KY//uOCIkSuNAHhJogcZtrNHdKrA99/FCCRjE3HD36o=
+github.com/containerd/typeurl v1.0.2 h1:Chlt8zIieDbzQFzXzAeBEF92KhExuE4p9p92/QmY7aY=
+github.com/containerd/typeurl v1.0.2/go.mod h1:9trJWW2sRlGub4wZJRTW83VtbOLS6hwcDZXTn6oPz9s=
+github.com/containerd/zfs v1.1.0 h1:n7OZ7jZumLIqNJqXrEc/paBM840mORnmGdJDmAmJZHM=
+github.com/containerd/zfs v1.1.0/go.mod h1:oZF9wBnrnQjpWLaPKEinrx3TQ9a+W/RJO7Zb41d8YLE=
+github.com/containernetworking/cni v1.1.2 h1:wtRGZVv7olUHMOqouPpn3cXJWpJgM6+EUl31EQbXALQ=
+github.com/containernetworking/cni v1.1.2/go.mod h1:sDpYKmGVENF3s6uvMvGgldDWeG8dMxakj/u+i9ht9vw=
+github.com/containernetworking/plugins v1.2.0 h1:SWgg3dQG1yzUo4d9iD8cwSVh1VqI+bP7mkPDoSfP9VU=
+github.com/containernetworking/plugins v1.2.0/go.mod h1:/VjX4uHecW5vVimFa1wkG4s+r/s9qIfPdqlLF4TW8c4=
+github.com/containers/ocicrypt v1.1.10 h1:r7UR6o8+lyhkEywetubUUgcKFjOWOaWz8cEBrCPX0ic=
+github.com/containers/ocicrypt v1.1.10/go.mod h1:YfzSSr06PTHQwSTUKqDSjish9BeW1E4HUmreluQcMd8=
+github.com/coreos/go-systemd/v22 v22.5.0 h1:RrqgGjYQKalulkV8NGVIfkXQf6YYmOyiJKk8iXXhfZs=
+github.com/coreos/go-systemd/v22 v22.5.0/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc=
 github.com/cpuguy83/go-md2man/v2 v2.0.2 h1:p1EgwI/C7NhT0JmVkwCD2ZBK8j4aeHQX2pMHHBfMQ6w=
 github.com/creack/pty v1.1.9 h1:uDmaGzcdjhF4i/plgjmEsriH11Y0o7RKapEf/LDaM3w=
+github.com/cyphar/filepath-securejoin v0.2.3 h1:YX6ebbZCZP7VkM3scTTokDgBL2TY741X51MTk3ycuNI=
+github.com/cyphar/filepath-securejoin v0.2.3/go.mod h1:aPGpWjXOXUn2NCNjFvBE6aRxGGx79pTxQpKOJNYHHl4=
+github.com/decred/dcrd/dcrec/secp256k1/v4 v4.0.0-20210816181553-5444fa50b93d h1:1iy2qD6JEhHKKhUOA9IWs7mjco7lnw2qx8FsRI2wirE=
+github.com/decred/dcrd/dcrec/secp256k1/v4 v4.0.0-20210816181553-5444fa50b93d/go.mod h1:tmAIfUFEirG/Y8jhZ9M+h36obRZAk/1fcSpXwAVlfqE=
 github.com/dnaeon/go-vcr v1.2.0 h1:zHCHvJYTMh1N7xnV7zf1m1GPBF9Ad0Jk/whtQ1663qI=
 github.com/dnaeon/go-vcr v1.2.0/go.mod h1:R4UdLID7HZT3taECzJs4YgbbH6PIGXB6W/sc5OLb6RQ=
+github.com/docker/cli v23.0.3+incompatible h1:Zcse1DuDqBdgI7OQDV8Go7b83xLgfhW1eza4HfEdxpY=
+github.com/docker/cli v23.0.3+incompatible/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8=
+github.com/docker/distribution v2.8.1+incompatible h1:Q50tZOPR6T/hjNsyc9g8/syEs6bk8XXApsHjKukMl68=
+github.com/docker/distribution v2.8.1+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w=
+github.com/docker/docker v23.0.3+incompatible h1:9GhVsShNWz1hO//9BNg/dpMnZW25KydO4wtVxWAIbho=
+github.com/docker/docker v23.0.3+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
+github.com/docker/docker-credential-helpers v0.7.0 h1:xtCHsjxogADNZcdv1pKUHXryefjlVRqWqIhk/uXJp0A=
+github.com/docker/docker-credential-helpers v0.7.0/go.mod h1:rETQfLdHNT3foU5kuNkFR1R1V12OJRRO5lzt2D1b5X0=
+github.com/docker/go-connections v0.4.0 h1:El9xVISelRB7BuFusrZozjnkIM5YnzCViNKohAFqRJQ=
+github.com/docker/go-connections v0.4.0/go.mod h1:Gbd7IOopHjR8Iph03tsViu4nIes5XhDvyHbTtUxmeec=
+github.com/docker/go-metrics v0.0.1 h1:AgB/0SvBxihN0X8OR4SjsblXkbMvalQ8cjmtKQ2rQV8=
+github.com/docker/go-metrics v0.0.1/go.mod h1:cG1hvH2utMXtqgqqYE9plW6lDxS3/5ayHzueweSI3Vw=
+github.com/envoyproxy/go-control-plane v0.11.1 h1:wSUXTlLfiAQRWs2F+p+EKOY9rUyis1MyGqJ2DIk5HpM=
+github.com/envoyproxy/go-control-plane v0.11.1/go.mod h1:uhMcXKCQMEJHiAb0w+YGefQLaTEw+YhGluxZkrTmD0g=
+github.com/envoyproxy/protoc-gen-validate v1.0.2 h1:QkIBuU5k+x7/QXPvPPnWXWlCdaBFApVqftFV6k087DA=
+github.com/envoyproxy/protoc-gen-validate v1.0.2/go.mod h1:GpiZQP3dDbg4JouG/NNS7QWXpgx6x8QiMKdmN72jogE=
 github.com/evanphx/json-patch v4.12.0+incompatible h1:4onqiflcdA9EOZ4RxV643DvftH5pOlLGNtQ5lPWQu84=
 github.com/evanphx/json-patch v4.12.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk=
+github.com/ghodss/yaml v1.0.0 h1:wQHKEahhL6wmXdzwWG11gIVCkOv05bNOh+Rxn0yngAk=
+github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04=
+github.com/go-jose/go-jose/v3 v3.0.3 h1:fFKWeig/irsp7XD2zBxvnmA/XaRWp5V3CBsZXJF7G7k=
+github.com/go-jose/go-jose/v3 v3.0.3/go.mod h1:5b+7YgP7ZICgJDBdfjZaIt+H/9L9T/YQrVfLAMboGkQ=
 github.com/go-logr/logr v1.4.1 h1:pKouT5E8xu9zeFC39JXRDukb6JFQPXM5p5I91188VAQ=
 github.com/go-logr/logr v1.4.1/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY=
+github.com/gobwas/glob v0.2.3 h1:A4xDbljILXROh+kObIiy5kIaPYD8e96x1tgBhUI5J+Y=
+github.com/gobwas/glob v0.2.3/go.mod h1:d3Ez4x06l9bZtSvzIay5+Yzi0fmZzPgnTbPcKjJAkT8=
 github.com/gobwas/httphead v0.1.0 h1:exrUm0f4YX0L7EBwZHuCF4GDp8aJfVeBrlLQrs6NqWU=
 github.com/gobwas/httphead v0.1.0/go.mod h1:O/RXo79gxV8G+RqlR/otEwx4Q36zl9rqC5u12GKvMCM=
 github.com/gobwas/pool v0.2.1 h1:xfeeEhW7pwmX8nuLVlqbzVc7udMDrwetjEv+TZIz1og=
 github.com/gobwas/pool v0.2.1/go.mod h1:q8bcK0KcYlCgd9e7WYLm9LpyS+YeLd8JVDW6WezmKEw=
 github.com/gobwas/ws v1.2.1 h1:F2aeBZrm2NDsc7vbovKrWSogd4wvfAxg0FQ89/iqOTk=
 github.com/gobwas/ws v1.2.1/go.mod h1:hRKAFb8wOxFROYNsT1bqfWnhX+b5MFeJM9r2ZSwg/KY=
-github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da h1:oI5xCqsCo564l8iNU+DwB5epxmsaqB+rhGL0m5jtYqE=
-github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
-github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk=
+github.com/goccy/go-json v0.9.7 h1:IcB+Aqpx/iMHu5Yooh7jEzJk1JZ7Pjtmys2ukPr7EeM=
+github.com/goccy/go-json v0.9.7/go.mod h1:6MelG93GURQebXPDq3khkgXZkazVtN9CRI+MGFi0w8I=
+github.com/godbus/dbus/v5 v5.1.0 h1:4KLkAxT3aOY8Li4FRJe/KvhoNFFxo0m6fNuFUO8QJUk=
+github.com/godbus/dbus/v5 v5.1.0/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA=
+github.com/golang/glog v1.1.2 h1:DVjP2PbBOzHyzA+dn3WhHIq4NdVu3Q+pvivFICf/7fo=
+github.com/golang/glog v1.1.2/go.mod h1:zR+okUeTbrL6EL3xHUDxZuEtGv04p5shwip1+mL/rLQ=
+github.com/golang/mock v1.6.0 h1:ErTB+efbowRARo13NNdxyJji2egdxLGQhRaY+DUumQc=
+github.com/golang/mock v1.6.0/go.mod h1:p6yTPP+5HYm5mzsMV8JkE6ZKdX+/wYM6Hr+LicevLPs=
 github.com/google/btree v1.0.1 h1:gK4Kx5IaGY9CD5sPJ36FHiBJ6ZXl0kilRiiCj+jdYp4=
 github.com/google/btree v1.0.1/go.mod h1:xXMiIv4Fb/0kKde4SpL7qlzvu5cMJDRkFDxJfI9uaxA=
 github.com/google/gnostic v0.5.7-v3refs h1:FhTMOKj2VhjpouxvWJAV1TL304uMlb9zcDqkl6cEI54=
 github.com/google/gnostic v0.5.7-v3refs/go.mod h1:73MKFl6jIHelAJNaBGFzt3SPtZULs9dYrGFt8OiIsHQ=
-github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
+github.com/google/go-containerregistry v0.14.0 h1:z58vMqHxuwvAsVwvKEkmVBz2TlgBgH5k6koEXBtlYkw=
+github.com/google/go-containerregistry v0.14.0/go.mod h1:aiJ2fp/SXvkWgmYHioXnbMdlgB8eXiiYOY55gfN91Wk=
 github.com/google/pprof v0.0.0-20240424215950-a892ee059fd6 h1:k7nVchz72niMH6YLQNvHSdIE7iqsQxK1P41mySCvssg=
 github.com/google/pprof v0.0.0-20240424215950-a892ee059fd6/go.mod h1:kf6iHlnVGwgKolg33glAes7Yg/8iWP8ukqeldJSO7jw=
 github.com/gregjones/httpcache v0.0.0-20180305231024-9cad4c3443a7 h1:pdN6V1QBWetyv/0+wjACpqVH+eVULgEjkurDLq3goeM=
 github.com/gregjones/httpcache v0.0.0-20180305231024-9cad4c3443a7/go.mod h1:FecbI9+v66THATjSRHfNgh1IVFe/9kFxbXtjV0ctIMA=
+github.com/grpc-ecosystem/go-grpc-middleware v1.3.0 h1:+9834+KizmvFV7pXQGSXQTsaWhq2GjuNUt0aUU0YBYw=
+github.com/grpc-ecosystem/go-grpc-middleware v1.3.0/go.mod h1:z0ButlSOZa5vEBq9m2m2hlwIgKw+rp3sdCBRoJY+30Y=
+github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 h1:Ovs26xHkKqVztRpIrF/92BcuyuQ/YW4NSIpoGtfXNho=
+github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod h1:8NvIoxWQoOIhqOTXgfV/d3M/q6VIi02HzZEHgUlZvzk=
+github.com/grpc-ecosystem/grpc-gateway/v2 v2.16.0 h1:YBftPWNWd4WwGqtY2yeZL2ef8rHAxPBD8KFhJpmcqms=
+github.com/grpc-ecosystem/grpc-gateway/v2 v2.16.0/go.mod h1:YN5jB8ie0yfIUg6VvR9Kz84aCaG7AsGZnLjhHbUqwPg=
+github.com/hashicorp/errwrap v1.1.0 h1:OxrOeh75EUXMY8TBjag2fzXGZ40LB6IKw45YeGUDY2I=
+github.com/hashicorp/errwrap v1.1.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4=
+github.com/hashicorp/go-multierror v1.1.1 h1:H5DkEtf6CXdFp0N0Em5UCwQpXMWke8IA0+lD48awMYo=
+github.com/hashicorp/go-multierror v1.1.1/go.mod h1:iw975J/qwKPdAO1clOe2L8331t/9/fmwbPZ6JB6eMoM=
 github.com/hpcloud/tail v1.0.0 h1:nfCOvKYfkgYP8hkirhJocXT2+zOD8yUNjXaWfTlyFKI=
 github.com/ianlancetaylor/demangle v0.0.0-20240312041847-bd984b5ce465 h1:KwWnWVWCNtNq/ewIX7HIKnELmEx2nDP42yskD/pi7QE=
 github.com/ianlancetaylor/demangle v0.0.0-20240312041847-bd984b5ce465/go.mod h1:gx7rwoVhcfuVKG5uya9Hs3Sxj7EIvldVofAWIUtGouw=
+github.com/intel/goresctrl v0.3.0 h1:K2D3GOzihV7xSBedGxONSlaw/un1LZgWsc9IfqipN4c=
+github.com/intel/goresctrl v0.3.0/go.mod h1:fdz3mD85cmP9sHD8JUlrNWAxvwM86CrbmVXltEKd7zk=
 github.com/jessevdk/go-flags v1.4.0 h1:4IU2WS7AumrZ/40jfhf4QVDMsQwqA7VEHozFRrGARJA=
+github.com/josephspurrier/goversioninfo v1.4.0 h1:Puhl12NSHUSALHSuzYwPYQkqa2E1+7SrtAPJorKK0C8=
+github.com/josephspurrier/goversioninfo v1.4.0/go.mod h1:JWzv5rKQr+MmW+LvM412ToT/IkYDZjaclF2pKDss8IY=
 github.com/kisielk/errcheck v1.5.0 h1:e8esj/e4R+SAOwFwN+n3zr0nYeCyeweozKfO23MvHzY=
 github.com/kisielk/gotool v1.0.0 h1:AV2c/EiW3KqPNT9ZKl07ehoAGi4C5/01Cfbblndcapg=
+github.com/klauspost/cpuid/v2 v2.0.4 h1:g0I61F2K2DjRHz1cnxlkNSBIaePVoJIjjnHui8QHbiw=
+github.com/klauspost/cpuid/v2 v2.0.4/go.mod h1:FInQzS24/EEf25PyTYn52gqo7WaD8xa0213Md/qVLRg=
 github.com/kr/pty v1.1.1 h1:VkoXIwSboBpnk99O/KFauAEILuNHv5DVFKZMBN/gUgw=
 github.com/ledongthuc/pdf v0.0.0-20220302134840-0c2507a12d80 h1:6Yzfa6GP0rIo/kULo2bwGEkFvCePZ3qHDDTC3/J9Swo=
 github.com/ledongthuc/pdf v0.0.0-20220302134840-0c2507a12d80/go.mod h1:imJHygn/1yfhB7XSJJKlFZKl/J+dCPAknuiaGOshXAs=
+github.com/lestrrat-go/backoff/v2 v2.0.8 h1:oNb5E5isby2kiro9AgdHLv5N5tint1AnDVVf2E2un5A=
+github.com/lestrrat-go/backoff/v2 v2.0.8/go.mod h1:rHP/q/r9aT27n24JQLa7JhSQZCKBBOiM/uP402WwN8Y=
+github.com/lestrrat-go/blackmagic v1.0.0 h1:XzdxDbuQTz0RZZEmdU7cnQxUtFUzgCSPq8RCz4BxIi4=
+github.com/lestrrat-go/blackmagic v1.0.0/go.mod h1:TNgH//0vYSs8VXDCfkZLgIrVTTXQELZffUV0tz3MtdQ=
+github.com/lestrrat-go/httpcc v1.0.1 h1:ydWCStUeJLkpYyjLDHihupbn2tYmZ7m22BGkcvZZrIE=
+github.com/lestrrat-go/httpcc v1.0.1/go.mod h1:qiltp3Mt56+55GPVCbTdM9MlqhvzyuL6W/NMDA8vA5E=
+github.com/lestrrat-go/iter v1.0.1 h1:q8faalr2dY6o8bV45uwrxq12bRa1ezKrB6oM9FUgN4A=
+github.com/lestrrat-go/iter v1.0.1/go.mod h1:zIdgO1mRKhn8l9vrZJZz9TUMMFbQbLeTsbqPDrJ/OJc=
+github.com/lestrrat-go/jwx v1.2.25 h1:tAx93jN2SdPvFn08fHNAhqFJazn5mBBOB8Zli0g0otA=
+github.com/lestrrat-go/jwx v1.2.25/go.mod h1:zoNuZymNl5lgdcu6P7K6ie2QRll5HVfF4xwxBBK1NxY=
+github.com/lestrrat-go/option v1.0.0 h1:WqAWL8kh8VcSoD6xjSH34/1m8yxluXQbDeKNfvFeEO4=
+github.com/lestrrat-go/option v1.0.0/go.mod h1:5ZHFbivi4xwXxhxY9XHDe2FHo6/Z7WWmtT7T5nBBp3I=
+github.com/linuxkit/virtsock v0.0.0-20201010232012-f8cee7dfc7a3 h1:jUp75lepDg0phMUJBCmvaeFDldD2N3S1lBuPwUTszio=
+github.com/linuxkit/virtsock v0.0.0-20201010232012-f8cee7dfc7a3/go.mod h1:3r6x7q95whyfWQpmGZTu3gk3v2YkMi05HEzl7Tf7YEo=
+github.com/mattn/go-shellwords v1.0.12 h1:M2zGm7EW6UQJvDeQxo4T51eKPurbeFbe8WtebGE2xrk=
+github.com/mattn/go-shellwords v1.0.12/go.mod h1:EZzvwXDESEeg03EKmM+RmDnNOPKG4lLtQsUlTZDWQ8Y=
+github.com/matttproud/golang_protobuf_extensions v1.0.4 h1:mmDVorXM7PCGKw94cs5zkfA9PSy5pEvNWRP0ET0TIVo=
+github.com/matttproud/golang_protobuf_extensions v1.0.4/go.mod h1:BSXmuO+STAnVfrANrmjBb36TMTDstsz7MSK+HVaYKv4=
+github.com/miekg/pkcs11 v1.1.1 h1:Ugu9pdy6vAYku5DEpVWVFPYnzV+bxB+iRdbuFSu7TvU=
+github.com/miekg/pkcs11 v1.1.1/go.mod h1:XsNlhZGX73bx86s2hdc/FuaLm2CPZJemRLMA+WTFxgs=
+github.com/minio/sha256-simd v1.0.0 h1:v1ta+49hkWZyvaKwrQB8elexRqm6Y0aMLjCNsrYxo6g=
+github.com/minio/sha256-simd v1.0.0/go.mod h1:OuYzVNI5vcoYIAmbIvHPl3N3jUzVedXbKy5RFepssQM=
+github.com/mistifyio/go-zfs/v3 v3.0.1 h1:YaoXgBePoMA12+S1u/ddkv+QqxcfiZK4prI6HPnkFiU=
+github.com/mistifyio/go-zfs/v3 v3.0.1/go.mod h1:CzVgeB0RvF2EGzQnytKVvVSDwmKJXxkOTUGbNrTja/k=
+github.com/mitchellh/go-homedir v1.1.0 h1:lukF9ziXFxDFPkA1vsr5zpc1XuPDn/wFntq5mG+4E0Y=
+github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0=
+github.com/moby/sys/symlink v0.2.0 h1:tk1rOM+Ljp0nFmfOIBtlV3rTDlWOwFRhjEeAhZB0nZc=
+github.com/moby/sys/symlink v0.2.0/go.mod h1:7uZVF2dqJjG/NsClqul95CqKOBRQyYSNnJ6BMgR/gFs=
 github.com/montanaflynn/stats v0.7.0 h1:r3y12KyNxj/Sb/iOE46ws+3mS1+MZca1wlHQFPsY/JU=
 github.com/montanaflynn/stats v0.7.0/go.mod h1:etXPPgVO6n31NxCd9KQUMvCM+ve0ruNzt6R8Bnaayow=
 github.com/onsi/ginkgo/v2 v2.17.2 h1:7eMhcy3GimbsA3hEnVKdw/PQM9XN9krpKVXsZdph0/g=
 github.com/onsi/ginkgo/v2 v2.17.2/go.mod h1:nP2DPOQoNsQmsVyv5rDA8JkXQoCs6goXIvr/PRJ1eCc=
+github.com/open-policy-agent/opa v0.42.2 h1:qocVAKyjrqMjCqsU02S/gHyLr4AQQ9xMtuV1kKnnyhM=
+github.com/open-policy-agent/opa v0.42.2/go.mod h1:MrmoTi/BsKWT58kXlVayBb+rYVeaMwuBm3nYAN3923s=
+github.com/opencontainers/runc v1.1.5 h1:L44KXEpKmfWDcS02aeGm8QNTFXTo2D+8MYGDIJ/GDEs=
+github.com/opencontainers/runc v1.1.5/go.mod h1:1J5XiS+vdZ3wCyZybsuxXZWGrgSr8fFJHLXuG2PsnNg=
+github.com/opencontainers/runtime-tools v0.9.1-0.20221107090550-2e043c6bd626 h1:DmNGcqH3WDbV5k8OJ+esPWbqUOX5rMLR2PMvziDMJi0=
+github.com/opencontainers/runtime-tools v0.9.1-0.20221107090550-2e043c6bd626/go.mod h1:BRHJJd0E+cx42OybVYSgUvZmU0B8P9gZuRXlZUP7TKI=
 github.com/orisano/pixelmatch v0.0.0-20220722002657-fb0b55479cde h1:x0TT0RDC7UhAVbbWWBzr41ElhJx5tXPWkIHA2HWPRuw=
 github.com/orisano/pixelmatch v0.0.0-20220722002657-fb0b55479cde/go.mod h1:nZgzbfBr3hhjoZnS66nKrHmduYNpc34ny7RK4z5/HM0=
+github.com/pelletier/go-toml v1.9.5 h1:4yBQzkHv+7BHq2PQUZF3Mx0IYxG7LsP222s7Agd3ve8=
+github.com/pelletier/go-toml v1.9.5/go.mod h1:u1nR/EPcESfeI/szUZKdtJ0xRNbUoANCkoOuaOx1Y+c=
 github.com/peterbourgon/diskv v2.0.1+incompatible h1:UBdAOUP5p4RWqPBg048CAvpKN+vxiaj6gdUUzhl4XmI=
 github.com/peterbourgon/diskv v2.0.1+incompatible/go.mod h1:uqqh8zWWbv1HBMNONnaR/tNboyR3/BZd58JJSHlUSCU=
 github.com/pkg/diff v0.0.0-20210226163009-20ebb0f2a09e h1:aoZm08cpOy4WuID//EZDgcC4zIxODThtZNPirFr42+A=
+github.com/rcrowley/go-metrics v0.0.0-20200313005456-10cdbea86bc0 h1:MkV+77GLUNo5oJ0jf870itWm3D0Sjh7+Za9gazKc5LQ=
+github.com/rcrowley/go-metrics v0.0.0-20200313005456-10cdbea86bc0/go.mod h1:bCqnVzQkZxMG4s8nGwiZ5l3QUCyqpo9Y+/ZMZ9VjZe4=
+github.com/russross/blackfriday v1.6.0 h1:KqfZb0pUVN2lYqZUYRddxF4OR8ZMURnJIG5Y3VRLtww=
+github.com/russross/blackfriday v1.6.0/go.mod h1:ti0ldHuxg49ri4ksnFxlkCfN+hvslNlmVHqNRXXJNAY=
 github.com/russross/blackfriday/v2 v2.1.0 h1:JIOH55/0cWyOuilr9/qlrm0BSXldqnqwMsf35Ld67mk=
+github.com/stefanberger/go-pkcs11uri v0.0.0-20230803200340-78284954bff6 h1:pnnLyeX7o/5aX8qUQ69P/mLojDqwda8hFOCBTmP/6hw=
+github.com/stefanberger/go-pkcs11uri v0.0.0-20230803200340-78284954bff6/go.mod h1:39R/xuhNgVhi+K0/zst4TLrJrVmbm6LVgl4A0+ZFS5M=
 github.com/stretchr/objx v0.5.2 h1:xuMeJ0Sdp5ZMRXx/aWO6RZxdr3beISkG5/G/aIRr3pY=
 github.com/stretchr/objx v0.5.2/go.mod h1:FRsXN1f5AsAjCGJKqEizvkpNtU+EGNCLh3NxZ/8L+MA=
 github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
+github.com/syndtr/gocapability v0.0.0-20200815063812-42c35b437635 h1:kdXcSzyDtseVEc4yCz2qF8ZrQvIDBJLl4S1c3GCXmoI=
+github.com/syndtr/gocapability v0.0.0-20200815063812-42c35b437635/go.mod h1:hkRG7XYTFWNJGYcbNJQlaLq0fg1yr4J4t/NcTQtrfww=
+github.com/tchap/go-patricia/v2 v2.3.1 h1:6rQp39lgIYZ+MHmdEq4xzuk1t7OdC35z/xm0BGhTkes=
+github.com/tchap/go-patricia/v2 v2.3.1/go.mod h1:VZRHKAb53DLaG+nA9EaYYiaEx6YztwDlLElMsnSHD4k=
+github.com/urfave/cli v1.22.12 h1:igJgVw1JdKH+trcLWLeLwZjU9fEfPesQ+9/e4MQ44S8=
+github.com/urfave/cli v1.22.12/go.mod h1:sSBEIC79qR6OvcmsD4U3KABeOTxDqQtdDnaFuUN30b8=
+github.com/vbatts/tar-split v0.11.2 h1:Via6XqJr0hceW4wff3QRzD5gAk/tatMw/4ZA7cTlIME=
+github.com/vbatts/tar-split v0.11.2/go.mod h1:vV3ZuO2yWSVsz+pfFzDG/upWH1JhjOiEaWq6kXyQ3VI=
+github.com/vektah/gqlparser/v2 v2.4.5 h1:C02NsyEsL4TXJB7ndonqTfuQOL4XPIu0aAWugdmTgmc=
+github.com/vektah/gqlparser/v2 v2.4.5/go.mod h1:flJWIR04IMQPGz+BXLrORkrARBxv/rtyIAFvd/MceW0=
+github.com/veraison/go-cose v1.0.0-rc.1 h1:4qA7dbFJGvt7gcqv5MCIyCQvN+NpHFPkW7do3EeDLb8=
+github.com/veraison/go-cose v1.0.0-rc.1/go.mod h1:7ziE85vSq4ScFTg6wyoMXjucIGOf4JkFEZi/an96Ct4=
+github.com/vishvananda/netlink v1.2.1-beta.2 h1:Llsql0lnQEbHj0I1OuKyp8otXp0r3q0mPkuhwHfStVs=
+github.com/vishvananda/netlink v1.2.1-beta.2/go.mod h1:twkDnbuQxJYemMlGd4JFIcuhgX83tXhKS2B/PRMpOho=
+github.com/vishvananda/netns v0.0.0-20210104183010-2eb08e3e575f h1:p4VB7kIXpOQvVn1ZaTIVp+3vuYAXFe3OJEvjbUYJLaA=
+github.com/vishvananda/netns v0.0.0-20210104183010-2eb08e3e575f/go.mod h1:DD4vA1DwXk04H54A1oHXtwZmA0grkVMdPxx/VGLCah0=
+github.com/xeipuuv/gojsonpointer v0.0.0-20190905194746-02993c407bfb h1:zGWFAtiMcyryUHoUjUJX0/lt1H2+i2Ka2n+D3DImSNo=
+github.com/xeipuuv/gojsonpointer v0.0.0-20190905194746-02993c407bfb/go.mod h1:N2zxlSyiKSe5eX1tZViRH5QA0qijqEDrYZiPEAiq3wU=
+github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 h1:EzJWgHovont7NscjpAxXsDA8S8BMYve8Y5+7cuRE7R0=
+github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415/go.mod h1:GwrjFmJcFw6At/Gs6z4yjiIwzuJ1/+UwLxMQDVQXShQ=
+github.com/xeipuuv/gojsonschema v1.2.0 h1:LhYJRs+L4fBtjZUfuSZIKGeVu0QRy8e5Xi7D17UxZ74=
+github.com/xeipuuv/gojsonschema v1.2.0/go.mod h1:anYRn/JVcOK2ZgGU+IjEV4nwlhoK5sQluxsYJ78Id3Y=
+github.com/yashtewari/glob-intersection v0.1.0 h1:6gJvMYQlTDOL3dMsPF6J0+26vwX9MB8/1q3uAdhmTrg=
+github.com/yashtewari/glob-intersection v0.1.0/go.mod h1:LK7pIC3piUjovexikBbJ26Yml7g8xa5bsjfx2v1fwok=
 github.com/yuin/goldmark v1.2.1 h1:ruQGxdhGHe7FWOJPT0mKs5+pD2Xs1Bm/kdGlHO04FmM=
 github.com/yuin/goldmark v1.4.13 h1:fVcFKWvrslecOb/tg+Cc05dkeYx540o0FuFt3nUVDoE=
 github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
+go.etcd.io/bbolt v1.3.10 h1:+BqfJTcCzTItrop8mq/lbzL8wSGtj94UO/3U31shqG0=
+go.etcd.io/bbolt v1.3.10/go.mod h1:bK3UQLPJZly7IlNmV7uVHJDxfe5aK9Ll93e/74Y9oEQ=
+go.mozilla.org/pkcs7 v0.0.0-20200128120323-432b2356ecb1 h1:A/5uWzF44DlIgdm/PQFwfMkW0JX+cIcQi/SwLAmZP5M=
+go.mozilla.org/pkcs7 v0.0.0-20200128120323-432b2356ecb1/go.mod h1:SNgMg+EgDFwmvSmLRTNKC5fegJjB7v23qTQ0XLGUNHk=
+go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.46.1 h1:SpGay3w+nEwMpfVnbqOLH5gY52/foP8RE8UzTZ1pdSE=
+go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.46.1/go.mod h1:4UoMYEZOC0yN/sPGH76KPkkU7zgiEWYWL9vwmbnTJPE=
+go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.19.0 h1:Mne5On7VWdx7omSrSSZvM4Kw7cS7NQkOOmLcgscI51U=
+go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.19.0/go.mod h1:IPtUMKL4O3tH5y+iXVyAXqpAwMuzC1IrxVS81rummfE=
+go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.19.0 h1:3d+S281UTjM+AbF31XSOYn1qXn3BgIdWl8HNEpx08Jk=
+go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.19.0/go.mod h1:0+KuTDyKL4gjKCF75pHOX4wuzYDUZYfAQdSu43o+Z2I=
+go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.19.0 h1:IeMeyr1aBvBiPVYihXIaeIZba6b8E1bYp7lbdxK8CQg=
+go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.19.0/go.mod h1:oVdCUtjq9MK9BlS7TtucsQwUcXcymNiEDjgDD2jMtZU=
+go.opentelemetry.io/otel/sdk v1.21.0 h1:FTt8qirL1EysG6sTQRZ5TokkU8d0ugCj8htOgThZXQ8=
+go.opentelemetry.io/otel/sdk v1.21.0/go.mod h1:Nna6Yv7PWTdgJHVRD9hIYywQBRx7pbox6nwBnZIxl/E=
+go.opentelemetry.io/proto/otlp v1.0.0 h1:T0TX0tmXU8a3CbNXzEKGeU5mIVOdf0oykP+u2lIVU/I=
+go.opentelemetry.io/proto/otlp v1.0.0/go.mod h1:Sy6pihPLfYHkr3NkUbEhGHFhINUSI/v80hjKIs5JXpM=
 go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto=
 go.uber.org/goleak v1.3.0/go.mod h1:CoHD4mav9JJNrW/WLlf7HGZPjdw8EucARQHekz1X6bE=
 golang.org/x/crypto v0.25.0 h1:ypSNr+bnYL2YhwoMt2zPxHFmbAN1KZs/njMG3hxUp30=
 golang.org/x/crypto v0.25.0/go.mod h1:T+wALwcMOSE0kXgUAnPAHqTLW+XHgcELELW8VaDgm/M=
+golang.org/x/crypto v0.27.0 h1:GXm2NjJrPaiv/h1tb2UH8QfgC/hOf/+z0p6PT8o1w7A=
+golang.org/x/crypto v0.27.0/go.mod h1:1Xngt8kV6Dvbssa53Ziq6Eqn0HqbZi5Z6R0ZpwQzt70=
+golang.org/x/exp v0.0.0-20190121172915-509febef88a4 h1:c2HOrn5iMezYjSlGPncknSEr/8x5LELb/ilJbXi9DEA=
+golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3 h1:XQyxROzUlZH+WIQwySDgnISgOivlhjIEwaQaJEJrrN0=
 golang.org/x/mod v0.17.0 h1:zY54UmvipHiNd+pm+m0x9KhZ9hl1/7QNMyxXbc6ICqA=
 golang.org/x/mod v0.17.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=
 golang.org/x/net v0.21.0/go.mod h1:bIjVDfnllIU7BJ2DNgfnXvpSvtn8VRwhlsaeUTyUS44=
 golang.org/x/net v0.24.0/go.mod h1:2Q7sJY5mzlzWjKtYUEXSlBWCdyaioyXzRB2RtU8KVE8=
 golang.org/x/net v0.25.0/go.mod h1:JkAGAh7GEvH74S6FOH42FLoXpXbE/aqXSrIQjXgsiwM=
+golang.org/x/net v0.29.0 h1:5ORfpBpCs4HzDYoodCDBbwHzdR5UrLBZ3sOnUJmFoHo=
+golang.org/x/net v0.29.0/go.mod h1:gLkgy8jTGERgjzMic6DS9+SP0ajcu6Xu3Orq/SpETg0=
 golang.org/x/sync v0.7.0 h1:YsImfSBoP9QPYL0xyKJPq0gcaJdG3rInoqxTWbfQu9M=
 golang.org/x/sync v0.7.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
 golang.org/x/sync v0.8.0 h1:3NFvSEYkUoMifnESzZl15y791HH1qU2xm6eCJU5ZPXQ=
@@ -85,12 +505,17 @@ golang.org/x/sys v0.0.0-20220310020820-b874c991c1a5/go.mod h1:oPkhp1MJrh7nUepCBc
 golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.19.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
 golang.org/x/sys v0.20.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+golang.org/x/sys v0.25.0 h1:r+8e+loiHxRqhXVl6ML1nO3l1+oFoWbnlu2Ehimmi34=
+golang.org/x/sys v0.25.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
 golang.org/x/telemetry v0.0.0-20240228155512-f48c80bd79b2 h1:IRJeR9r1pYWsHKTRe/IInb7lYvbBVIqOgsX/u0mbOWY=
 golang.org/x/telemetry v0.0.0-20240228155512-f48c80bd79b2/go.mod h1:TeRTkGYfJXctD9OcfyVLyj2J3IxLnKwHJR8f4D8a3YE=
 golang.org/x/term v0.22.0 h1:BbsgPEJULsl2fV/AT3v15Mjva5yXKQDyKf+TbDz7QJk=
 golang.org/x/term v0.22.0/go.mod h1:F3qCibpT5AMpCRfhfT53vVJwhLtIVHhB9XDjfFvnMI4=
-golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
+golang.org/x/term v0.24.0 h1:Mh5cbb+Zk2hqqXNO7S1iTjEphVL+jb8ZWaqh/g+JWkM=
+golang.org/x/term v0.24.0/go.mod h1:lOBK/LVxemqiMij05LGJ0tzNr8xlmwBRJ81PX6wVLH8=
 golang.org/x/text v0.15.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
+golang.org/x/text v0.18.0 h1:XvMDiNzPAl0jr17s6W9lcaIhGUfUORdGCNsuLmPG224=
+golang.org/x/text v0.18.0/go.mod h1:BuEKDfySbSR4drPmRPG/7iBdf8hvFMuRexcpahXilzY=
 golang.org/x/tools v0.20.0/go.mod h1:WvitBU7JJf6A4jOdg4S1tviW9bhUxkgeCui/0JHctQg=
 golang.org/x/tools v0.21.0/go.mod h1:aiJjzUbINMkxbQROHiO6hDPo2LHcIPhhQsa9DLh0yGk=
 golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 h1:go1bK/D/BFZV2I8cIQd1NKEZ+0owSTG1fDTci4IqFcE=
@@ -98,11 +523,23 @@ golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 h1:H2TDz8ibqkAF6YGhCdN3j
 golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2/go.mod h1:K8+ghG5WaK9qNqU5K3HdILfMLy1f3aNYFI/wnl100a8=
 google.golang.org/appengine v1.6.7 h1:FZR1q0exgwxzPzp/aF+VccGrSfxfPpkBqjIIEq3ru6c=
 google.golang.org/appengine v1.6.7/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc=
-google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
+google.golang.org/genproto/googleapis/api v0.0.0-20231120223509-83a465c0220f h1:2yNACc1O40tTnrsbk9Cv6oxiW8pxI/pXj0wRtdlYmgY=
+google.golang.org/genproto/googleapis/api v0.0.0-20231120223509-83a465c0220f/go.mod h1:Uy9bTZJqmfrw2rIBxgGLnamc78euZULUBrLZ9XTITKI=
 gopkg.in/evanphx/json-patch.v4 v4.12.0 h1:n6jtcsulIzXPJaxegRbvFNNrZDjbij7ny3gmSPG+6V4=
 gopkg.in/evanphx/json-patch.v4 v4.12.0/go.mod h1:p8EYWUEYMpynmqDbY58zCKCFZw8pRWMG4EsWvDvM72M=
 gopkg.in/yaml.v2 v2.3.0 h1:clyUAQHOM3G0M3f5vQj7LuJrETvjVot3Z5el9nffUtU=
+honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc h1:/hemPrYIhOhy8zYrNj+069zDB68us2sMGsfkFJO0iZs=
+k8s.io/apiserver v0.26.2 h1:Pk8lmX4G14hYqJd1poHGC08G03nIHVqdJMR0SD3IH3o=
+k8s.io/apiserver v0.26.2/go.mod h1:GHcozwXgXsPuOJ28EnQ/jXEM9QeG6HT22YxSNmpYNh8=
 k8s.io/component-base v0.26.1 h1:4ahudpeQXHZL5kko+iDHqLj/FSGAEUnSVO0EBbgDd+4=
 k8s.io/component-base v0.26.1/go.mod h1:VHrLR0b58oC035w6YQiBSbtsf0ThuSwXP+p5dD/kAWU=
+k8s.io/component-base v0.26.2 h1:IfWgCGUDzrD6wLLgXEstJKYZKAFS2kO+rBRi0p3LqcI=
+k8s.io/component-base v0.26.2/go.mod h1:DxbuIe9M3IZPRxPIzhch2m1eT7uFrSBJUBuVCQEBivs=
+k8s.io/cri-api v0.27.1 h1:KWO+U8MfI9drXB/P4oU9VchaWYOlwDglJZVHWMpTT3Q=
+k8s.io/cri-api v0.27.1/go.mod h1:+Ts/AVYbIo04S86XbTD73UPp/DkTiYxtsFeOFEu32L0=
 k8s.io/gengo/v2 v2.0.0-20240228010128-51d4e06bde70 h1:NGrVE502P0s0/1hudf8zjgwki1X/TByhmAoILTarmzo=
 k8s.io/gengo/v2 v2.0.0-20240228010128-51d4e06bde70/go.mod h1:VH3AT8AaQOqiGjMF9p0/IM1Dj+82ZwjfxUP1IxaHE+8=
+tags.cncf.io/container-device-interface v0.7.2 h1:MLqGnWfOr1wB7m08ieI4YJ3IoLKKozEnnNYBtacDPQU=
+tags.cncf.io/container-device-interface v0.7.2/go.mod h1:Xb1PvXv2BhfNb3tla4r9JL129ck1Lxv9KuU6eVOfKto=
+tags.cncf.io/container-device-interface/specs-go v0.7.0 h1:w/maMGVeLP6TIQJVYT5pbqTi8SCw/iHZ+n4ignuGHqg=
+tags.cncf.io/container-device-interface/specs-go v0.7.0/go.mod h1:hMAwAbMZyBLdmYqWgYcKH0F/yctNpV3P35f+/088A80=
diff --git a/parts/linux/cloud-init/artifacts/bind-mount.service b/parts/linux/cloud-init/artifacts/bind-mount.service
index 019b0dfc0e2..a7d193529ca 100644
--- a/parts/linux/cloud-init/artifacts/bind-mount.service
+++ b/parts/linux/cloud-init/artifacts/bind-mount.service
@@ -1,5 +1,8 @@
 [Unit]
 Description=Bind mount kubelet data
+Requires=mnt.mount
+After=mnt.mount
+
 [Service]
 Restart=on-failure
 RemainAfterExit=yes
diff --git a/pkg/agent/datamodel/helper_test.go b/pkg/agent/datamodel/helper_test.go
index 92289395402..8ed1a993fdf 100644
--- a/pkg/agent/datamodel/helper_test.go
+++ b/pkg/agent/datamodel/helper_test.go
@@ -341,7 +341,7 @@ func TestIndentString(t *testing.T) {
 			got := IndentString(test.input, test.count)
 			diff := cmp.Diff(test.want, got)
 			if diff != "" {
-				t.Fatalf(diff)
+				t.Fatal(diff)
 			}
 		})
 	}
diff --git a/pkg/agent/datamodel/versions_test.go b/pkg/agent/datamodel/versions_test.go
index f4945ed301b..a6bdada3704 100644
--- a/pkg/agent/datamodel/versions_test.go
+++ b/pkg/agent/datamodel/versions_test.go
@@ -67,11 +67,11 @@ func TestGetVersionsGt(t *testing.T) {
 	v := GetVersionsGt(versions, "1.1.0-alpha.1", false, true)
 	errStr := "GetVersionsGt returned an unexpected list of strings"
 	if len(v) != len(expected) {
-		t.Errorf(errStr)
+		t.Error(errStr)
 	}
 	for _, ver := range v {
 		if !expectedMap[ver] {
-			t.Errorf(errStr)
+			t.Error(errStr)
 		}
 	}
 
@@ -84,11 +84,11 @@ func TestGetVersionsGt(t *testing.T) {
 	}
 	v = GetVersionsGt(versions, "1.1.0", true, false)
 	if len(v) != len(expected) {
-		t.Errorf(errStr)
+		t.Error(errStr)
 	}
 	for _, ver := range v {
 		if !expectedMap[ver] {
-			t.Errorf(errStr)
+			t.Error(errStr)
 		}
 	}
 }
@@ -181,11 +181,11 @@ func TestGetVersionsLt(t *testing.T) {
 	v := GetVersionsLt(versions, "1.2.1", false, false)
 	errStr := "GetVersionsLt returned an unexpected list of strings"
 	if len(v) != len(expected) {
-		t.Errorf(errStr)
+		t.Error(errStr)
 	}
 	for _, ver := range v {
 		if !expectedMap[ver] {
-			t.Errorf(errStr)
+			t.Error(errStr)
 		}
 	}
 
@@ -198,11 +198,11 @@ func TestGetVersionsLt(t *testing.T) {
 	}
 	v = GetVersionsLt(versions, "1.2.1", true, false)
 	if len(v) != len(expected) {
-		t.Errorf(errStr)
+		t.Error(errStr)
 	}
 	for _, ver := range v {
 		if !expectedMap[ver] {
-			t.Errorf(errStr)
+			t.Error(errStr)
 		}
 	}
 }
@@ -217,11 +217,11 @@ func TestGetVersionsBetween(t *testing.T) {
 	v := GetVersionsBetween(versions, "1.1.0", "1.2.1", false, false)
 	errStr := "GetVersionsBetween returned an unexpected list of strings"
 	if len(v) != len(expected) {
-		t.Errorf(errStr)
+		t.Error(errStr)
 	}
 	for _, ver := range v {
 		if !expectedMap[ver] {
-			t.Errorf(errStr)
+			t.Error(errStr)
 		}
 	}
 
@@ -234,11 +234,11 @@ func TestGetVersionsBetween(t *testing.T) {
 	}
 	v = GetVersionsBetween(versions, "1.1.0", "1.2.1", true, false)
 	if len(v) != len(expected) {
-		t.Errorf(errStr)
+		t.Error(errStr)
 	}
 	for _, ver := range v {
 		if !expectedMap[ver] {
-			t.Errorf(errStr)
+			t.Error(errStr)
 		}
 	}
 
@@ -251,16 +251,16 @@ func TestGetVersionsBetween(t *testing.T) {
 	}
 	v = GetVersionsBetween(versions, "1.9.6", "1.11.0", false, true)
 	if len(v) != len(expected) {
-		t.Errorf(errStr)
+		t.Error(errStr)
 	}
 	for _, ver := range v {
 		if !expectedMap[ver] {
-			t.Errorf(errStr)
+			t.Error(errStr)
 		}
 	}
 	v = GetVersionsBetween(versions, "1.9.6", "1.11.0", false, false)
 	if len(v) != 0 {
-		t.Errorf(errStr)
+		t.Error(errStr)
 	}
 
 	versions = []string{"1.9.6", "1.10.0-beta.2", "1.10.0-beta.4", "1.10.0-rc.1"}
@@ -271,18 +271,18 @@ func TestGetVersionsBetween(t *testing.T) {
 	}
 	v = GetVersionsBetween(versions, "1.10.0-beta.2", "1.12.0", false, false)
 	if len(v) != len(expected) {
-		t.Errorf(errStr)
+		t.Error(errStr)
 	}
 	for _, ver := range v {
 		if !expectedMap[ver] {
-			t.Errorf(errStr)
+			t.Error(errStr)
 		}
 	}
 
 	versions = []string{"1.10.0", "1.10.0-beta.2", "1.10.0-beta.4", "1.10.0-rc.1"}
 	v = GetVersionsBetween(versions, "1.10.0", "1.12.0", false, false)
 	if len(v) != 0 {
-		t.Errorf(errStr)
+		t.Error(errStr)
 	}
 
 	versions = []string{"1.9.6", "1.10.0-beta.2", "1.10.0-beta.4", "1.10.0-rc.1"}
@@ -294,11 +294,11 @@ func TestGetVersionsBetween(t *testing.T) {
 	}
 	v = GetVersionsBetween(versions, "1.9.5", "1.12.0", false, true)
 	if len(v) != len(versions) {
-		t.Errorf(errStr)
+		t.Error(errStr)
 	}
 	for _, ver := range v {
 		if !expectedMap[ver] {
-			t.Errorf(errStr)
+			t.Error(errStr)
 		}
 	}
 
@@ -311,11 +311,11 @@ func TestGetVersionsBetween(t *testing.T) {
 	}
 	v = GetVersionsBetween(versions, "1.10.0-rc.1", "1.12.0", false, true)
 	if len(v) != len(expected) {
-		t.Errorf(errStr)
+		t.Error(errStr)
 	}
 	for _, ver := range v {
 		if !expectedMap[ver] {
-			t.Errorf(errStr)
+			t.Error(errStr)
 		}
 	}
 
@@ -326,11 +326,11 @@ func TestGetVersionsBetween(t *testing.T) {
 	}
 	v = GetVersionsBetween(versions, "1.11.0-alpha.1", "1.11.0-beta.1", false, true)
 	if len(v) != len(expected) {
-		t.Errorf(errStr)
+		t.Error(errStr)
 	}
 	for _, ver := range v {
 		if !expectedMap[ver] {
-			t.Errorf(errStr)
+			t.Error(errStr)
 		}
 	}
 
@@ -339,11 +339,11 @@ func TestGetVersionsBetween(t *testing.T) {
 	expectedMap = map[string]bool{}
 	v = GetVersionsBetween(versions, "1.11.0-beta.1", "1.12.0", false, true)
 	if len(v) != len(expected) {
-		t.Errorf(errStr)
+		t.Error(errStr)
 	}
 	for _, ver := range v {
 		if !expectedMap[ver] {
-			t.Errorf(errStr)
+			t.Error(errStr)
 		}
 	}
 }
diff --git a/pkg/agent/testdata/AKSUbuntu1604+Containerd/CustomData b/pkg/agent/testdata/AKSUbuntu1604+Containerd/CustomData
index 66aa9bd8b87..69cd5fcf6ac 100644
--- a/pkg/agent/testdata/AKSUbuntu1604+Containerd/CustomData
+++ b/pkg/agent/testdata/AKSUbuntu1604+Containerd/CustomData
@@ -153,7 +153,7 @@ write_files:
   encoding: gzip
   owner: root
   content: !!binary |
-    H4sIAAAAAAAC/xzNMU7DQBBG4X5O4Qs4e4ItiEhBm4AoLBdj+w8esZ61ZmZRzOkRqZ+evuFDJUZ6hc8me0jVfBZduq02je67TSiIbuFgGm6wH5kx0hUebJGr9neW0gx0xcaiL/eAXR4S+YDT+7EjV4WvNejywHx7XmkSTRP72qW6R+LfZkhz1WBRmP/npX/6J1+Jhjf14FJG+mQNLOcjb62E9M1hp2D7QtBfAAAA//8tGsoCxwAAAA==
+    H4sIAAAAAAAC/0zNsU6EUBCF4X6eghcAnuAWbtzCltVYEIoBzspEmIszc83i0xupLE/+fDn9m0oM9AyfTPaQrOkiOldbLhrVZxmxIqqZg6nDVxGDp02jOTs93QP2b1N/g33LhIE6eLBFylrfWdZioA4bi57m+pBIB5xejx0pK3zJQdcHptup2lG0HdmXqs17tPxTDO2UNVgU5n95rs/Pxhei/kU9eF0HemcNzJcjbWUNqYvDmmD7QNBvAAAA///RbR0T6wAAAA==
 
 - path: /etc/systemd/system/dhcpv6.service
   permissions: "0644"
diff --git a/pkg/agent/testdata/AKSUbuntu1604+Containerd/line156.sh b/pkg/agent/testdata/AKSUbuntu1604+Containerd/line156.sh
index 019b0dfc0e2..a7d193529ca 100644
--- a/pkg/agent/testdata/AKSUbuntu1604+Containerd/line156.sh
+++ b/pkg/agent/testdata/AKSUbuntu1604+Containerd/line156.sh
@@ -1,5 +1,8 @@
 [Unit]
 Description=Bind mount kubelet data
+Requires=mnt.mount
+After=mnt.mount
+
 [Service]
 Restart=on-failure
 RemainAfterExit=yes
diff --git a/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+CustomLinuxOSConfig/CustomData b/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+CustomLinuxOSConfig/CustomData
index 8e474f5b897..a19d2a71068 100644
--- a/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+CustomLinuxOSConfig/CustomData
+++ b/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+CustomLinuxOSConfig/CustomData
@@ -153,7 +153,7 @@ write_files:
   encoding: gzip
   owner: root
   content: !!binary |
-    H4sIAAAAAAAC/xzNMU7DQBBG4X5O4Qs4e4ItiEhBm4AoLBdj+w8esZ61ZmZRzOkRqZ+evuFDJUZ6hc8me0jVfBZduq02je67TSiIbuFgGm6wH5kx0hUebJGr9neW0gx0xcaiL/eAXR4S+YDT+7EjV4WvNejywHx7XmkSTRP72qW6R+LfZkhz1WBRmP/npX/6J1+Jhjf14FJG+mQNLOcjb62E9M1hp2D7QtBfAAAA//8tGsoCxwAAAA==
+    H4sIAAAAAAAC/0zNsU6EUBCF4X6eghcAnuAWbtzCltVYEIoBzspEmIszc83i0xupLE/+fDn9m0oM9AyfTPaQrOkiOldbLhrVZxmxIqqZg6nDVxGDp02jOTs93QP2b1N/g33LhIE6eLBFylrfWdZioA4bi57m+pBIB5xejx0pK3zJQdcHptup2lG0HdmXqs17tPxTDO2UNVgU5n95rs/Pxhei/kU9eF0HemcNzJcjbWUNqYvDmmD7QNBvAAAA///RbR0T6wAAAA==
 
 - path: /etc/systemd/system/dhcpv6.service
   permissions: "0644"
diff --git a/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+CustomLinuxOSConfig/line156.sh b/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+CustomLinuxOSConfig/line156.sh
index 019b0dfc0e2..a7d193529ca 100644
--- a/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+CustomLinuxOSConfig/line156.sh
+++ b/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+CustomLinuxOSConfig/line156.sh
@@ -1,5 +1,8 @@
 [Unit]
 Description=Bind mount kubelet data
+Requires=mnt.mount
+After=mnt.mount
+
 [Service]
 Restart=on-failure
 RemainAfterExit=yes
diff --git a/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+DynamicKubeletConfig/CustomData b/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+DynamicKubeletConfig/CustomData
index 8e474f5b897..a19d2a71068 100644
--- a/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+DynamicKubeletConfig/CustomData
+++ b/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+DynamicKubeletConfig/CustomData
@@ -153,7 +153,7 @@ write_files:
   encoding: gzip
   owner: root
   content: !!binary |
-    H4sIAAAAAAAC/xzNMU7DQBBG4X5O4Qs4e4ItiEhBm4AoLBdj+w8esZ61ZmZRzOkRqZ+evuFDJUZ6hc8me0jVfBZduq02je67TSiIbuFgGm6wH5kx0hUebJGr9neW0gx0xcaiL/eAXR4S+YDT+7EjV4WvNejywHx7XmkSTRP72qW6R+LfZkhz1WBRmP/npX/6J1+Jhjf14FJG+mQNLOcjb62E9M1hp2D7QtBfAAAA//8tGsoCxwAAAA==
+    H4sIAAAAAAAC/0zNsU6EUBCF4X6eghcAnuAWbtzCltVYEIoBzspEmIszc83i0xupLE/+fDn9m0oM9AyfTPaQrOkiOldbLhrVZxmxIqqZg6nDVxGDp02jOTs93QP2b1N/g33LhIE6eLBFylrfWdZioA4bi57m+pBIB5xejx0pK3zJQdcHptup2lG0HdmXqs17tPxTDO2UNVgU5n95rs/Pxhei/kU9eF0HemcNzJcjbWUNqYvDmmD7QNBvAAAA///RbR0T6wAAAA==
 
 - path: /etc/systemd/system/dhcpv6.service
   permissions: "0644"
diff --git a/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+DynamicKubeletConfig/line156.sh b/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+DynamicKubeletConfig/line156.sh
index 019b0dfc0e2..a7d193529ca 100644
--- a/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+DynamicKubeletConfig/line156.sh
+++ b/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+DynamicKubeletConfig/line156.sh
@@ -1,5 +1,8 @@
 [Unit]
 Description=Bind mount kubelet data
+Requires=mnt.mount
+After=mnt.mount
+
 [Service]
 Restart=on-failure
 RemainAfterExit=yes
diff --git a/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=false/CustomData b/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=false/CustomData
index fecea3846c7..ed1360d9d3d 100644
--- a/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=false/CustomData
+++ b/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=false/CustomData
@@ -153,7 +153,7 @@ write_files:
   encoding: gzip
   owner: root
   content: !!binary |
-    H4sIAAAAAAAC/xzNMU7DQBBG4X5O4Qs4e4ItiEhBm4AoLBdj+w8esZ61ZmZRzOkRqZ+evuFDJUZ6hc8me0jVfBZduq02je67TSiIbuFgGm6wH5kx0hUebJGr9neW0gx0xcaiL/eAXR4S+YDT+7EjV4WvNejywHx7XmkSTRP72qW6R+LfZkhz1WBRmP/npX/6J1+Jhjf14FJG+mQNLOcjb62E9M1hp2D7QtBfAAAA//8tGsoCxwAAAA==
+    H4sIAAAAAAAC/0zNsU6EUBCF4X6eghcAnuAWbtzCltVYEIoBzspEmIszc83i0xupLE/+fDn9m0oM9AyfTPaQrOkiOldbLhrVZxmxIqqZg6nDVxGDp02jOTs93QP2b1N/g33LhIE6eLBFylrfWdZioA4bi57m+pBIB5xejx0pK3zJQdcHptup2lG0HdmXqs17tPxTDO2UNVgU5n95rs/Pxhei/kU9eF0HemcNzJcjbWUNqYvDmmD7QNBvAAAA///RbR0T6wAAAA==
 
 - path: /etc/systemd/system/dhcpv6.service
   permissions: "0644"
diff --git a/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=false/line156.sh b/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=false/line156.sh
index 019b0dfc0e2..a7d193529ca 100644
--- a/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=false/line156.sh
+++ b/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=false/line156.sh
@@ -1,5 +1,8 @@
 [Unit]
 Description=Bind mount kubelet data
+Requires=mnt.mount
+After=mnt.mount
+
 [Service]
 Restart=on-failure
 RemainAfterExit=yes
diff --git a/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=true/CustomData b/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=true/CustomData
index fecea3846c7..ed1360d9d3d 100644
--- a/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=true/CustomData
+++ b/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=true/CustomData
@@ -153,7 +153,7 @@ write_files:
   encoding: gzip
   owner: root
   content: !!binary |
-    H4sIAAAAAAAC/xzNMU7DQBBG4X5O4Qs4e4ItiEhBm4AoLBdj+w8esZ61ZmZRzOkRqZ+evuFDJUZ6hc8me0jVfBZduq02je67TSiIbuFgGm6wH5kx0hUebJGr9neW0gx0xcaiL/eAXR4S+YDT+7EjV4WvNejywHx7XmkSTRP72qW6R+LfZkhz1WBRmP/npX/6J1+Jhjf14FJG+mQNLOcjb62E9M1hp2D7QtBfAAAA//8tGsoCxwAAAA==
+    H4sIAAAAAAAC/0zNsU6EUBCF4X6eghcAnuAWbtzCltVYEIoBzspEmIszc83i0xupLE/+fDn9m0oM9AyfTPaQrOkiOldbLhrVZxmxIqqZg6nDVxGDp02jOTs93QP2b1N/g33LhIE6eLBFylrfWdZioA4bi57m+pBIB5xejx0pK3zJQdcHptup2lG0HdmXqs17tPxTDO2UNVgU5n95rs/Pxhei/kU9eF0HemcNzJcjbWUNqYvDmmD7QNBvAAAA///RbR0T6wAAAA==
 
 - path: /etc/systemd/system/dhcpv6.service
   permissions: "0644"
diff --git a/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=true/line156.sh b/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=true/line156.sh
index 019b0dfc0e2..a7d193529ca 100644
--- a/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=true/line156.sh
+++ b/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=true/line156.sh
@@ -1,5 +1,8 @@
 [Unit]
 Description=Bind mount kubelet data
+Requires=mnt.mount
+After=mnt.mount
+
 [Service]
 Restart=on-failure
 RemainAfterExit=yes
diff --git a/pkg/agent/testdata/AKSUbuntu1604+Docker/CustomData b/pkg/agent/testdata/AKSUbuntu1604+Docker/CustomData
index 66aa9bd8b87..69cd5fcf6ac 100644
--- a/pkg/agent/testdata/AKSUbuntu1604+Docker/CustomData
+++ b/pkg/agent/testdata/AKSUbuntu1604+Docker/CustomData
@@ -153,7 +153,7 @@ write_files:
   encoding: gzip
   owner: root
   content: !!binary |
-    H4sIAAAAAAAC/xzNMU7DQBBG4X5O4Qs4e4ItiEhBm4AoLBdj+w8esZ61ZmZRzOkRqZ+evuFDJUZ6hc8me0jVfBZduq02je67TSiIbuFgGm6wH5kx0hUebJGr9neW0gx0xcaiL/eAXR4S+YDT+7EjV4WvNejywHx7XmkSTRP72qW6R+LfZkhz1WBRmP/npX/6J1+Jhjf14FJG+mQNLOcjb62E9M1hp2D7QtBfAAAA//8tGsoCxwAAAA==
+    H4sIAAAAAAAC/0zNsU6EUBCF4X6eghcAnuAWbtzCltVYEIoBzspEmIszc83i0xupLE/+fDn9m0oM9AyfTPaQrOkiOldbLhrVZxmxIqqZg6nDVxGDp02jOTs93QP2b1N/g33LhIE6eLBFylrfWdZioA4bi57m+pBIB5xejx0pK3zJQdcHptup2lG0HdmXqs17tPxTDO2UNVgU5n95rs/Pxhei/kU9eF0HemcNzJcjbWUNqYvDmmD7QNBvAAAA///RbR0T6wAAAA==
 
 - path: /etc/systemd/system/dhcpv6.service
   permissions: "0644"
diff --git a/pkg/agent/testdata/AKSUbuntu1604+Docker/line156.sh b/pkg/agent/testdata/AKSUbuntu1604+Docker/line156.sh
index 019b0dfc0e2..a7d193529ca 100644
--- a/pkg/agent/testdata/AKSUbuntu1604+Docker/line156.sh
+++ b/pkg/agent/testdata/AKSUbuntu1604+Docker/line156.sh
@@ -1,5 +1,8 @@
 [Unit]
 Description=Bind mount kubelet data
+Requires=mnt.mount
+After=mnt.mount
+
 [Service]
 Restart=on-failure
 RemainAfterExit=yes
diff --git a/pkg/agent/testdata/AKSUbuntu1604+DynamicKubeletConfig/CustomData b/pkg/agent/testdata/AKSUbuntu1604+DynamicKubeletConfig/CustomData
index 5822280d9c2..490c0564e50 100644
--- a/pkg/agent/testdata/AKSUbuntu1604+DynamicKubeletConfig/CustomData
+++ b/pkg/agent/testdata/AKSUbuntu1604+DynamicKubeletConfig/CustomData
@@ -153,7 +153,7 @@ write_files:
   encoding: gzip
   owner: root
   content: !!binary |
-    H4sIAAAAAAAC/xzNMU7DQBBG4X5O4Qs4e4ItiEhBm4AoLBdj+w8esZ61ZmZRzOkRqZ+evuFDJUZ6hc8me0jVfBZduq02je67TSiIbuFgGm6wH5kx0hUebJGr9neW0gx0xcaiL/eAXR4S+YDT+7EjV4WvNejywHx7XmkSTRP72qW6R+LfZkhz1WBRmP/npX/6J1+Jhjf14FJG+mQNLOcjb62E9M1hp2D7QtBfAAAA//8tGsoCxwAAAA==
+    H4sIAAAAAAAC/0zNsU6EUBCF4X6eghcAnuAWbtzCltVYEIoBzspEmIszc83i0xupLE/+fDn9m0oM9AyfTPaQrOkiOldbLhrVZxmxIqqZg6nDVxGDp02jOTs93QP2b1N/g33LhIE6eLBFylrfWdZioA4bi57m+pBIB5xejx0pK3zJQdcHptup2lG0HdmXqs17tPxTDO2UNVgU5n95rs/Pxhei/kU9eF0HemcNzJcjbWUNqYvDmmD7QNBvAAAA///RbR0T6wAAAA==
 
 - path: /etc/systemd/system/dhcpv6.service
   permissions: "0644"
diff --git a/pkg/agent/testdata/AKSUbuntu1604+DynamicKubeletConfig/line156.sh b/pkg/agent/testdata/AKSUbuntu1604+DynamicKubeletConfig/line156.sh
index 019b0dfc0e2..a7d193529ca 100644
--- a/pkg/agent/testdata/AKSUbuntu1604+DynamicKubeletConfig/line156.sh
+++ b/pkg/agent/testdata/AKSUbuntu1604+DynamicKubeletConfig/line156.sh
@@ -1,5 +1,8 @@
 [Unit]
 Description=Bind mount kubelet data
+Requires=mnt.mount
+After=mnt.mount
+
 [Service]
 Restart=on-failure
 RemainAfterExit=yes
diff --git a/pkg/agent/testdata/AKSUbuntu1604+EnablePrivateClusterHostsConfigAgent/CustomData b/pkg/agent/testdata/AKSUbuntu1604+EnablePrivateClusterHostsConfigAgent/CustomData
index d719d714cd4..de31acbd91d 100644
--- a/pkg/agent/testdata/AKSUbuntu1604+EnablePrivateClusterHostsConfigAgent/CustomData
+++ b/pkg/agent/testdata/AKSUbuntu1604+EnablePrivateClusterHostsConfigAgent/CustomData
@@ -153,7 +153,7 @@ write_files:
   encoding: gzip
   owner: root
   content: !!binary |
-    H4sIAAAAAAAC/xzNMU7DQBBG4X5O4Qs4e4ItiEhBm4AoLBdj+w8esZ61ZmZRzOkRqZ+evuFDJUZ6hc8me0jVfBZduq02je67TSiIbuFgGm6wH5kx0hUebJGr9neW0gx0xcaiL/eAXR4S+YDT+7EjV4WvNejywHx7XmkSTRP72qW6R+LfZkhz1WBRmP/npX/6J1+Jhjf14FJG+mQNLOcjb62E9M1hp2D7QtBfAAAA//8tGsoCxwAAAA==
+    H4sIAAAAAAAC/0zNsU6EUBCF4X6eghcAnuAWbtzCltVYEIoBzspEmIszc83i0xupLE/+fDn9m0oM9AyfTPaQrOkiOldbLhrVZxmxIqqZg6nDVxGDp02jOTs93QP2b1N/g33LhIE6eLBFylrfWdZioA4bi57m+pBIB5xejx0pK3zJQdcHptup2lG0HdmXqs17tPxTDO2UNVgU5n95rs/Pxhei/kU9eF0HemcNzJcjbWUNqYvDmmD7QNBvAAAA///RbR0T6wAAAA==
 
 - path: /etc/systemd/system/dhcpv6.service
   permissions: "0644"
diff --git a/pkg/agent/testdata/AKSUbuntu1604+EnablePrivateClusterHostsConfigAgent/line156.sh b/pkg/agent/testdata/AKSUbuntu1604+EnablePrivateClusterHostsConfigAgent/line156.sh
index 019b0dfc0e2..a7d193529ca 100644
--- a/pkg/agent/testdata/AKSUbuntu1604+EnablePrivateClusterHostsConfigAgent/line156.sh
+++ b/pkg/agent/testdata/AKSUbuntu1604+EnablePrivateClusterHostsConfigAgent/line156.sh
@@ -1,5 +1,8 @@
 [Unit]
 Description=Bind mount kubelet data
+Requires=mnt.mount
+After=mnt.mount
+
 [Service]
 Restart=on-failure
 RemainAfterExit=yes
diff --git a/pkg/agent/testdata/AKSUbuntu1604+GPUDedicatedVHD/CustomData b/pkg/agent/testdata/AKSUbuntu1604+GPUDedicatedVHD/CustomData
index 4595f6d3e78..6b012400e7b 100644
--- a/pkg/agent/testdata/AKSUbuntu1604+GPUDedicatedVHD/CustomData
+++ b/pkg/agent/testdata/AKSUbuntu1604+GPUDedicatedVHD/CustomData
@@ -153,7 +153,7 @@ write_files:
   encoding: gzip
   owner: root
   content: !!binary |
-    H4sIAAAAAAAC/xzNMU7DQBBG4X5O4Qs4e4ItiEhBm4AoLBdj+w8esZ61ZmZRzOkRqZ+evuFDJUZ6hc8me0jVfBZduq02je67TSiIbuFgGm6wH5kx0hUebJGr9neW0gx0xcaiL/eAXR4S+YDT+7EjV4WvNejywHx7XmkSTRP72qW6R+LfZkhz1WBRmP/npX/6J1+Jhjf14FJG+mQNLOcjb62E9M1hp2D7QtBfAAAA//8tGsoCxwAAAA==
+    H4sIAAAAAAAC/0zNsU6EUBCF4X6eghcAnuAWbtzCltVYEIoBzspEmIszc83i0xupLE/+fDn9m0oM9AyfTPaQrOkiOldbLhrVZxmxIqqZg6nDVxGDp02jOTs93QP2b1N/g33LhIE6eLBFylrfWdZioA4bi57m+pBIB5xejx0pK3zJQdcHptup2lG0HdmXqs17tPxTDO2UNVgU5n95rs/Pxhei/kU9eF0HemcNzJcjbWUNqYvDmmD7QNBvAAAA///RbR0T6wAAAA==
 
 - path: /etc/systemd/system/dhcpv6.service
   permissions: "0644"
diff --git a/pkg/agent/testdata/AKSUbuntu1604+GPUDedicatedVHD/line156.sh b/pkg/agent/testdata/AKSUbuntu1604+GPUDedicatedVHD/line156.sh
index 019b0dfc0e2..a7d193529ca 100644
--- a/pkg/agent/testdata/AKSUbuntu1604+GPUDedicatedVHD/line156.sh
+++ b/pkg/agent/testdata/AKSUbuntu1604+GPUDedicatedVHD/line156.sh
@@ -1,5 +1,8 @@
 [Unit]
 Description=Bind mount kubelet data
+Requires=mnt.mount
+After=mnt.mount
+
 [Service]
 Restart=on-failure
 RemainAfterExit=yes
diff --git a/pkg/agent/testdata/AKSUbuntu1604+K8S115/CustomData b/pkg/agent/testdata/AKSUbuntu1604+K8S115/CustomData
index 66aa9bd8b87..69cd5fcf6ac 100644
--- a/pkg/agent/testdata/AKSUbuntu1604+K8S115/CustomData
+++ b/pkg/agent/testdata/AKSUbuntu1604+K8S115/CustomData
@@ -153,7 +153,7 @@ write_files:
   encoding: gzip
   owner: root
   content: !!binary |
-    H4sIAAAAAAAC/xzNMU7DQBBG4X5O4Qs4e4ItiEhBm4AoLBdj+w8esZ61ZmZRzOkRqZ+evuFDJUZ6hc8me0jVfBZduq02je67TSiIbuFgGm6wH5kx0hUebJGr9neW0gx0xcaiL/eAXR4S+YDT+7EjV4WvNejywHx7XmkSTRP72qW6R+LfZkhz1WBRmP/npX/6J1+Jhjf14FJG+mQNLOcjb62E9M1hp2D7QtBfAAAA//8tGsoCxwAAAA==
+    H4sIAAAAAAAC/0zNsU6EUBCF4X6eghcAnuAWbtzCltVYEIoBzspEmIszc83i0xupLE/+fDn9m0oM9AyfTPaQrOkiOldbLhrVZxmxIqqZg6nDVxGDp02jOTs93QP2b1N/g33LhIE6eLBFylrfWdZioA4bi57m+pBIB5xejx0pK3zJQdcHptup2lG0HdmXqs17tPxTDO2UNVgU5n95rs/Pxhei/kU9eF0HemcNzJcjbWUNqYvDmmD7QNBvAAAA///RbR0T6wAAAA==
 
 - path: /etc/systemd/system/dhcpv6.service
   permissions: "0644"
diff --git a/pkg/agent/testdata/AKSUbuntu1604+K8S115/line156.sh b/pkg/agent/testdata/AKSUbuntu1604+K8S115/line156.sh
index 019b0dfc0e2..a7d193529ca 100644
--- a/pkg/agent/testdata/AKSUbuntu1604+K8S115/line156.sh
+++ b/pkg/agent/testdata/AKSUbuntu1604+K8S115/line156.sh
@@ -1,5 +1,8 @@
 [Unit]
 Description=Bind mount kubelet data
+Requires=mnt.mount
+After=mnt.mount
+
 [Service]
 Restart=on-failure
 RemainAfterExit=yes
diff --git a/pkg/agent/testdata/AKSUbuntu1604+K8S117/CustomData b/pkg/agent/testdata/AKSUbuntu1604+K8S117/CustomData
index d719d714cd4..de31acbd91d 100644
--- a/pkg/agent/testdata/AKSUbuntu1604+K8S117/CustomData
+++ b/pkg/agent/testdata/AKSUbuntu1604+K8S117/CustomData
@@ -153,7 +153,7 @@ write_files:
   encoding: gzip
   owner: root
   content: !!binary |
-    H4sIAAAAAAAC/xzNMU7DQBBG4X5O4Qs4e4ItiEhBm4AoLBdj+w8esZ61ZmZRzOkRqZ+evuFDJUZ6hc8me0jVfBZduq02je67TSiIbuFgGm6wH5kx0hUebJGr9neW0gx0xcaiL/eAXR4S+YDT+7EjV4WvNejywHx7XmkSTRP72qW6R+LfZkhz1WBRmP/npX/6J1+Jhjf14FJG+mQNLOcjb62E9M1hp2D7QtBfAAAA//8tGsoCxwAAAA==
+    H4sIAAAAAAAC/0zNsU6EUBCF4X6eghcAnuAWbtzCltVYEIoBzspEmIszc83i0xupLE/+fDn9m0oM9AyfTPaQrOkiOldbLhrVZxmxIqqZg6nDVxGDp02jOTs93QP2b1N/g33LhIE6eLBFylrfWdZioA4bi57m+pBIB5xejx0pK3zJQdcHptup2lG0HdmXqs17tPxTDO2UNVgU5n95rs/Pxhei/kU9eF0HemcNzJcjbWUNqYvDmmD7QNBvAAAA///RbR0T6wAAAA==
 
 - path: /etc/systemd/system/dhcpv6.service
   permissions: "0644"
diff --git a/pkg/agent/testdata/AKSUbuntu1604+K8S117/line156.sh b/pkg/agent/testdata/AKSUbuntu1604+K8S117/line156.sh
index 019b0dfc0e2..a7d193529ca 100644
--- a/pkg/agent/testdata/AKSUbuntu1604+K8S117/line156.sh
+++ b/pkg/agent/testdata/AKSUbuntu1604+K8S117/line156.sh
@@ -1,5 +1,8 @@
 [Unit]
 Description=Bind mount kubelet data
+Requires=mnt.mount
+After=mnt.mount
+
 [Service]
 Restart=on-failure
 RemainAfterExit=yes
diff --git a/pkg/agent/testdata/AKSUbuntu1604+K8S118/CustomData b/pkg/agent/testdata/AKSUbuntu1604+K8S118/CustomData
index d719d714cd4..de31acbd91d 100644
--- a/pkg/agent/testdata/AKSUbuntu1604+K8S118/CustomData
+++ b/pkg/agent/testdata/AKSUbuntu1604+K8S118/CustomData
@@ -153,7 +153,7 @@ write_files:
   encoding: gzip
   owner: root
   content: !!binary |
-    H4sIAAAAAAAC/xzNMU7DQBBG4X5O4Qs4e4ItiEhBm4AoLBdj+w8esZ61ZmZRzOkRqZ+evuFDJUZ6hc8me0jVfBZduq02je67TSiIbuFgGm6wH5kx0hUebJGr9neW0gx0xcaiL/eAXR4S+YDT+7EjV4WvNejywHx7XmkSTRP72qW6R+LfZkhz1WBRmP/npX/6J1+Jhjf14FJG+mQNLOcjb62E9M1hp2D7QtBfAAAA//8tGsoCxwAAAA==
+    H4sIAAAAAAAC/0zNsU6EUBCF4X6eghcAnuAWbtzCltVYEIoBzspEmIszc83i0xupLE/+fDn9m0oM9AyfTPaQrOkiOldbLhrVZxmxIqqZg6nDVxGDp02jOTs93QP2b1N/g33LhIE6eLBFylrfWdZioA4bi57m+pBIB5xejx0pK3zJQdcHptup2lG0HdmXqs17tPxTDO2UNVgU5n95rs/Pxhei/kU9eF0HemcNzJcjbWUNqYvDmmD7QNBvAAAA///RbR0T6wAAAA==
 
 - path: /etc/systemd/system/dhcpv6.service
   permissions: "0644"
diff --git a/pkg/agent/testdata/AKSUbuntu1604+K8S118/line156.sh b/pkg/agent/testdata/AKSUbuntu1604+K8S118/line156.sh
index 019b0dfc0e2..a7d193529ca 100644
--- a/pkg/agent/testdata/AKSUbuntu1604+K8S118/line156.sh
+++ b/pkg/agent/testdata/AKSUbuntu1604+K8S118/line156.sh
@@ -1,5 +1,8 @@
 [Unit]
 Description=Bind mount kubelet data
+Requires=mnt.mount
+After=mnt.mount
+
 [Service]
 Restart=on-failure
 RemainAfterExit=yes
diff --git a/pkg/agent/testdata/AKSUbuntu1604+KubeletConfigFile/CustomData b/pkg/agent/testdata/AKSUbuntu1604+KubeletConfigFile/CustomData
index 8e474f5b897..a19d2a71068 100644
--- a/pkg/agent/testdata/AKSUbuntu1604+KubeletConfigFile/CustomData
+++ b/pkg/agent/testdata/AKSUbuntu1604+KubeletConfigFile/CustomData
@@ -153,7 +153,7 @@ write_files:
   encoding: gzip
   owner: root
   content: !!binary |
-    H4sIAAAAAAAC/xzNMU7DQBBG4X5O4Qs4e4ItiEhBm4AoLBdj+w8esZ61ZmZRzOkRqZ+evuFDJUZ6hc8me0jVfBZduq02je67TSiIbuFgGm6wH5kx0hUebJGr9neW0gx0xcaiL/eAXR4S+YDT+7EjV4WvNejywHx7XmkSTRP72qW6R+LfZkhz1WBRmP/npX/6J1+Jhjf14FJG+mQNLOcjb62E9M1hp2D7QtBfAAAA//8tGsoCxwAAAA==
+    H4sIAAAAAAAC/0zNsU6EUBCF4X6eghcAnuAWbtzCltVYEIoBzspEmIszc83i0xupLE/+fDn9m0oM9AyfTPaQrOkiOldbLhrVZxmxIqqZg6nDVxGDp02jOTs93QP2b1N/g33LhIE6eLBFylrfWdZioA4bi57m+pBIB5xejx0pK3zJQdcHptup2lG0HdmXqs17tPxTDO2UNVgU5n95rs/Pxhei/kU9eF0HemcNzJcjbWUNqYvDmmD7QNBvAAAA///RbR0T6wAAAA==
 
 - path: /etc/systemd/system/dhcpv6.service
   permissions: "0644"
diff --git a/pkg/agent/testdata/AKSUbuntu1604+KubeletConfigFile/line156.sh b/pkg/agent/testdata/AKSUbuntu1604+KubeletConfigFile/line156.sh
index 019b0dfc0e2..a7d193529ca 100644
--- a/pkg/agent/testdata/AKSUbuntu1604+KubeletConfigFile/line156.sh
+++ b/pkg/agent/testdata/AKSUbuntu1604+KubeletConfigFile/line156.sh
@@ -1,5 +1,8 @@
 [Unit]
 Description=Bind mount kubelet data
+Requires=mnt.mount
+After=mnt.mount
+
 [Service]
 Restart=on-failure
 RemainAfterExit=yes
diff --git a/pkg/agent/testdata/AKSUbuntu1604+OSKubeletDisk/CustomData b/pkg/agent/testdata/AKSUbuntu1604+OSKubeletDisk/CustomData
index 66aa9bd8b87..69cd5fcf6ac 100644
--- a/pkg/agent/testdata/AKSUbuntu1604+OSKubeletDisk/CustomData
+++ b/pkg/agent/testdata/AKSUbuntu1604+OSKubeletDisk/CustomData
@@ -153,7 +153,7 @@ write_files:
   encoding: gzip
   owner: root
   content: !!binary |
-    H4sIAAAAAAAC/xzNMU7DQBBG4X5O4Qs4e4ItiEhBm4AoLBdj+w8esZ61ZmZRzOkRqZ+evuFDJUZ6hc8me0jVfBZduq02je67TSiIbuFgGm6wH5kx0hUebJGr9neW0gx0xcaiL/eAXR4S+YDT+7EjV4WvNejywHx7XmkSTRP72qW6R+LfZkhz1WBRmP/npX/6J1+Jhjf14FJG+mQNLOcjb62E9M1hp2D7QtBfAAAA//8tGsoCxwAAAA==
+    H4sIAAAAAAAC/0zNsU6EUBCF4X6eghcAnuAWbtzCltVYEIoBzspEmIszc83i0xupLE/+fDn9m0oM9AyfTPaQrOkiOldbLhrVZxmxIqqZg6nDVxGDp02jOTs93QP2b1N/g33LhIE6eLBFylrfWdZioA4bi57m+pBIB5xejx0pK3zJQdcHptup2lG0HdmXqs17tPxTDO2UNVgU5n95rs/Pxhei/kU9eF0HemcNzJcjbWUNqYvDmmD7QNBvAAAA///RbR0T6wAAAA==
 
 - path: /etc/systemd/system/dhcpv6.service
   permissions: "0644"
diff --git a/pkg/agent/testdata/AKSUbuntu1604+OSKubeletDisk/line156.sh b/pkg/agent/testdata/AKSUbuntu1604+OSKubeletDisk/line156.sh
index 019b0dfc0e2..a7d193529ca 100644
--- a/pkg/agent/testdata/AKSUbuntu1604+OSKubeletDisk/line156.sh
+++ b/pkg/agent/testdata/AKSUbuntu1604+OSKubeletDisk/line156.sh
@@ -1,5 +1,8 @@
 [Unit]
 Description=Bind mount kubelet data
+Requires=mnt.mount
+After=mnt.mount
+
 [Service]
 Restart=on-failure
 RemainAfterExit=yes
diff --git a/pkg/agent/testdata/AKSUbuntu1604+TempDisk+Containerd/CustomData b/pkg/agent/testdata/AKSUbuntu1604+TempDisk+Containerd/CustomData
index f8e43035c62..871d7246e00 100644
--- a/pkg/agent/testdata/AKSUbuntu1604+TempDisk+Containerd/CustomData
+++ b/pkg/agent/testdata/AKSUbuntu1604+TempDisk+Containerd/CustomData
@@ -153,7 +153,7 @@ write_files:
   encoding: gzip
   owner: root
   content: !!binary |
-    H4sIAAAAAAAC/xzNMU7DQBBG4X5O4Qs4e4ItiEhBm4AoLBdj+w8esZ61ZmZRzOkRqZ+evuFDJUZ6hc8me0jVfBZduq02je67TSiIbuFgGm6wH5kx0hUebJGr9neW0gx0xcaiL/eAXR4S+YDT+7EjV4WvNejywHx7XmkSTRP72qW6R+LfZkhz1WBRmP/npX/6J1+Jhjf14FJG+mQNLOcjb62E9M1hp2D7QtBfAAAA//8tGsoCxwAAAA==
+    H4sIAAAAAAAC/0zNsU6EUBCF4X6eghcAnuAWbtzCltVYEIoBzspEmIszc83i0xupLE/+fDn9m0oM9AyfTPaQrOkiOldbLhrVZxmxIqqZg6nDVxGDp02jOTs93QP2b1N/g33LhIE6eLBFylrfWdZioA4bi57m+pBIB5xejx0pK3zJQdcHptup2lG0HdmXqs17tPxTDO2UNVgU5n95rs/Pxhei/kU9eF0HemcNzJcjbWUNqYvDmmD7QNBvAAAA///RbR0T6wAAAA==
 
 - path: /etc/systemd/system/dhcpv6.service
   permissions: "0644"
diff --git a/pkg/agent/testdata/AKSUbuntu1604+TempDisk+Containerd/line156.sh b/pkg/agent/testdata/AKSUbuntu1604+TempDisk+Containerd/line156.sh
index 019b0dfc0e2..a7d193529ca 100644
--- a/pkg/agent/testdata/AKSUbuntu1604+TempDisk+Containerd/line156.sh
+++ b/pkg/agent/testdata/AKSUbuntu1604+TempDisk+Containerd/line156.sh
@@ -1,5 +1,8 @@
 [Unit]
 Description=Bind mount kubelet data
+Requires=mnt.mount
+After=mnt.mount
+
 [Service]
 Restart=on-failure
 RemainAfterExit=yes
diff --git a/pkg/agent/testdata/AKSUbuntu1604+TempDiskExplicit/CustomData b/pkg/agent/testdata/AKSUbuntu1604+TempDiskExplicit/CustomData
index ff64be08b33..ca474e81913 100644
--- a/pkg/agent/testdata/AKSUbuntu1604+TempDiskExplicit/CustomData
+++ b/pkg/agent/testdata/AKSUbuntu1604+TempDiskExplicit/CustomData
@@ -153,7 +153,7 @@ write_files:
   encoding: gzip
   owner: root
   content: !!binary |
-    H4sIAAAAAAAC/xzNMU7DQBBG4X5O4Qs4e4ItiEhBm4AoLBdj+w8esZ61ZmZRzOkRqZ+evuFDJUZ6hc8me0jVfBZduq02je67TSiIbuFgGm6wH5kx0hUebJGr9neW0gx0xcaiL/eAXR4S+YDT+7EjV4WvNejywHx7XmkSTRP72qW6R+LfZkhz1WBRmP/npX/6J1+Jhjf14FJG+mQNLOcjb62E9M1hp2D7QtBfAAAA//8tGsoCxwAAAA==
+    H4sIAAAAAAAC/0zNsU6EUBCF4X6eghcAnuAWbtzCltVYEIoBzspEmIszc83i0xupLE/+fDn9m0oM9AyfTPaQrOkiOldbLhrVZxmxIqqZg6nDVxGDp02jOTs93QP2b1N/g33LhIE6eLBFylrfWdZioA4bi57m+pBIB5xejx0pK3zJQdcHptup2lG0HdmXqs17tPxTDO2UNVgU5n95rs/Pxhei/kU9eF0HemcNzJcjbWUNqYvDmmD7QNBvAAAA///RbR0T6wAAAA==
 
 - path: /etc/systemd/system/dhcpv6.service
   permissions: "0644"
diff --git a/pkg/agent/testdata/AKSUbuntu1604+TempDiskExplicit/line156.sh b/pkg/agent/testdata/AKSUbuntu1604+TempDiskExplicit/line156.sh
index 019b0dfc0e2..a7d193529ca 100644
--- a/pkg/agent/testdata/AKSUbuntu1604+TempDiskExplicit/line156.sh
+++ b/pkg/agent/testdata/AKSUbuntu1604+TempDiskExplicit/line156.sh
@@ -1,5 +1,8 @@
 [Unit]
 Description=Bind mount kubelet data
+Requires=mnt.mount
+After=mnt.mount
+
 [Service]
 Restart=on-failure
 RemainAfterExit=yes
diff --git a/pkg/agent/testdata/AKSUbuntu1604+TempDiskToggle/CustomData b/pkg/agent/testdata/AKSUbuntu1604+TempDiskToggle/CustomData
index f8e43035c62..871d7246e00 100644
--- a/pkg/agent/testdata/AKSUbuntu1604+TempDiskToggle/CustomData
+++ b/pkg/agent/testdata/AKSUbuntu1604+TempDiskToggle/CustomData
@@ -153,7 +153,7 @@ write_files:
   encoding: gzip
   owner: root
   content: !!binary |
-    H4sIAAAAAAAC/xzNMU7DQBBG4X5O4Qs4e4ItiEhBm4AoLBdj+w8esZ61ZmZRzOkRqZ+evuFDJUZ6hc8me0jVfBZduq02je67TSiIbuFgGm6wH5kx0hUebJGr9neW0gx0xcaiL/eAXR4S+YDT+7EjV4WvNejywHx7XmkSTRP72qW6R+LfZkhz1WBRmP/npX/6J1+Jhjf14FJG+mQNLOcjb62E9M1hp2D7QtBfAAAA//8tGsoCxwAAAA==
+    H4sIAAAAAAAC/0zNsU6EUBCF4X6eghcAnuAWbtzCltVYEIoBzspEmIszc83i0xupLE/+fDn9m0oM9AyfTPaQrOkiOldbLhrVZxmxIqqZg6nDVxGDp02jOTs93QP2b1N/g33LhIE6eLBFylrfWdZioA4bi57m+pBIB5xejx0pK3zJQdcHptup2lG0HdmXqs17tPxTDO2UNVgU5n95rs/Pxhei/kU9eF0HemcNzJcjbWUNqYvDmmD7QNBvAAAA///RbR0T6wAAAA==
 
 - path: /etc/systemd/system/dhcpv6.service
   permissions: "0644"
diff --git a/pkg/agent/testdata/AKSUbuntu1604+TempDiskToggle/line156.sh b/pkg/agent/testdata/AKSUbuntu1604+TempDiskToggle/line156.sh
index 019b0dfc0e2..a7d193529ca 100644
--- a/pkg/agent/testdata/AKSUbuntu1604+TempDiskToggle/line156.sh
+++ b/pkg/agent/testdata/AKSUbuntu1604+TempDiskToggle/line156.sh
@@ -1,5 +1,8 @@
 [Unit]
 Description=Bind mount kubelet data
+Requires=mnt.mount
+After=mnt.mount
+
 [Service]
 Restart=on-failure
 RemainAfterExit=yes
diff --git a/pkg/agent/testdata/AKSUbuntu1804+ArtifactStreaming/CustomData b/pkg/agent/testdata/AKSUbuntu1804+ArtifactStreaming/CustomData
index 855e35ff588..793e1931d41 100644
--- a/pkg/agent/testdata/AKSUbuntu1804+ArtifactStreaming/CustomData
+++ b/pkg/agent/testdata/AKSUbuntu1804+ArtifactStreaming/CustomData
@@ -153,7 +153,7 @@ write_files:
   encoding: gzip
   owner: root
   content: !!binary |
-    H4sIAAAAAAAC/xzNMU7DQBBG4X5O4Qs4e4ItiEhBm4AoLBdj+w8esZ61ZmZRzOkRqZ+evuFDJUZ6hc8me0jVfBZduq02je67TSiIbuFgGm6wH5kx0hUebJGr9neW0gx0xcaiL/eAXR4S+YDT+7EjV4WvNejywHx7XmkSTRP72qW6R+LfZkhz1WBRmP/npX/6J1+Jhjf14FJG+mQNLOcjb62E9M1hp2D7QtBfAAAA//8tGsoCxwAAAA==
+    H4sIAAAAAAAC/0zNsU6EUBCF4X6eghcAnuAWbtzCltVYEIoBzspEmIszc83i0xupLE/+fDn9m0oM9AyfTPaQrOkiOldbLhrVZxmxIqqZg6nDVxGDp02jOTs93QP2b1N/g33LhIE6eLBFylrfWdZioA4bi57m+pBIB5xejx0pK3zJQdcHptup2lG0HdmXqs17tPxTDO2UNVgU5n95rs/Pxhei/kU9eF0HemcNzJcjbWUNqYvDmmD7QNBvAAAA///RbR0T6wAAAA==
 
 - path: /etc/systemd/system/dhcpv6.service
   permissions: "0644"
diff --git a/pkg/agent/testdata/AKSUbuntu1804+ArtifactStreaming/line156.sh b/pkg/agent/testdata/AKSUbuntu1804+ArtifactStreaming/line156.sh
index 019b0dfc0e2..a7d193529ca 100644
--- a/pkg/agent/testdata/AKSUbuntu1804+ArtifactStreaming/line156.sh
+++ b/pkg/agent/testdata/AKSUbuntu1804+ArtifactStreaming/line156.sh
@@ -1,5 +1,8 @@
 [Unit]
 Description=Bind mount kubelet data
+Requires=mnt.mount
+After=mnt.mount
+
 [Service]
 Restart=on-failure
 RemainAfterExit=yes
diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd++GPU+runcshimv2/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Containerd++GPU+runcshimv2/CustomData
index 9f374e51942..d8ba5e8236f 100644
--- a/pkg/agent/testdata/AKSUbuntu1804+Containerd++GPU+runcshimv2/CustomData
+++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd++GPU+runcshimv2/CustomData
@@ -153,7 +153,7 @@ write_files:
   encoding: gzip
   owner: root
   content: !!binary |
-    H4sIAAAAAAAC/xzNMU7DQBBG4X5O4Qs4e4ItiEhBm4AoLBdj+w8esZ61ZmZRzOkRqZ+evuFDJUZ6hc8me0jVfBZduq02je67TSiIbuFgGm6wH5kx0hUebJGr9neW0gx0xcaiL/eAXR4S+YDT+7EjV4WvNejywHx7XmkSTRP72qW6R+LfZkhz1WBRmP/npX/6J1+Jhjf14FJG+mQNLOcjb62E9M1hp2D7QtBfAAAA//8tGsoCxwAAAA==
+    H4sIAAAAAAAC/0zNsU6EUBCF4X6eghcAnuAWbtzCltVYEIoBzspEmIszc83i0xupLE/+fDn9m0oM9AyfTPaQrOkiOldbLhrVZxmxIqqZg6nDVxGDp02jOTs93QP2b1N/g33LhIE6eLBFylrfWdZioA4bi57m+pBIB5xejx0pK3zJQdcHptup2lG0HdmXqs17tPxTDO2UNVgU5n95rs/Pxhei/kU9eF0HemcNzJcjbWUNqYvDmmD7QNBvAAAA///RbR0T6wAAAA==
 
 - path: /etc/systemd/system/dhcpv6.service
   permissions: "0644"
diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd++GPU+runcshimv2/line156.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd++GPU+runcshimv2/line156.sh
index 019b0dfc0e2..a7d193529ca 100644
--- a/pkg/agent/testdata/AKSUbuntu1804+Containerd++GPU+runcshimv2/line156.sh
+++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd++GPU+runcshimv2/line156.sh
@@ -1,5 +1,8 @@
 [Unit]
 Description=Bind mount kubelet data
+Requires=mnt.mount
+After=mnt.mount
+
 [Service]
 Restart=on-failure
 RemainAfterExit=yes
diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Certsd/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Certsd/CustomData
index cd2b3585dca..55593b7b1c6 100644
--- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Certsd/CustomData
+++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Certsd/CustomData
@@ -153,7 +153,7 @@ write_files:
   encoding: gzip
   owner: root
   content: !!binary |
-    H4sIAAAAAAAC/xzNMU7DQBBG4X5O4Qs4e4ItiEhBm4AoLBdj+w8esZ61ZmZRzOkRqZ+evuFDJUZ6hc8me0jVfBZduq02je67TSiIbuFgGm6wH5kx0hUebJGr9neW0gx0xcaiL/eAXR4S+YDT+7EjV4WvNejywHx7XmkSTRP72qW6R+LfZkhz1WBRmP/npX/6J1+Jhjf14FJG+mQNLOcjb62E9M1hp2D7QtBfAAAA//8tGsoCxwAAAA==
+    H4sIAAAAAAAC/0zNsU6EUBCF4X6eghcAnuAWbtzCltVYEIoBzspEmIszc83i0xupLE/+fDn9m0oM9AyfTPaQrOkiOldbLhrVZxmxIqqZg6nDVxGDp02jOTs93QP2b1N/g33LhIE6eLBFylrfWdZioA4bi57m+pBIB5xejx0pK3zJQdcHptup2lG0HdmXqs17tPxTDO2UNVgU5n95rs/Pxhei/kU9eF0HemcNzJcjbWUNqYvDmmD7QNBvAAAA///RbR0T6wAAAA==
 
 - path: /etc/systemd/system/dhcpv6.service
   permissions: "0644"
diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Certsd/line156.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Certsd/line156.sh
index 019b0dfc0e2..a7d193529ca 100644
--- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Certsd/line156.sh
+++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Certsd/line156.sh
@@ -1,5 +1,8 @@
 [Unit]
 Description=Bind mount kubelet data
+Requires=mnt.mount
+After=mnt.mount
+
 [Service]
 Restart=on-failure
 RemainAfterExit=yes
diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+ContainerdVersion/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Containerd+ContainerdVersion/CustomData
index 508aec22ff6..2fd2713bb0d 100644
--- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+ContainerdVersion/CustomData
+++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+ContainerdVersion/CustomData
@@ -153,7 +153,7 @@ write_files:
   encoding: gzip
   owner: root
   content: !!binary |
-    H4sIAAAAAAAC/xzNMU7DQBBG4X5O4Qs4e4ItiEhBm4AoLBdj+w8esZ61ZmZRzOkRqZ+evuFDJUZ6hc8me0jVfBZduq02je67TSiIbuFgGm6wH5kx0hUebJGr9neW0gx0xcaiL/eAXR4S+YDT+7EjV4WvNejywHx7XmkSTRP72qW6R+LfZkhz1WBRmP/npX/6J1+Jhjf14FJG+mQNLOcjb62E9M1hp2D7QtBfAAAA//8tGsoCxwAAAA==
+    H4sIAAAAAAAC/0zNsU6EUBCF4X6eghcAnuAWbtzCltVYEIoBzspEmIszc83i0xupLE/+fDn9m0oM9AyfTPaQrOkiOldbLhrVZxmxIqqZg6nDVxGDp02jOTs93QP2b1N/g33LhIE6eLBFylrfWdZioA4bi57m+pBIB5xejx0pK3zJQdcHptup2lG0HdmXqs17tPxTDO2UNVgU5n95rs/Pxhei/kU9eF0HemcNzJcjbWUNqYvDmmD7QNBvAAAA///RbR0T6wAAAA==
 
 - path: /etc/systemd/system/dhcpv6.service
   permissions: "0644"
diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+ContainerdVersion/line156.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+ContainerdVersion/line156.sh
index 019b0dfc0e2..a7d193529ca 100644
--- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+ContainerdVersion/line156.sh
+++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+ContainerdVersion/line156.sh
@@ -1,5 +1,8 @@
 [Unit]
 Description=Bind mount kubelet data
+Requires=mnt.mount
+After=mnt.mount
+
 [Service]
 Restart=on-failure
 RemainAfterExit=yes
diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPAddress+FQDN/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPAddress+FQDN/CustomData
index 14e87d3d28d..55053a4a4eb 100644
--- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPAddress+FQDN/CustomData
+++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPAddress+FQDN/CustomData
@@ -153,7 +153,7 @@ write_files:
   encoding: gzip
   owner: root
   content: !!binary |
-    H4sIAAAAAAAC/xzNMU7DQBBG4X5O4Qs4e4ItiEhBm4AoLBdj+w8esZ61ZmZRzOkRqZ+evuFDJUZ6hc8me0jVfBZduq02je67TSiIbuFgGm6wH5kx0hUebJGr9neW0gx0xcaiL/eAXR4S+YDT+7EjV4WvNejywHx7XmkSTRP72qW6R+LfZkhz1WBRmP/npX/6J1+Jhjf14FJG+mQNLOcjb62E9M1hp2D7QtBfAAAA//8tGsoCxwAAAA==
+    H4sIAAAAAAAC/0zNsU6EUBCF4X6eghcAnuAWbtzCltVYEIoBzspEmIszc83i0xupLE/+fDn9m0oM9AyfTPaQrOkiOldbLhrVZxmxIqqZg6nDVxGDp02jOTs93QP2b1N/g33LhIE6eLBFylrfWdZioA4bi57m+pBIB5xejx0pK3zJQdcHptup2lG0HdmXqs17tPxTDO2UNVgU5n95rs/Pxhei/kU9eF0HemcNzJcjbWUNqYvDmmD7QNBvAAAA///RbR0T6wAAAA==
 
 - path: /etc/systemd/system/dhcpv6.service
   permissions: "0644"
diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPAddress+FQDN/line156.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPAddress+FQDN/line156.sh
index 019b0dfc0e2..a7d193529ca 100644
--- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPAddress+FQDN/line156.sh
+++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPAddress+FQDN/line156.sh
@@ -1,5 +1,8 @@
 [Unit]
 Description=Bind mount kubelet data
+Requires=mnt.mount
+After=mnt.mount
+
 [Service]
 Restart=on-failure
 RemainAfterExit=yes
diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPMasqAgent/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPMasqAgent/CustomData
index 508aec22ff6..2fd2713bb0d 100644
--- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPMasqAgent/CustomData
+++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPMasqAgent/CustomData
@@ -153,7 +153,7 @@ write_files:
   encoding: gzip
   owner: root
   content: !!binary |
-    H4sIAAAAAAAC/xzNMU7DQBBG4X5O4Qs4e4ItiEhBm4AoLBdj+w8esZ61ZmZRzOkRqZ+evuFDJUZ6hc8me0jVfBZduq02je67TSiIbuFgGm6wH5kx0hUebJGr9neW0gx0xcaiL/eAXR4S+YDT+7EjV4WvNejywHx7XmkSTRP72qW6R+LfZkhz1WBRmP/npX/6J1+Jhjf14FJG+mQNLOcjb62E9M1hp2D7QtBfAAAA//8tGsoCxwAAAA==
+    H4sIAAAAAAAC/0zNsU6EUBCF4X6eghcAnuAWbtzCltVYEIoBzspEmIszc83i0xupLE/+fDn9m0oM9AyfTPaQrOkiOldbLhrVZxmxIqqZg6nDVxGDp02jOTs93QP2b1N/g33LhIE6eLBFylrfWdZioA4bi57m+pBIB5xejx0pK3zJQdcHptup2lG0HdmXqs17tPxTDO2UNVgU5n95rs/Pxhei/kU9eF0HemcNzJcjbWUNqYvDmmD7QNBvAAAA///RbR0T6wAAAA==
 
 - path: /etc/systemd/system/dhcpv6.service
   permissions: "0644"
diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPMasqAgent/line156.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPMasqAgent/line156.sh
index 019b0dfc0e2..a7d193529ca 100644
--- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPMasqAgent/line156.sh
+++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPMasqAgent/line156.sh
@@ -1,5 +1,8 @@
 [Unit]
 Description=Bind mount kubelet data
+Requires=mnt.mount
+After=mnt.mount
+
 [Service]
 Restart=on-failure
 RemainAfterExit=yes
diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+Calico/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+Calico/CustomData
index 3ab41e2dcdb..26983555b40 100644
--- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+Calico/CustomData
+++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+Calico/CustomData
@@ -153,7 +153,7 @@ write_files:
   encoding: gzip
   owner: root
   content: !!binary |
-    H4sIAAAAAAAC/xzNMU7DQBBG4X5O4Qs4e4ItiEhBm4AoLBdj+w8esZ61ZmZRzOkRqZ+evuFDJUZ6hc8me0jVfBZduq02je67TSiIbuFgGm6wH5kx0hUebJGr9neW0gx0xcaiL/eAXR4S+YDT+7EjV4WvNejywHx7XmkSTRP72qW6R+LfZkhz1WBRmP/npX/6J1+Jhjf14FJG+mQNLOcjb62E9M1hp2D7QtBfAAAA//8tGsoCxwAAAA==
+    H4sIAAAAAAAC/0zNsU6EUBCF4X6eghcAnuAWbtzCltVYEIoBzspEmIszc83i0xupLE/+fDn9m0oM9AyfTPaQrOkiOldbLhrVZxmxIqqZg6nDVxGDp02jOTs93QP2b1N/g33LhIE6eLBFylrfWdZioA4bi57m+pBIB5xejx0pK3zJQdcHptup2lG0HdmXqs17tPxTDO2UNVgU5n95rs/Pxhei/kU9eF0HemcNzJcjbWUNqYvDmmD7QNBvAAAA///RbR0T6wAAAA==
 
 - path: /etc/systemd/system/dhcpv6.service
   permissions: "0644"
diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+Calico/line156.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+Calico/line156.sh
index 019b0dfc0e2..a7d193529ca 100644
--- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+Calico/line156.sh
+++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+Calico/line156.sh
@@ -1,5 +1,8 @@
 [Unit]
 Description=Bind mount kubelet data
+Requires=mnt.mount
+After=mnt.mount
+
 [Service]
 Restart=on-failure
 RemainAfterExit=yes
diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+FIPSEnabled/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+FIPSEnabled/CustomData
index 508aec22ff6..2fd2713bb0d 100644
--- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+FIPSEnabled/CustomData
+++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+FIPSEnabled/CustomData
@@ -153,7 +153,7 @@ write_files:
   encoding: gzip
   owner: root
   content: !!binary |
-    H4sIAAAAAAAC/xzNMU7DQBBG4X5O4Qs4e4ItiEhBm4AoLBdj+w8esZ61ZmZRzOkRqZ+evuFDJUZ6hc8me0jVfBZduq02je67TSiIbuFgGm6wH5kx0hUebJGr9neW0gx0xcaiL/eAXR4S+YDT+7EjV4WvNejywHx7XmkSTRP72qW6R+LfZkhz1WBRmP/npX/6J1+Jhjf14FJG+mQNLOcjb62E9M1hp2D7QtBfAAAA//8tGsoCxwAAAA==
+    H4sIAAAAAAAC/0zNsU6EUBCF4X6eghcAnuAWbtzCltVYEIoBzspEmIszc83i0xupLE/+fDn9m0oM9AyfTPaQrOkiOldbLhrVZxmxIqqZg6nDVxGDp02jOTs93QP2b1N/g33LhIE6eLBFylrfWdZioA4bi57m+pBIB5xejx0pK3zJQdcHptup2lG0HdmXqs17tPxTDO2UNVgU5n95rs/Pxhei/kU9eF0HemcNzJcjbWUNqYvDmmD7QNBvAAAA///RbR0T6wAAAA==
 
 - path: /etc/systemd/system/dhcpv6.service
   permissions: "0644"
diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+FIPSEnabled/line156.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+FIPSEnabled/line156.sh
index 019b0dfc0e2..a7d193529ca 100644
--- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+FIPSEnabled/line156.sh
+++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+FIPSEnabled/line156.sh
@@ -1,5 +1,8 @@
 [Unit]
 Description=Bind mount kubelet data
+Requires=mnt.mount
+After=mnt.mount
+
 [Service]
 Restart=on-failure
 RemainAfterExit=yes
diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet/CustomData
index 508aec22ff6..2fd2713bb0d 100644
--- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet/CustomData
+++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet/CustomData
@@ -153,7 +153,7 @@ write_files:
   encoding: gzip
   owner: root
   content: !!binary |
-    H4sIAAAAAAAC/xzNMU7DQBBG4X5O4Qs4e4ItiEhBm4AoLBdj+w8esZ61ZmZRzOkRqZ+evuFDJUZ6hc8me0jVfBZduq02je67TSiIbuFgGm6wH5kx0hUebJGr9neW0gx0xcaiL/eAXR4S+YDT+7EjV4WvNejywHx7XmkSTRP72qW6R+LfZkhz1WBRmP/npX/6J1+Jhjf14FJG+mQNLOcjb62E9M1hp2D7QtBfAAAA//8tGsoCxwAAAA==
+    H4sIAAAAAAAC/0zNsU6EUBCF4X6eghcAnuAWbtzCltVYEIoBzspEmIszc83i0xupLE/+fDn9m0oM9AyfTPaQrOkiOldbLhrVZxmxIqqZg6nDVxGDp02jOTs93QP2b1N/g33LhIE6eLBFylrfWdZioA4bi57m+pBIB5xejx0pK3zJQdcHptup2lG0HdmXqs17tPxTDO2UNVgU5n95rs/Pxhei/kU9eF0HemcNzJcjbWUNqYvDmmD7QNBvAAAA///RbR0T6wAAAA==
 
 - path: /etc/systemd/system/dhcpv6.service
   permissions: "0644"
diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet/line156.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet/line156.sh
index 019b0dfc0e2..a7d193529ca 100644
--- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet/line156.sh
+++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet/line156.sh
@@ -1,5 +1,8 @@
 [Unit]
 Description=Bind mount kubelet data
+Requires=mnt.mount
+After=mnt.mount
+
 [Service]
 Restart=on-failure
 RemainAfterExit=yes
diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG+NoFabricManager/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG+NoFabricManager/CustomData
index 9f374e51942..d8ba5e8236f 100644
--- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG+NoFabricManager/CustomData
+++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG+NoFabricManager/CustomData
@@ -153,7 +153,7 @@ write_files:
   encoding: gzip
   owner: root
   content: !!binary |
-    H4sIAAAAAAAC/xzNMU7DQBBG4X5O4Qs4e4ItiEhBm4AoLBdj+w8esZ61ZmZRzOkRqZ+evuFDJUZ6hc8me0jVfBZduq02je67TSiIbuFgGm6wH5kx0hUebJGr9neW0gx0xcaiL/eAXR4S+YDT+7EjV4WvNejywHx7XmkSTRP72qW6R+LfZkhz1WBRmP/npX/6J1+Jhjf14FJG+mQNLOcjb62E9M1hp2D7QtBfAAAA//8tGsoCxwAAAA==
+    H4sIAAAAAAAC/0zNsU6EUBCF4X6eghcAnuAWbtzCltVYEIoBzspEmIszc83i0xupLE/+fDn9m0oM9AyfTPaQrOkiOldbLhrVZxmxIqqZg6nDVxGDp02jOTs93QP2b1N/g33LhIE6eLBFylrfWdZioA4bi57m+pBIB5xejx0pK3zJQdcHptup2lG0HdmXqs17tPxTDO2UNVgU5n95rs/Pxhei/kU9eF0HemcNzJcjbWUNqYvDmmD7QNBvAAAA///RbR0T6wAAAA==
 
 - path: /etc/systemd/system/dhcpv6.service
   permissions: "0644"
diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG+NoFabricManager/line156.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG+NoFabricManager/line156.sh
index 019b0dfc0e2..a7d193529ca 100644
--- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG+NoFabricManager/line156.sh
+++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG+NoFabricManager/line156.sh
@@ -1,5 +1,8 @@
 [Unit]
 Description=Bind mount kubelet data
+Requires=mnt.mount
+After=mnt.mount
+
 [Service]
 Restart=on-failure
 RemainAfterExit=yes
diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG/CustomData
index 9f374e51942..d8ba5e8236f 100644
--- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG/CustomData
+++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG/CustomData
@@ -153,7 +153,7 @@ write_files:
   encoding: gzip
   owner: root
   content: !!binary |
-    H4sIAAAAAAAC/xzNMU7DQBBG4X5O4Qs4e4ItiEhBm4AoLBdj+w8esZ61ZmZRzOkRqZ+evuFDJUZ6hc8me0jVfBZduq02je67TSiIbuFgGm6wH5kx0hUebJGr9neW0gx0xcaiL/eAXR4S+YDT+7EjV4WvNejywHx7XmkSTRP72qW6R+LfZkhz1WBRmP/npX/6J1+Jhjf14FJG+mQNLOcjb62E9M1hp2D7QtBfAAAA//8tGsoCxwAAAA==
+    H4sIAAAAAAAC/0zNsU6EUBCF4X6eghcAnuAWbtzCltVYEIoBzspEmIszc83i0xupLE/+fDn9m0oM9AyfTPaQrOkiOldbLhrVZxmxIqqZg6nDVxGDp02jOTs93QP2b1N/g33LhIE6eLBFylrfWdZioA4bi57m+pBIB5xejx0pK3zJQdcHptup2lG0HdmXqs17tPxTDO2UNVgU5n95rs/Pxhei/kU9eF0HemcNzJcjbWUNqYvDmmD7QNBvAAAA///RbR0T6wAAAA==
 
 - path: /etc/systemd/system/dhcpv6.service
   permissions: "0644"
diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG/line156.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG/line156.sh
index 019b0dfc0e2..a7d193529ca 100644
--- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG/line156.sh
+++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG/line156.sh
@@ -1,5 +1,8 @@
 [Unit]
 Description=Bind mount kubelet data
+Requires=mnt.mount
+After=mnt.mount
+
 [Service]
 Restart=on-failure
 RemainAfterExit=yes
diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+MotD/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Containerd+MotD/CustomData
index d719d714cd4..de31acbd91d 100644
--- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+MotD/CustomData
+++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+MotD/CustomData
@@ -153,7 +153,7 @@ write_files:
   encoding: gzip
   owner: root
   content: !!binary |
-    H4sIAAAAAAAC/xzNMU7DQBBG4X5O4Qs4e4ItiEhBm4AoLBdj+w8esZ61ZmZRzOkRqZ+evuFDJUZ6hc8me0jVfBZduq02je67TSiIbuFgGm6wH5kx0hUebJGr9neW0gx0xcaiL/eAXR4S+YDT+7EjV4WvNejywHx7XmkSTRP72qW6R+LfZkhz1WBRmP/npX/6J1+Jhjf14FJG+mQNLOcjb62E9M1hp2D7QtBfAAAA//8tGsoCxwAAAA==
+    H4sIAAAAAAAC/0zNsU6EUBCF4X6eghcAnuAWbtzCltVYEIoBzspEmIszc83i0xupLE/+fDn9m0oM9AyfTPaQrOkiOldbLhrVZxmxIqqZg6nDVxGDp02jOTs93QP2b1N/g33LhIE6eLBFylrfWdZioA4bi57m+pBIB5xejx0pK3zJQdcHptup2lG0HdmXqs17tPxTDO2UNVgU5n95rs/Pxhei/kU9eF0HemcNzJcjbWUNqYvDmmD7QNBvAAAA///RbR0T6wAAAA==
 
 - path: /etc/systemd/system/dhcpv6.service
   permissions: "0644"
diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+MotD/line156.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+MotD/line156.sh
index 019b0dfc0e2..a7d193529ca 100644
--- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+MotD/line156.sh
+++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+MotD/line156.sh
@@ -1,5 +1,8 @@
 [Unit]
 Description=Bind mount kubelet data
+Requires=mnt.mount
+After=mnt.mount
+
 [Service]
 Restart=on-failure
 RemainAfterExit=yes
diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+NSeriesSku/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Containerd+NSeriesSku/CustomData
index 79522927e00..64230bf2ef9 100644
--- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+NSeriesSku/CustomData
+++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+NSeriesSku/CustomData
@@ -153,7 +153,7 @@ write_files:
   encoding: gzip
   owner: root
   content: !!binary |
-    H4sIAAAAAAAC/xzNMU7DQBBG4X5O4Qs4e4ItiEhBm4AoLBdj+w8esZ61ZmZRzOkRqZ+evuFDJUZ6hc8me0jVfBZduq02je67TSiIbuFgGm6wH5kx0hUebJGr9neW0gx0xcaiL/eAXR4S+YDT+7EjV4WvNejywHx7XmkSTRP72qW6R+LfZkhz1WBRmP/npX/6J1+Jhjf14FJG+mQNLOcjb62E9M1hp2D7QtBfAAAA//8tGsoCxwAAAA==
+    H4sIAAAAAAAC/0zNsU6EUBCF4X6eghcAnuAWbtzCltVYEIoBzspEmIszc83i0xupLE/+fDn9m0oM9AyfTPaQrOkiOldbLhrVZxmxIqqZg6nDVxGDp02jOTs93QP2b1N/g33LhIE6eLBFylrfWdZioA4bi57m+pBIB5xejx0pK3zJQdcHptup2lG0HdmXqs17tPxTDO2UNVgU5n95rs/Pxhei/kU9eF0HemcNzJcjbWUNqYvDmmD7QNBvAAAA///RbR0T6wAAAA==
 
 - path: /etc/systemd/system/dhcpv6.service
   permissions: "0644"
diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+NSeriesSku/line156.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+NSeriesSku/line156.sh
index 019b0dfc0e2..a7d193529ca 100644
--- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+NSeriesSku/line156.sh
+++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+NSeriesSku/line156.sh
@@ -1,5 +1,8 @@
 [Unit]
 Description=Bind mount kubelet data
+Requires=mnt.mount
+After=mnt.mount
+
 [Service]
 Restart=on-failure
 RemainAfterExit=yes
diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+PrivateACR/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Containerd+PrivateACR/CustomData
index 508aec22ff6..2fd2713bb0d 100644
--- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+PrivateACR/CustomData
+++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+PrivateACR/CustomData
@@ -153,7 +153,7 @@ write_files:
   encoding: gzip
   owner: root
   content: !!binary |
-    H4sIAAAAAAAC/xzNMU7DQBBG4X5O4Qs4e4ItiEhBm4AoLBdj+w8esZ61ZmZRzOkRqZ+evuFDJUZ6hc8me0jVfBZduq02je67TSiIbuFgGm6wH5kx0hUebJGr9neW0gx0xcaiL/eAXR4S+YDT+7EjV4WvNejywHx7XmkSTRP72qW6R+LfZkhz1WBRmP/npX/6J1+Jhjf14FJG+mQNLOcjb62E9M1hp2D7QtBfAAAA//8tGsoCxwAAAA==
+    H4sIAAAAAAAC/0zNsU6EUBCF4X6eghcAnuAWbtzCltVYEIoBzspEmIszc83i0xupLE/+fDn9m0oM9AyfTPaQrOkiOldbLhrVZxmxIqqZg6nDVxGDp02jOTs93QP2b1N/g33LhIE6eLBFylrfWdZioA4bi57m+pBIB5xejx0pK3zJQdcHptup2lG0HdmXqs17tPxTDO2UNVgU5n95rs/Pxhei/kU9eF0HemcNzJcjbWUNqYvDmmD7QNBvAAAA///RbR0T6wAAAA==
 
 - path: /etc/systemd/system/dhcpv6.service
   permissions: "0644"
diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+PrivateACR/line156.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+PrivateACR/line156.sh
index 019b0dfc0e2..a7d193529ca 100644
--- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+PrivateACR/line156.sh
+++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+PrivateACR/line156.sh
@@ -1,5 +1,8 @@
 [Unit]
 Description=Bind mount kubelet data
+Requires=mnt.mount
+After=mnt.mount
+
 [Service]
 Restart=on-failure
 RemainAfterExit=yes
diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Teleport/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Teleport/CustomData
index 508aec22ff6..2fd2713bb0d 100644
--- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Teleport/CustomData
+++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Teleport/CustomData
@@ -153,7 +153,7 @@ write_files:
   encoding: gzip
   owner: root
   content: !!binary |
-    H4sIAAAAAAAC/xzNMU7DQBBG4X5O4Qs4e4ItiEhBm4AoLBdj+w8esZ61ZmZRzOkRqZ+evuFDJUZ6hc8me0jVfBZduq02je67TSiIbuFgGm6wH5kx0hUebJGr9neW0gx0xcaiL/eAXR4S+YDT+7EjV4WvNejywHx7XmkSTRP72qW6R+LfZkhz1WBRmP/npX/6J1+Jhjf14FJG+mQNLOcjb62E9M1hp2D7QtBfAAAA//8tGsoCxwAAAA==
+    H4sIAAAAAAAC/0zNsU6EUBCF4X6eghcAnuAWbtzCltVYEIoBzspEmIszc83i0xupLE/+fDn9m0oM9AyfTPaQrOkiOldbLhrVZxmxIqqZg6nDVxGDp02jOTs93QP2b1N/g33LhIE6eLBFylrfWdZioA4bi57m+pBIB5xejx0pK3zJQdcHptup2lG0HdmXqs17tPxTDO2UNVgU5n95rs/Pxhei/kU9eF0HemcNzJcjbWUNqYvDmmD7QNBvAAAA///RbR0T6wAAAA==
 
 - path: /etc/systemd/system/dhcpv6.service
   permissions: "0644"
diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Teleport/line156.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Teleport/line156.sh
index 019b0dfc0e2..a7d193529ca 100644
--- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Teleport/line156.sh
+++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Teleport/line156.sh
@@ -1,5 +1,8 @@
 [Unit]
 Description=Bind mount kubelet data
+Requires=mnt.mount
+After=mnt.mount
+
 [Service]
 Restart=on-failure
 RemainAfterExit=yes
diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+runcshimv2/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Containerd+runcshimv2/CustomData
index d719d714cd4..de31acbd91d 100644
--- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+runcshimv2/CustomData
+++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+runcshimv2/CustomData
@@ -153,7 +153,7 @@ write_files:
   encoding: gzip
   owner: root
   content: !!binary |
-    H4sIAAAAAAAC/xzNMU7DQBBG4X5O4Qs4e4ItiEhBm4AoLBdj+w8esZ61ZmZRzOkRqZ+evuFDJUZ6hc8me0jVfBZduq02je67TSiIbuFgGm6wH5kx0hUebJGr9neW0gx0xcaiL/eAXR4S+YDT+7EjV4WvNejywHx7XmkSTRP72qW6R+LfZkhz1WBRmP/npX/6J1+Jhjf14FJG+mQNLOcjb62E9M1hp2D7QtBfAAAA//8tGsoCxwAAAA==
+    H4sIAAAAAAAC/0zNsU6EUBCF4X6eghcAnuAWbtzCltVYEIoBzspEmIszc83i0xupLE/+fDn9m0oM9AyfTPaQrOkiOldbLhrVZxmxIqqZg6nDVxGDp02jOTs93QP2b1N/g33LhIE6eLBFylrfWdZioA4bi57m+pBIB5xejx0pK3zJQdcHptup2lG0HdmXqs17tPxTDO2UNVgU5n95rs/Pxhei/kU9eF0HemcNzJcjbWUNqYvDmmD7QNBvAAAA///RbR0T6wAAAA==
 
 - path: /etc/systemd/system/dhcpv6.service
   permissions: "0644"
diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+runcshimv2/line156.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+runcshimv2/line156.sh
index 019b0dfc0e2..a7d193529ca 100644
--- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+runcshimv2/line156.sh
+++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+runcshimv2/line156.sh
@@ -1,5 +1,8 @@
 [Unit]
 Description=Bind mount kubelet data
+Requires=mnt.mount
+After=mnt.mount
+
 [Service]
 Restart=on-failure
 RemainAfterExit=yes
diff --git a/pkg/agent/testdata/AKSUbuntu1804+CustomCATrust/CustomData b/pkg/agent/testdata/AKSUbuntu1804+CustomCATrust/CustomData
index d719d714cd4..de31acbd91d 100644
--- a/pkg/agent/testdata/AKSUbuntu1804+CustomCATrust/CustomData
+++ b/pkg/agent/testdata/AKSUbuntu1804+CustomCATrust/CustomData
@@ -153,7 +153,7 @@ write_files:
   encoding: gzip
   owner: root
   content: !!binary |
-    H4sIAAAAAAAC/xzNMU7DQBBG4X5O4Qs4e4ItiEhBm4AoLBdj+w8esZ61ZmZRzOkRqZ+evuFDJUZ6hc8me0jVfBZduq02je67TSiIbuFgGm6wH5kx0hUebJGr9neW0gx0xcaiL/eAXR4S+YDT+7EjV4WvNejywHx7XmkSTRP72qW6R+LfZkhz1WBRmP/npX/6J1+Jhjf14FJG+mQNLOcjb62E9M1hp2D7QtBfAAAA//8tGsoCxwAAAA==
+    H4sIAAAAAAAC/0zNsU6EUBCF4X6eghcAnuAWbtzCltVYEIoBzspEmIszc83i0xupLE/+fDn9m0oM9AyfTPaQrOkiOldbLhrVZxmxIqqZg6nDVxGDp02jOTs93QP2b1N/g33LhIE6eLBFylrfWdZioA4bi57m+pBIB5xejx0pK3zJQdcHptup2lG0HdmXqs17tPxTDO2UNVgU5n95rs/Pxhei/kU9eF0HemcNzJcjbWUNqYvDmmD7QNBvAAAA///RbR0T6wAAAA==
 
 - path: /etc/systemd/system/dhcpv6.service
   permissions: "0644"
diff --git a/pkg/agent/testdata/AKSUbuntu1804+CustomCATrust/line156.sh b/pkg/agent/testdata/AKSUbuntu1804+CustomCATrust/line156.sh
index 019b0dfc0e2..a7d193529ca 100644
--- a/pkg/agent/testdata/AKSUbuntu1804+CustomCATrust/line156.sh
+++ b/pkg/agent/testdata/AKSUbuntu1804+CustomCATrust/line156.sh
@@ -1,5 +1,8 @@
 [Unit]
 Description=Bind mount kubelet data
+Requires=mnt.mount
+After=mnt.mount
+
 [Service]
 Restart=on-failure
 RemainAfterExit=yes
diff --git a/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=false/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=false/CustomData
index 508aec22ff6..2fd2713bb0d 100644
--- a/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=false/CustomData
+++ b/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=false/CustomData
@@ -153,7 +153,7 @@ write_files:
   encoding: gzip
   owner: root
   content: !!binary |
-    H4sIAAAAAAAC/xzNMU7DQBBG4X5O4Qs4e4ItiEhBm4AoLBdj+w8esZ61ZmZRzOkRqZ+evuFDJUZ6hc8me0jVfBZduq02je67TSiIbuFgGm6wH5kx0hUebJGr9neW0gx0xcaiL/eAXR4S+YDT+7EjV4WvNejywHx7XmkSTRP72qW6R+LfZkhz1WBRmP/npX/6J1+Jhjf14FJG+mQNLOcjb62E9M1hp2D7QtBfAAAA//8tGsoCxwAAAA==
+    H4sIAAAAAAAC/0zNsU6EUBCF4X6eghcAnuAWbtzCltVYEIoBzspEmIszc83i0xupLE/+fDn9m0oM9AyfTPaQrOkiOldbLhrVZxmxIqqZg6nDVxGDp02jOTs93QP2b1N/g33LhIE6eLBFylrfWdZioA4bi57m+pBIB5xejx0pK3zJQdcHptup2lG0HdmXqs17tPxTDO2UNVgU5n95rs/Pxhei/kU9eF0HemcNzJcjbWUNqYvDmmD7QNBvAAAA///RbR0T6wAAAA==
 
 - path: /etc/systemd/system/dhcpv6.service
   permissions: "0644"
diff --git a/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=false/line156.sh b/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=false/line156.sh
index 019b0dfc0e2..a7d193529ca 100644
--- a/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=false/line156.sh
+++ b/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=false/line156.sh
@@ -1,5 +1,8 @@
 [Unit]
 Description=Bind mount kubelet data
+Requires=mnt.mount
+After=mnt.mount
+
 [Service]
 Restart=on-failure
 RemainAfterExit=yes
diff --git a/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=true/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=true/CustomData
index 508aec22ff6..2fd2713bb0d 100644
--- a/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=true/CustomData
+++ b/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=true/CustomData
@@ -153,7 +153,7 @@ write_files:
   encoding: gzip
   owner: root
   content: !!binary |
-    H4sIAAAAAAAC/xzNMU7DQBBG4X5O4Qs4e4ItiEhBm4AoLBdj+w8esZ61ZmZRzOkRqZ+evuFDJUZ6hc8me0jVfBZduq02je67TSiIbuFgGm6wH5kx0hUebJGr9neW0gx0xcaiL/eAXR4S+YDT+7EjV4WvNejywHx7XmkSTRP72qW6R+LfZkhz1WBRmP/npX/6J1+Jhjf14FJG+mQNLOcjb62E9M1hp2D7QtBfAAAA//8tGsoCxwAAAA==
+    H4sIAAAAAAAC/0zNsU6EUBCF4X6eghcAnuAWbtzCltVYEIoBzspEmIszc83i0xupLE/+fDn9m0oM9AyfTPaQrOkiOldbLhrVZxmxIqqZg6nDVxGDp02jOTs93QP2b1N/g33LhIE6eLBFylrfWdZioA4bi57m+pBIB5xejx0pK3zJQdcHptup2lG0HdmXqs17tPxTDO2UNVgU5n95rs/Pxhei/kU9eF0HemcNzJcjbWUNqYvDmmD7QNBvAAAA///RbR0T6wAAAA==
 
 - path: /etc/systemd/system/dhcpv6.service
   permissions: "0644"
diff --git a/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=true/line156.sh b/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=true/line156.sh
index 019b0dfc0e2..a7d193529ca 100644
--- a/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=true/line156.sh
+++ b/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=true/line156.sh
@@ -1,5 +1,8 @@
 [Unit]
 Description=Bind mount kubelet data
+Requires=mnt.mount
+After=mnt.mount
+
 [Service]
 Restart=on-failure
 RemainAfterExit=yes
diff --git a/pkg/agent/testdata/AKSUbuntu1804+DisableCustomData/CustomData b/pkg/agent/testdata/AKSUbuntu1804+DisableCustomData/CustomData
index d719d714cd4..de31acbd91d 100644
--- a/pkg/agent/testdata/AKSUbuntu1804+DisableCustomData/CustomData
+++ b/pkg/agent/testdata/AKSUbuntu1804+DisableCustomData/CustomData
@@ -153,7 +153,7 @@ write_files:
   encoding: gzip
   owner: root
   content: !!binary |
-    H4sIAAAAAAAC/xzNMU7DQBBG4X5O4Qs4e4ItiEhBm4AoLBdj+w8esZ61ZmZRzOkRqZ+evuFDJUZ6hc8me0jVfBZduq02je67TSiIbuFgGm6wH5kx0hUebJGr9neW0gx0xcaiL/eAXR4S+YDT+7EjV4WvNejywHx7XmkSTRP72qW6R+LfZkhz1WBRmP/npX/6J1+Jhjf14FJG+mQNLOcjb62E9M1hp2D7QtBfAAAA//8tGsoCxwAAAA==
+    H4sIAAAAAAAC/0zNsU6EUBCF4X6eghcAnuAWbtzCltVYEIoBzspEmIszc83i0xupLE/+fDn9m0oM9AyfTPaQrOkiOldbLhrVZxmxIqqZg6nDVxGDp02jOTs93QP2b1N/g33LhIE6eLBFylrfWdZioA4bi57m+pBIB5xejx0pK3zJQdcHptup2lG0HdmXqs17tPxTDO2UNVgU5n95rs/Pxhei/kU9eF0HemcNzJcjbWUNqYvDmmD7QNBvAAAA///RbR0T6wAAAA==
 
 - path: /etc/systemd/system/dhcpv6.service
   permissions: "0644"
diff --git a/pkg/agent/testdata/AKSUbuntu1804+DisableCustomData/line156.sh b/pkg/agent/testdata/AKSUbuntu1804+DisableCustomData/line156.sh
index 019b0dfc0e2..a7d193529ca 100644
--- a/pkg/agent/testdata/AKSUbuntu1804+DisableCustomData/line156.sh
+++ b/pkg/agent/testdata/AKSUbuntu1804+DisableCustomData/line156.sh
@@ -1,5 +1,8 @@
 [Unit]
 Description=Bind mount kubelet data
+Requires=mnt.mount
+After=mnt.mount
+
 [Service]
 Restart=on-failure
 RemainAfterExit=yes
diff --git a/pkg/agent/testdata/AKSUbuntu1804+HTTPProxy/CustomData b/pkg/agent/testdata/AKSUbuntu1804+HTTPProxy/CustomData
index d719d714cd4..de31acbd91d 100644
--- a/pkg/agent/testdata/AKSUbuntu1804+HTTPProxy/CustomData
+++ b/pkg/agent/testdata/AKSUbuntu1804+HTTPProxy/CustomData
@@ -153,7 +153,7 @@ write_files:
   encoding: gzip
   owner: root
   content: !!binary |
-    H4sIAAAAAAAC/xzNMU7DQBBG4X5O4Qs4e4ItiEhBm4AoLBdj+w8esZ61ZmZRzOkRqZ+evuFDJUZ6hc8me0jVfBZduq02je67TSiIbuFgGm6wH5kx0hUebJGr9neW0gx0xcaiL/eAXR4S+YDT+7EjV4WvNejywHx7XmkSTRP72qW6R+LfZkhz1WBRmP/npX/6J1+Jhjf14FJG+mQNLOcjb62E9M1hp2D7QtBfAAAA//8tGsoCxwAAAA==
+    H4sIAAAAAAAC/0zNsU6EUBCF4X6eghcAnuAWbtzCltVYEIoBzspEmIszc83i0xupLE/+fDn9m0oM9AyfTPaQrOkiOldbLhrVZxmxIqqZg6nDVxGDp02jOTs93QP2b1N/g33LhIE6eLBFylrfWdZioA4bi57m+pBIB5xejx0pK3zJQdcHptup2lG0HdmXqs17tPxTDO2UNVgU5n95rs/Pxhei/kU9eF0HemcNzJcjbWUNqYvDmmD7QNBvAAAA///RbR0T6wAAAA==
 
 - path: /etc/systemd/system/dhcpv6.service
   permissions: "0644"
diff --git a/pkg/agent/testdata/AKSUbuntu1804+HTTPProxy/line156.sh b/pkg/agent/testdata/AKSUbuntu1804+HTTPProxy/line156.sh
index 019b0dfc0e2..a7d193529ca 100644
--- a/pkg/agent/testdata/AKSUbuntu1804+HTTPProxy/line156.sh
+++ b/pkg/agent/testdata/AKSUbuntu1804+HTTPProxy/line156.sh
@@ -1,5 +1,8 @@
 [Unit]
 Description=Bind mount kubelet data
+Requires=mnt.mount
+After=mnt.mount
+
 [Service]
 Restart=on-failure
 RemainAfterExit=yes
diff --git a/pkg/agent/testdata/AKSUbuntu1804+KubeletClientTLSBootstrapping/CustomData b/pkg/agent/testdata/AKSUbuntu1804+KubeletClientTLSBootstrapping/CustomData
index 8452c93b90d..31bcf4402a3 100644
--- a/pkg/agent/testdata/AKSUbuntu1804+KubeletClientTLSBootstrapping/CustomData
+++ b/pkg/agent/testdata/AKSUbuntu1804+KubeletClientTLSBootstrapping/CustomData
@@ -153,7 +153,7 @@ write_files:
   encoding: gzip
   owner: root
   content: !!binary |
-    H4sIAAAAAAAC/xzNMU7DQBBG4X5O4Qs4e4ItiEhBm4AoLBdj+w8esZ61ZmZRzOkRqZ+evuFDJUZ6hc8me0jVfBZduq02je67TSiIbuFgGm6wH5kx0hUebJGr9neW0gx0xcaiL/eAXR4S+YDT+7EjV4WvNejywHx7XmkSTRP72qW6R+LfZkhz1WBRmP/npX/6J1+Jhjf14FJG+mQNLOcjb62E9M1hp2D7QtBfAAAA//8tGsoCxwAAAA==
+    H4sIAAAAAAAC/0zNsU6EUBCF4X6eghcAnuAWbtzCltVYEIoBzspEmIszc83i0xupLE/+fDn9m0oM9AyfTPaQrOkiOldbLhrVZxmxIqqZg6nDVxGDp02jOTs93QP2b1N/g33LhIE6eLBFylrfWdZioA4bi57m+pBIB5xejx0pK3zJQdcHptup2lG0HdmXqs17tPxTDO2UNVgU5n95rs/Pxhei/kU9eF0HemcNzJcjbWUNqYvDmmD7QNBvAAAA///RbR0T6wAAAA==
 
 - path: /etc/systemd/system/dhcpv6.service
   permissions: "0644"
diff --git a/pkg/agent/testdata/AKSUbuntu1804+KubeletClientTLSBootstrapping/line156.sh b/pkg/agent/testdata/AKSUbuntu1804+KubeletClientTLSBootstrapping/line156.sh
index 019b0dfc0e2..a7d193529ca 100644
--- a/pkg/agent/testdata/AKSUbuntu1804+KubeletClientTLSBootstrapping/line156.sh
+++ b/pkg/agent/testdata/AKSUbuntu1804+KubeletClientTLSBootstrapping/line156.sh
@@ -1,5 +1,8 @@
 [Unit]
 Description=Bind mount kubelet data
+Requires=mnt.mount
+After=mnt.mount
+
 [Service]
 Restart=on-failure
 RemainAfterExit=yes
diff --git a/pkg/agent/testdata/AKSUbuntu1804+NoArtifactStreaming/CustomData b/pkg/agent/testdata/AKSUbuntu1804+NoArtifactStreaming/CustomData
index 855e35ff588..793e1931d41 100644
--- a/pkg/agent/testdata/AKSUbuntu1804+NoArtifactStreaming/CustomData
+++ b/pkg/agent/testdata/AKSUbuntu1804+NoArtifactStreaming/CustomData
@@ -153,7 +153,7 @@ write_files:
   encoding: gzip
   owner: root
   content: !!binary |
-    H4sIAAAAAAAC/xzNMU7DQBBG4X5O4Qs4e4ItiEhBm4AoLBdj+w8esZ61ZmZRzOkRqZ+evuFDJUZ6hc8me0jVfBZduq02je67TSiIbuFgGm6wH5kx0hUebJGr9neW0gx0xcaiL/eAXR4S+YDT+7EjV4WvNejywHx7XmkSTRP72qW6R+LfZkhz1WBRmP/npX/6J1+Jhjf14FJG+mQNLOcjb62E9M1hp2D7QtBfAAAA//8tGsoCxwAAAA==
+    H4sIAAAAAAAC/0zNsU6EUBCF4X6eghcAnuAWbtzCltVYEIoBzspEmIszc83i0xupLE/+fDn9m0oM9AyfTPaQrOkiOldbLhrVZxmxIqqZg6nDVxGDp02jOTs93QP2b1N/g33LhIE6eLBFylrfWdZioA4bi57m+pBIB5xejx0pK3zJQdcHptup2lG0HdmXqs17tPxTDO2UNVgU5n95rs/Pxhei/kU9eF0HemcNzJcjbWUNqYvDmmD7QNBvAAAA///RbR0T6wAAAA==
 
 - path: /etc/systemd/system/dhcpv6.service
   permissions: "0644"
diff --git a/pkg/agent/testdata/AKSUbuntu1804+NoArtifactStreaming/line156.sh b/pkg/agent/testdata/AKSUbuntu1804+NoArtifactStreaming/line156.sh
index 019b0dfc0e2..a7d193529ca 100644
--- a/pkg/agent/testdata/AKSUbuntu1804+NoArtifactStreaming/line156.sh
+++ b/pkg/agent/testdata/AKSUbuntu1804+NoArtifactStreaming/line156.sh
@@ -1,5 +1,8 @@
 [Unit]
 Description=Bind mount kubelet data
+Requires=mnt.mount
+After=mnt.mount
+
 [Service]
 Restart=on-failure
 RemainAfterExit=yes
diff --git a/pkg/agent/testdata/AKSUbuntu1804+NoneCNI/CustomData b/pkg/agent/testdata/AKSUbuntu1804+NoneCNI/CustomData
index cd2b3585dca..55593b7b1c6 100644
--- a/pkg/agent/testdata/AKSUbuntu1804+NoneCNI/CustomData
+++ b/pkg/agent/testdata/AKSUbuntu1804+NoneCNI/CustomData
@@ -153,7 +153,7 @@ write_files:
   encoding: gzip
   owner: root
   content: !!binary |
-    H4sIAAAAAAAC/xzNMU7DQBBG4X5O4Qs4e4ItiEhBm4AoLBdj+w8esZ61ZmZRzOkRqZ+evuFDJUZ6hc8me0jVfBZduq02je67TSiIbuFgGm6wH5kx0hUebJGr9neW0gx0xcaiL/eAXR4S+YDT+7EjV4WvNejywHx7XmkSTRP72qW6R+LfZkhz1WBRmP/npX/6J1+Jhjf14FJG+mQNLOcjb62E9M1hp2D7QtBfAAAA//8tGsoCxwAAAA==
+    H4sIAAAAAAAC/0zNsU6EUBCF4X6eghcAnuAWbtzCltVYEIoBzspEmIszc83i0xupLE/+fDn9m0oM9AyfTPaQrOkiOldbLhrVZxmxIqqZg6nDVxGDp02jOTs93QP2b1N/g33LhIE6eLBFylrfWdZioA4bi57m+pBIB5xejx0pK3zJQdcHptup2lG0HdmXqs17tPxTDO2UNVgU5n95rs/Pxhei/kU9eF0HemcNzJcjbWUNqYvDmmD7QNBvAAAA///RbR0T6wAAAA==
 
 - path: /etc/systemd/system/dhcpv6.service
   permissions: "0644"
diff --git a/pkg/agent/testdata/AKSUbuntu1804+NoneCNI/line156.sh b/pkg/agent/testdata/AKSUbuntu1804+NoneCNI/line156.sh
index 019b0dfc0e2..a7d193529ca 100644
--- a/pkg/agent/testdata/AKSUbuntu1804+NoneCNI/line156.sh
+++ b/pkg/agent/testdata/AKSUbuntu1804+NoneCNI/line156.sh
@@ -1,5 +1,8 @@
 [Unit]
 Description=Bind mount kubelet data
+Requires=mnt.mount
+After=mnt.mount
+
 [Service]
 Restart=on-failure
 RemainAfterExit=yes
diff --git a/pkg/agent/testdata/AKSUbuntu1804+krustlet/CustomData b/pkg/agent/testdata/AKSUbuntu1804+krustlet/CustomData
index 6110666f03a..f3624a1d000 100644
--- a/pkg/agent/testdata/AKSUbuntu1804+krustlet/CustomData
+++ b/pkg/agent/testdata/AKSUbuntu1804+krustlet/CustomData
@@ -153,7 +153,7 @@ write_files:
   encoding: gzip
   owner: root
   content: !!binary |
-    H4sIAAAAAAAC/xzNMU7DQBBG4X5O4Qs4e4ItiEhBm4AoLBdj+w8esZ61ZmZRzOkRqZ+evuFDJUZ6hc8me0jVfBZduq02je67TSiIbuFgGm6wH5kx0hUebJGr9neW0gx0xcaiL/eAXR4S+YDT+7EjV4WvNejywHx7XmkSTRP72qW6R+LfZkhz1WBRmP/npX/6J1+Jhjf14FJG+mQNLOcjb62E9M1hp2D7QtBfAAAA//8tGsoCxwAAAA==
+    H4sIAAAAAAAC/0zNsU6EUBCF4X6eghcAnuAWbtzCltVYEIoBzspEmIszc83i0xupLE/+fDn9m0oM9AyfTPaQrOkiOldbLhrVZxmxIqqZg6nDVxGDp02jOTs93QP2b1N/g33LhIE6eLBFylrfWdZioA4bi57m+pBIB5xejx0pK3zJQdcHptup2lG0HdmXqs17tPxTDO2UNVgU5n95rs/Pxhei/kU9eF0HemcNzJcjbWUNqYvDmmD7QNBvAAAA///RbR0T6wAAAA==
 
 - path: /etc/systemd/system/dhcpv6.service
   permissions: "0644"
diff --git a/pkg/agent/testdata/AKSUbuntu1804+krustlet/line156.sh b/pkg/agent/testdata/AKSUbuntu1804+krustlet/line156.sh
index 019b0dfc0e2..a7d193529ca 100644
--- a/pkg/agent/testdata/AKSUbuntu1804+krustlet/line156.sh
+++ b/pkg/agent/testdata/AKSUbuntu1804+krustlet/line156.sh
@@ -1,5 +1,8 @@
 [Unit]
 Description=Bind mount kubelet data
+Requires=mnt.mount
+After=mnt.mount
+
 [Service]
 Restart=on-failure
 RemainAfterExit=yes
diff --git a/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+CustomKubeImageandBinaries/CustomData b/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+CustomKubeImageandBinaries/CustomData
index 0e904154518..4b2791c7cbb 100644
--- a/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+CustomKubeImageandBinaries/CustomData
+++ b/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+CustomKubeImageandBinaries/CustomData
@@ -153,7 +153,7 @@ write_files:
   encoding: gzip
   owner: root
   content: !!binary |
-    H4sIAAAAAAAC/xzNMU7DQBBG4X5O4Qs4e4ItiEhBm4AoLBdj+w8esZ61ZmZRzOkRqZ+evuFDJUZ6hc8me0jVfBZduq02je67TSiIbuFgGm6wH5kx0hUebJGr9neW0gx0xcaiL/eAXR4S+YDT+7EjV4WvNejywHx7XmkSTRP72qW6R+LfZkhz1WBRmP/npX/6J1+Jhjf14FJG+mQNLOcjb62E9M1hp2D7QtBfAAAA//8tGsoCxwAAAA==
+    H4sIAAAAAAAC/0zNsU6EUBCF4X6eghcAnuAWbtzCltVYEIoBzspEmIszc83i0xupLE/+fDn9m0oM9AyfTPaQrOkiOldbLhrVZxmxIqqZg6nDVxGDp02jOTs93QP2b1N/g33LhIE6eLBFylrfWdZioA4bi57m+pBIB5xejx0pK3zJQdcHptup2lG0HdmXqs17tPxTDO2UNVgU5n95rs/Pxhei/kU9eF0HemcNzJcjbWUNqYvDmmD7QNBvAAAA///RbR0T6wAAAA==
 
 - path: /etc/systemd/system/dhcpv6.service
   permissions: "0644"
diff --git a/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+CustomKubeImageandBinaries/line156.sh b/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+CustomKubeImageandBinaries/line156.sh
index 019b0dfc0e2..a7d193529ca 100644
--- a/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+CustomKubeImageandBinaries/line156.sh
+++ b/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+CustomKubeImageandBinaries/line156.sh
@@ -1,5 +1,8 @@
 [Unit]
 Description=Bind mount kubelet data
+Requires=mnt.mount
+After=mnt.mount
+
 [Service]
 Restart=on-failure
 RemainAfterExit=yes
diff --git a/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+NoCustomKubeImageandBinaries/CustomData b/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+NoCustomKubeImageandBinaries/CustomData
index 89ebb621f12..124f0c7b98a 100644
--- a/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+NoCustomKubeImageandBinaries/CustomData
+++ b/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+NoCustomKubeImageandBinaries/CustomData
@@ -153,7 +153,7 @@ write_files:
   encoding: gzip
   owner: root
   content: !!binary |
-    H4sIAAAAAAAC/xzNMU7DQBBG4X5O4Qs4e4ItiEhBm4AoLBdj+w8esZ61ZmZRzOkRqZ+evuFDJUZ6hc8me0jVfBZduq02je67TSiIbuFgGm6wH5kx0hUebJGr9neW0gx0xcaiL/eAXR4S+YDT+7EjV4WvNejywHx7XmkSTRP72qW6R+LfZkhz1WBRmP/npX/6J1+Jhjf14FJG+mQNLOcjb62E9M1hp2D7QtBfAAAA//8tGsoCxwAAAA==
+    H4sIAAAAAAAC/0zNsU6EUBCF4X6eghcAnuAWbtzCltVYEIoBzspEmIszc83i0xupLE/+fDn9m0oM9AyfTPaQrOkiOldbLhrVZxmxIqqZg6nDVxGDp02jOTs93QP2b1N/g33LhIE6eLBFylrfWdZioA4bi57m+pBIB5xejx0pK3zJQdcHptup2lG0HdmXqs17tPxTDO2UNVgU5n95rs/Pxhei/kU9eF0HemcNzJcjbWUNqYvDmmD7QNBvAAAA///RbR0T6wAAAA==
 
 - path: /etc/systemd/system/dhcpv6.service
   permissions: "0644"
diff --git a/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+NoCustomKubeImageandBinaries/line156.sh b/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+NoCustomKubeImageandBinaries/line156.sh
index 019b0dfc0e2..a7d193529ca 100644
--- a/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+NoCustomKubeImageandBinaries/line156.sh
+++ b/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+NoCustomKubeImageandBinaries/line156.sh
@@ -1,5 +1,8 @@
 [Unit]
 Description=Bind mount kubelet data
+Requires=mnt.mount
+After=mnt.mount
+
 [Service]
 Restart=on-failure
 RemainAfterExit=yes
diff --git a/pkg/agent/testdata/AKSUbuntu1804Containerd+RuncVersion/CustomData b/pkg/agent/testdata/AKSUbuntu1804Containerd+RuncVersion/CustomData
index 508aec22ff6..2fd2713bb0d 100644
--- a/pkg/agent/testdata/AKSUbuntu1804Containerd+RuncVersion/CustomData
+++ b/pkg/agent/testdata/AKSUbuntu1804Containerd+RuncVersion/CustomData
@@ -153,7 +153,7 @@ write_files:
   encoding: gzip
   owner: root
   content: !!binary |
-    H4sIAAAAAAAC/xzNMU7DQBBG4X5O4Qs4e4ItiEhBm4AoLBdj+w8esZ61ZmZRzOkRqZ+evuFDJUZ6hc8me0jVfBZduq02je67TSiIbuFgGm6wH5kx0hUebJGr9neW0gx0xcaiL/eAXR4S+YDT+7EjV4WvNejywHx7XmkSTRP72qW6R+LfZkhz1WBRmP/npX/6J1+Jhjf14FJG+mQNLOcjb62E9M1hp2D7QtBfAAAA//8tGsoCxwAAAA==
+    H4sIAAAAAAAC/0zNsU6EUBCF4X6eghcAnuAWbtzCltVYEIoBzspEmIszc83i0xupLE/+fDn9m0oM9AyfTPaQrOkiOldbLhrVZxmxIqqZg6nDVxGDp02jOTs93QP2b1N/g33LhIE6eLBFylrfWdZioA4bi57m+pBIB5xejx0pK3zJQdcHptup2lG0HdmXqs17tPxTDO2UNVgU5n95rs/Pxhei/kU9eF0HemcNzJcjbWUNqYvDmmD7QNBvAAAA///RbR0T6wAAAA==
 
 - path: /etc/systemd/system/dhcpv6.service
   permissions: "0644"
diff --git a/pkg/agent/testdata/AKSUbuntu1804Containerd+RuncVersion/line156.sh b/pkg/agent/testdata/AKSUbuntu1804Containerd+RuncVersion/line156.sh
index 019b0dfc0e2..a7d193529ca 100644
--- a/pkg/agent/testdata/AKSUbuntu1804Containerd+RuncVersion/line156.sh
+++ b/pkg/agent/testdata/AKSUbuntu1804Containerd+RuncVersion/line156.sh
@@ -1,5 +1,8 @@
 [Unit]
 Description=Bind mount kubelet data
+Requires=mnt.mount
+After=mnt.mount
+
 [Service]
 Restart=on-failure
 RemainAfterExit=yes
diff --git a/pkg/agent/testdata/AKSUbuntu2204+China/CustomData b/pkg/agent/testdata/AKSUbuntu2204+China/CustomData
index 18604c80bcb..e1183943e03 100644
--- a/pkg/agent/testdata/AKSUbuntu2204+China/CustomData
+++ b/pkg/agent/testdata/AKSUbuntu2204+China/CustomData
@@ -153,7 +153,7 @@ write_files:
   encoding: gzip
   owner: root
   content: !!binary |
-    H4sIAAAAAAAC/xzNMU7DQBBG4X5O4Qs4e4ItiEhBm4AoLBdj+w8esZ61ZmZRzOkRqZ+evuFDJUZ6hc8me0jVfBZduq02je67TSiIbuFgGm6wH5kx0hUebJGr9neW0gx0xcaiL/eAXR4S+YDT+7EjV4WvNejywHx7XmkSTRP72qW6R+LfZkhz1WBRmP/npX/6J1+Jhjf14FJG+mQNLOcjb62E9M1hp2D7QtBfAAAA//8tGsoCxwAAAA==
+    H4sIAAAAAAAC/0zNsU6EUBCF4X6eghcAnuAWbtzCltVYEIoBzspEmIszc83i0xupLE/+fDn9m0oM9AyfTPaQrOkiOldbLhrVZxmxIqqZg6nDVxGDp02jOTs93QP2b1N/g33LhIE6eLBFylrfWdZioA4bi57m+pBIB5xejx0pK3zJQdcHptup2lG0HdmXqs17tPxTDO2UNVgU5n95rs/Pxhei/kU9eF0HemcNzJcjbWUNqYvDmmD7QNBvAAAA///RbR0T6wAAAA==
 
 - path: /etc/systemd/system/dhcpv6.service
   permissions: "0644"
diff --git a/pkg/agent/testdata/AKSUbuntu2204+China/line156.sh b/pkg/agent/testdata/AKSUbuntu2204+China/line156.sh
index 019b0dfc0e2..a7d193529ca 100644
--- a/pkg/agent/testdata/AKSUbuntu2204+China/line156.sh
+++ b/pkg/agent/testdata/AKSUbuntu2204+China/line156.sh
@@ -1,5 +1,8 @@
 [Unit]
 Description=Bind mount kubelet data
+Requires=mnt.mount
+After=mnt.mount
+
 [Service]
 Restart=on-failure
 RemainAfterExit=yes
diff --git a/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG+ArtifactStreaming/CustomData b/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG+ArtifactStreaming/CustomData
index 64beb9c0778..f624f6c8ee1 100644
--- a/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG+ArtifactStreaming/CustomData
+++ b/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG+ArtifactStreaming/CustomData
@@ -153,7 +153,7 @@ write_files:
   encoding: gzip
   owner: root
   content: !!binary |
-    H4sIAAAAAAAC/xzNMU7DQBBG4X5O4Qs4e4ItiEhBm4AoLBdj+w8esZ61ZmZRzOkRqZ+evuFDJUZ6hc8me0jVfBZduq02je67TSiIbuFgGm6wH5kx0hUebJGr9neW0gx0xcaiL/eAXR4S+YDT+7EjV4WvNejywHx7XmkSTRP72qW6R+LfZkhz1WBRmP/npX/6J1+Jhjf14FJG+mQNLOcjb62E9M1hp2D7QtBfAAAA//8tGsoCxwAAAA==
+    H4sIAAAAAAAC/0zNsU6EUBCF4X6eghcAnuAWbtzCltVYEIoBzspEmIszc83i0xupLE/+fDn9m0oM9AyfTPaQrOkiOldbLhrVZxmxIqqZg6nDVxGDp02jOTs93QP2b1N/g33LhIE6eLBFylrfWdZioA4bi57m+pBIB5xejx0pK3zJQdcHptup2lG0HdmXqs17tPxTDO2UNVgU5n95rs/Pxhei/kU9eF0HemcNzJcjbWUNqYvDmmD7QNBvAAAA///RbR0T6wAAAA==
 
 - path: /etc/systemd/system/dhcpv6.service
   permissions: "0644"
diff --git a/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG+ArtifactStreaming/line156.sh b/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG+ArtifactStreaming/line156.sh
index 019b0dfc0e2..a7d193529ca 100644
--- a/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG+ArtifactStreaming/line156.sh
+++ b/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG+ArtifactStreaming/line156.sh
@@ -1,5 +1,8 @@
 [Unit]
 Description=Bind mount kubelet data
+Requires=mnt.mount
+After=mnt.mount
+
 [Service]
 Restart=on-failure
 RemainAfterExit=yes
diff --git a/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG/CustomData b/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG/CustomData
index 73f3c48b47e..7de7c11d5c9 100644
--- a/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG/CustomData
+++ b/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG/CustomData
@@ -153,7 +153,7 @@ write_files:
   encoding: gzip
   owner: root
   content: !!binary |
-    H4sIAAAAAAAC/xzNMU7DQBBG4X5O4Qs4e4ItiEhBm4AoLBdj+w8esZ61ZmZRzOkRqZ+evuFDJUZ6hc8me0jVfBZduq02je67TSiIbuFgGm6wH5kx0hUebJGr9neW0gx0xcaiL/eAXR4S+YDT+7EjV4WvNejywHx7XmkSTRP72qW6R+LfZkhz1WBRmP/npX/6J1+Jhjf14FJG+mQNLOcjb62E9M1hp2D7QtBfAAAA//8tGsoCxwAAAA==
+    H4sIAAAAAAAC/0zNsU6EUBCF4X6eghcAnuAWbtzCltVYEIoBzspEmIszc83i0xupLE/+fDn9m0oM9AyfTPaQrOkiOldbLhrVZxmxIqqZg6nDVxGDp02jOTs93QP2b1N/g33LhIE6eLBFylrfWdZioA4bi57m+pBIB5xejx0pK3zJQdcHptup2lG0HdmXqs17tPxTDO2UNVgU5n95rs/Pxhei/kU9eF0HemcNzJcjbWUNqYvDmmD7QNBvAAAA///RbR0T6wAAAA==
 
 - path: /etc/systemd/system/dhcpv6.service
   permissions: "0644"
diff --git a/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG/line156.sh b/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG/line156.sh
index 019b0dfc0e2..a7d193529ca 100644
--- a/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG/line156.sh
+++ b/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG/line156.sh
@@ -1,5 +1,8 @@
 [Unit]
 Description=Bind mount kubelet data
+Requires=mnt.mount
+After=mnt.mount
+
 [Service]
 Restart=on-failure
 RemainAfterExit=yes
diff --git a/pkg/agent/testdata/AKSUbuntu2204+CustomCloud+ootcredentialprovider/CustomData b/pkg/agent/testdata/AKSUbuntu2204+CustomCloud+ootcredentialprovider/CustomData
index 8821a0111da..fcc758b7f6a 100644
--- a/pkg/agent/testdata/AKSUbuntu2204+CustomCloud+ootcredentialprovider/CustomData
+++ b/pkg/agent/testdata/AKSUbuntu2204+CustomCloud+ootcredentialprovider/CustomData
@@ -153,7 +153,7 @@ write_files:
   encoding: gzip
   owner: root
   content: !!binary |
-    H4sIAAAAAAAC/xzNMU7DQBBG4X5O4Qs4e4ItiEhBm4AoLBdj+w8esZ61ZmZRzOkRqZ+evuFDJUZ6hc8me0jVfBZduq02je67TSiIbuFgGm6wH5kx0hUebJGr9neW0gx0xcaiL/eAXR4S+YDT+7EjV4WvNejywHx7XmkSTRP72qW6R+LfZkhz1WBRmP/npX/6J1+Jhjf14FJG+mQNLOcjb62E9M1hp2D7QtBfAAAA//8tGsoCxwAAAA==
+    H4sIAAAAAAAC/0zNsU6EUBCF4X6eghcAnuAWbtzCltVYEIoBzspEmIszc83i0xupLE/+fDn9m0oM9AyfTPaQrOkiOldbLhrVZxmxIqqZg6nDVxGDp02jOTs93QP2b1N/g33LhIE6eLBFylrfWdZioA4bi57m+pBIB5xejx0pK3zJQdcHptup2lG0HdmXqs17tPxTDO2UNVgU5n95rs/Pxhei/kU9eF0HemcNzJcjbWUNqYvDmmD7QNBvAAAA///RbR0T6wAAAA==
 
 - path: /etc/systemd/system/dhcpv6.service
   permissions: "0644"
diff --git a/pkg/agent/testdata/AKSUbuntu2204+CustomCloud+ootcredentialprovider/line156.sh b/pkg/agent/testdata/AKSUbuntu2204+CustomCloud+ootcredentialprovider/line156.sh
index 019b0dfc0e2..a7d193529ca 100644
--- a/pkg/agent/testdata/AKSUbuntu2204+CustomCloud+ootcredentialprovider/line156.sh
+++ b/pkg/agent/testdata/AKSUbuntu2204+CustomCloud+ootcredentialprovider/line156.sh
@@ -1,5 +1,8 @@
 [Unit]
 Description=Bind mount kubelet data
+Requires=mnt.mount
+After=mnt.mount
+
 [Service]
 Restart=on-failure
 RemainAfterExit=yes
diff --git a/pkg/agent/testdata/AKSUbuntu2204+CustomCloud/CustomData b/pkg/agent/testdata/AKSUbuntu2204+CustomCloud/CustomData
index c60a2b140a5..dfd4d603443 100644
--- a/pkg/agent/testdata/AKSUbuntu2204+CustomCloud/CustomData
+++ b/pkg/agent/testdata/AKSUbuntu2204+CustomCloud/CustomData
@@ -153,7 +153,7 @@ write_files:
   encoding: gzip
   owner: root
   content: !!binary |
-    H4sIAAAAAAAC/xzNMU7DQBBG4X5O4Qs4e4ItiEhBm4AoLBdj+w8esZ61ZmZRzOkRqZ+evuFDJUZ6hc8me0jVfBZduq02je67TSiIbuFgGm6wH5kx0hUebJGr9neW0gx0xcaiL/eAXR4S+YDT+7EjV4WvNejywHx7XmkSTRP72qW6R+LfZkhz1WBRmP/npX/6J1+Jhjf14FJG+mQNLOcjb62E9M1hp2D7QtBfAAAA//8tGsoCxwAAAA==
+    H4sIAAAAAAAC/0zNsU6EUBCF4X6eghcAnuAWbtzCltVYEIoBzspEmIszc83i0xupLE/+fDn9m0oM9AyfTPaQrOkiOldbLhrVZxmxIqqZg6nDVxGDp02jOTs93QP2b1N/g33LhIE6eLBFylrfWdZioA4bi57m+pBIB5xejx0pK3zJQdcHptup2lG0HdmXqs17tPxTDO2UNVgU5n95rs/Pxhei/kU9eF0HemcNzJcjbWUNqYvDmmD7QNBvAAAA///RbR0T6wAAAA==
 
 - path: /etc/systemd/system/dhcpv6.service
   permissions: "0644"
diff --git a/pkg/agent/testdata/AKSUbuntu2204+CustomCloud/line156.sh b/pkg/agent/testdata/AKSUbuntu2204+CustomCloud/line156.sh
index 019b0dfc0e2..a7d193529ca 100644
--- a/pkg/agent/testdata/AKSUbuntu2204+CustomCloud/line156.sh
+++ b/pkg/agent/testdata/AKSUbuntu2204+CustomCloud/line156.sh
@@ -1,5 +1,8 @@
 [Unit]
 Description=Bind mount kubelet data
+Requires=mnt.mount
+After=mnt.mount
+
 [Service]
 Restart=on-failure
 RemainAfterExit=yes
diff --git a/pkg/agent/testdata/AKSUbuntu2204+CustomKubeletConfig+CustomLinuxOSConfig/CustomData b/pkg/agent/testdata/AKSUbuntu2204+CustomKubeletConfig+CustomLinuxOSConfig/CustomData
index edbec84c081..7e1a4fea746 100644
--- a/pkg/agent/testdata/AKSUbuntu2204+CustomKubeletConfig+CustomLinuxOSConfig/CustomData
+++ b/pkg/agent/testdata/AKSUbuntu2204+CustomKubeletConfig+CustomLinuxOSConfig/CustomData
@@ -153,7 +153,7 @@ write_files:
   encoding: gzip
   owner: root
   content: !!binary |
-    H4sIAAAAAAAC/xzNMU7DQBBG4X5O4Qs4e4ItiEhBm4AoLBdj+w8esZ61ZmZRzOkRqZ+evuFDJUZ6hc8me0jVfBZduq02je67TSiIbuFgGm6wH5kx0hUebJGr9neW0gx0xcaiL/eAXR4S+YDT+7EjV4WvNejywHx7XmkSTRP72qW6R+LfZkhz1WBRmP/npX/6J1+Jhjf14FJG+mQNLOcjb62E9M1hp2D7QtBfAAAA//8tGsoCxwAAAA==
+    H4sIAAAAAAAC/0zNsU6EUBCF4X6eghcAnuAWbtzCltVYEIoBzspEmIszc83i0xupLE/+fDn9m0oM9AyfTPaQrOkiOldbLhrVZxmxIqqZg6nDVxGDp02jOTs93QP2b1N/g33LhIE6eLBFylrfWdZioA4bi57m+pBIB5xejx0pK3zJQdcHptup2lG0HdmXqs17tPxTDO2UNVgU5n95rs/Pxhei/kU9eF0HemcNzJcjbWUNqYvDmmD7QNBvAAAA///RbR0T6wAAAA==
 
 - path: /etc/systemd/system/dhcpv6.service
   permissions: "0644"
diff --git a/pkg/agent/testdata/AKSUbuntu2204+CustomKubeletConfig+CustomLinuxOSConfig/line156.sh b/pkg/agent/testdata/AKSUbuntu2204+CustomKubeletConfig+CustomLinuxOSConfig/line156.sh
index 019b0dfc0e2..a7d193529ca 100644
--- a/pkg/agent/testdata/AKSUbuntu2204+CustomKubeletConfig+CustomLinuxOSConfig/line156.sh
+++ b/pkg/agent/testdata/AKSUbuntu2204+CustomKubeletConfig+CustomLinuxOSConfig/line156.sh
@@ -1,5 +1,8 @@
 [Unit]
 Description=Bind mount kubelet data
+Requires=mnt.mount
+After=mnt.mount
+
 [Service]
 Restart=on-failure
 RemainAfterExit=yes
diff --git a/pkg/agent/testdata/AKSUbuntu2204+CustomKubeletConfig+SerializeImagePulls/CustomData b/pkg/agent/testdata/AKSUbuntu2204+CustomKubeletConfig+SerializeImagePulls/CustomData
index edbec84c081..7e1a4fea746 100644
--- a/pkg/agent/testdata/AKSUbuntu2204+CustomKubeletConfig+SerializeImagePulls/CustomData
+++ b/pkg/agent/testdata/AKSUbuntu2204+CustomKubeletConfig+SerializeImagePulls/CustomData
@@ -153,7 +153,7 @@ write_files:
   encoding: gzip
   owner: root
   content: !!binary |
-    H4sIAAAAAAAC/xzNMU7DQBBG4X5O4Qs4e4ItiEhBm4AoLBdj+w8esZ61ZmZRzOkRqZ+evuFDJUZ6hc8me0jVfBZduq02je67TSiIbuFgGm6wH5kx0hUebJGr9neW0gx0xcaiL/eAXR4S+YDT+7EjV4WvNejywHx7XmkSTRP72qW6R+LfZkhz1WBRmP/npX/6J1+Jhjf14FJG+mQNLOcjb62E9M1hp2D7QtBfAAAA//8tGsoCxwAAAA==
+    H4sIAAAAAAAC/0zNsU6EUBCF4X6eghcAnuAWbtzCltVYEIoBzspEmIszc83i0xupLE/+fDn9m0oM9AyfTPaQrOkiOldbLhrVZxmxIqqZg6nDVxGDp02jOTs93QP2b1N/g33LhIE6eLBFylrfWdZioA4bi57m+pBIB5xejx0pK3zJQdcHptup2lG0HdmXqs17tPxTDO2UNVgU5n95rs/Pxhei/kU9eF0HemcNzJcjbWUNqYvDmmD7QNBvAAAA///RbR0T6wAAAA==
 
 - path: /etc/systemd/system/dhcpv6.service
   permissions: "0644"
diff --git a/pkg/agent/testdata/AKSUbuntu2204+CustomKubeletConfig+SerializeImagePulls/line156.sh b/pkg/agent/testdata/AKSUbuntu2204+CustomKubeletConfig+SerializeImagePulls/line156.sh
index 019b0dfc0e2..a7d193529ca 100644
--- a/pkg/agent/testdata/AKSUbuntu2204+CustomKubeletConfig+SerializeImagePulls/line156.sh
+++ b/pkg/agent/testdata/AKSUbuntu2204+CustomKubeletConfig+SerializeImagePulls/line156.sh
@@ -1,5 +1,8 @@
 [Unit]
 Description=Bind mount kubelet data
+Requires=mnt.mount
+After=mnt.mount
+
 [Service]
 Restart=on-failure
 RemainAfterExit=yes
diff --git a/pkg/agent/testdata/AKSUbuntu2204+DisableKubeletServingCertificateRotation+CustomKubeletConfig/CustomData b/pkg/agent/testdata/AKSUbuntu2204+DisableKubeletServingCertificateRotation+CustomKubeletConfig/CustomData
index edbec84c081..7e1a4fea746 100644
--- a/pkg/agent/testdata/AKSUbuntu2204+DisableKubeletServingCertificateRotation+CustomKubeletConfig/CustomData
+++ b/pkg/agent/testdata/AKSUbuntu2204+DisableKubeletServingCertificateRotation+CustomKubeletConfig/CustomData
@@ -153,7 +153,7 @@ write_files:
   encoding: gzip
   owner: root
   content: !!binary |
-    H4sIAAAAAAAC/xzNMU7DQBBG4X5O4Qs4e4ItiEhBm4AoLBdj+w8esZ61ZmZRzOkRqZ+evuFDJUZ6hc8me0jVfBZduq02je67TSiIbuFgGm6wH5kx0hUebJGr9neW0gx0xcaiL/eAXR4S+YDT+7EjV4WvNejywHx7XmkSTRP72qW6R+LfZkhz1WBRmP/npX/6J1+Jhjf14FJG+mQNLOcjb62E9M1hp2D7QtBfAAAA//8tGsoCxwAAAA==
+    H4sIAAAAAAAC/0zNsU6EUBCF4X6eghcAnuAWbtzCltVYEIoBzspEmIszc83i0xupLE/+fDn9m0oM9AyfTPaQrOkiOldbLhrVZxmxIqqZg6nDVxGDp02jOTs93QP2b1N/g33LhIE6eLBFylrfWdZioA4bi57m+pBIB5xejx0pK3zJQdcHptup2lG0HdmXqs17tPxTDO2UNVgU5n95rs/Pxhei/kU9eF0HemcNzJcjbWUNqYvDmmD7QNBvAAAA///RbR0T6wAAAA==
 
 - path: /etc/systemd/system/dhcpv6.service
   permissions: "0644"
diff --git a/pkg/agent/testdata/AKSUbuntu2204+DisableKubeletServingCertificateRotation+CustomKubeletConfig/line156.sh b/pkg/agent/testdata/AKSUbuntu2204+DisableKubeletServingCertificateRotation+CustomKubeletConfig/line156.sh
index 019b0dfc0e2..a7d193529ca 100644
--- a/pkg/agent/testdata/AKSUbuntu2204+DisableKubeletServingCertificateRotation+CustomKubeletConfig/line156.sh
+++ b/pkg/agent/testdata/AKSUbuntu2204+DisableKubeletServingCertificateRotation+CustomKubeletConfig/line156.sh
@@ -1,5 +1,8 @@
 [Unit]
 Description=Bind mount kubelet data
+Requires=mnt.mount
+After=mnt.mount
+
 [Service]
 Restart=on-failure
 RemainAfterExit=yes
diff --git a/pkg/agent/testdata/AKSUbuntu2204+DisableKubeletServingCertificateRotation/CustomData b/pkg/agent/testdata/AKSUbuntu2204+DisableKubeletServingCertificateRotation/CustomData
index c0753efd3f6..af4e7b8e2c1 100644
--- a/pkg/agent/testdata/AKSUbuntu2204+DisableKubeletServingCertificateRotation/CustomData
+++ b/pkg/agent/testdata/AKSUbuntu2204+DisableKubeletServingCertificateRotation/CustomData
@@ -153,7 +153,7 @@ write_files:
   encoding: gzip
   owner: root
   content: !!binary |
-    H4sIAAAAAAAC/xzNMU7DQBBG4X5O4Qs4e4ItiEhBm4AoLBdj+w8esZ61ZmZRzOkRqZ+evuFDJUZ6hc8me0jVfBZduq02je67TSiIbuFgGm6wH5kx0hUebJGr9neW0gx0xcaiL/eAXR4S+YDT+7EjV4WvNejywHx7XmkSTRP72qW6R+LfZkhz1WBRmP/npX/6J1+Jhjf14FJG+mQNLOcjb62E9M1hp2D7QtBfAAAA//8tGsoCxwAAAA==
+    H4sIAAAAAAAC/0zNsU6EUBCF4X6eghcAnuAWbtzCltVYEIoBzspEmIszc83i0xupLE/+fDn9m0oM9AyfTPaQrOkiOldbLhrVZxmxIqqZg6nDVxGDp02jOTs93QP2b1N/g33LhIE6eLBFylrfWdZioA4bi57m+pBIB5xejx0pK3zJQdcHptup2lG0HdmXqs17tPxTDO2UNVgU5n95rs/Pxhei/kU9eF0HemcNzJcjbWUNqYvDmmD7QNBvAAAA///RbR0T6wAAAA==
 
 - path: /etc/systemd/system/dhcpv6.service
   permissions: "0644"
diff --git a/pkg/agent/testdata/AKSUbuntu2204+DisableKubeletServingCertificateRotation/line156.sh b/pkg/agent/testdata/AKSUbuntu2204+DisableKubeletServingCertificateRotation/line156.sh
index 019b0dfc0e2..a7d193529ca 100644
--- a/pkg/agent/testdata/AKSUbuntu2204+DisableKubeletServingCertificateRotation/line156.sh
+++ b/pkg/agent/testdata/AKSUbuntu2204+DisableKubeletServingCertificateRotation/line156.sh
@@ -1,5 +1,8 @@
 [Unit]
 Description=Bind mount kubelet data
+Requires=mnt.mount
+After=mnt.mount
+
 [Service]
 Restart=on-failure
 RemainAfterExit=yes
diff --git a/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOff/CustomData b/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOff/CustomData
index 18604c80bcb..e1183943e03 100644
--- a/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOff/CustomData
+++ b/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOff/CustomData
@@ -153,7 +153,7 @@ write_files:
   encoding: gzip
   owner: root
   content: !!binary |
-    H4sIAAAAAAAC/xzNMU7DQBBG4X5O4Qs4e4ItiEhBm4AoLBdj+w8esZ61ZmZRzOkRqZ+evuFDJUZ6hc8me0jVfBZduq02je67TSiIbuFgGm6wH5kx0hUebJGr9neW0gx0xcaiL/eAXR4S+YDT+7EjV4WvNejywHx7XmkSTRP72qW6R+LfZkhz1WBRmP/npX/6J1+Jhjf14FJG+mQNLOcjb62E9M1hp2D7QtBfAAAA//8tGsoCxwAAAA==
+    H4sIAAAAAAAC/0zNsU6EUBCF4X6eghcAnuAWbtzCltVYEIoBzspEmIszc83i0xupLE/+fDn9m0oM9AyfTPaQrOkiOldbLhrVZxmxIqqZg6nDVxGDp02jOTs93QP2b1N/g33LhIE6eLBFylrfWdZioA4bi57m+pBIB5xejx0pK3zJQdcHptup2lG0HdmXqs17tPxTDO2UNVgU5n95rs/Pxhei/kU9eF0HemcNzJcjbWUNqYvDmmD7QNBvAAAA///RbR0T6wAAAA==
 
 - path: /etc/systemd/system/dhcpv6.service
   permissions: "0644"
diff --git a/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOff/line156.sh b/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOff/line156.sh
index 019b0dfc0e2..a7d193529ca 100644
--- a/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOff/line156.sh
+++ b/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOff/line156.sh
@@ -1,5 +1,8 @@
 [Unit]
 Description=Bind mount kubelet data
+Requires=mnt.mount
+After=mnt.mount
+
 [Service]
 Restart=on-failure
 RemainAfterExit=yes
diff --git a/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOnWithFilterTable/CustomData b/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOnWithFilterTable/CustomData
index 18604c80bcb..e1183943e03 100644
--- a/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOnWithFilterTable/CustomData
+++ b/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOnWithFilterTable/CustomData
@@ -153,7 +153,7 @@ write_files:
   encoding: gzip
   owner: root
   content: !!binary |
-    H4sIAAAAAAAC/xzNMU7DQBBG4X5O4Qs4e4ItiEhBm4AoLBdj+w8esZ61ZmZRzOkRqZ+evuFDJUZ6hc8me0jVfBZduq02je67TSiIbuFgGm6wH5kx0hUebJGr9neW0gx0xcaiL/eAXR4S+YDT+7EjV4WvNejywHx7XmkSTRP72qW6R+LfZkhz1WBRmP/npX/6J1+Jhjf14FJG+mQNLOcjb62E9M1hp2D7QtBfAAAA//8tGsoCxwAAAA==
+    H4sIAAAAAAAC/0zNsU6EUBCF4X6eghcAnuAWbtzCltVYEIoBzspEmIszc83i0xupLE/+fDn9m0oM9AyfTPaQrOkiOldbLhrVZxmxIqqZg6nDVxGDp02jOTs93QP2b1N/g33LhIE6eLBFylrfWdZioA4bi57m+pBIB5xejx0pK3zJQdcHptup2lG0HdmXqs17tPxTDO2UNVgU5n95rs/Pxhei/kU9eF0HemcNzJcjbWUNqYvDmmD7QNBvAAAA///RbR0T6wAAAA==
 
 - path: /etc/systemd/system/dhcpv6.service
   permissions: "0644"
diff --git a/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOnWithFilterTable/line156.sh b/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOnWithFilterTable/line156.sh
index 019b0dfc0e2..a7d193529ca 100644
--- a/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOnWithFilterTable/line156.sh
+++ b/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOnWithFilterTable/line156.sh
@@ -1,5 +1,8 @@
 [Unit]
 Description=Bind mount kubelet data
+Requires=mnt.mount
+After=mnt.mount
+
 [Service]
 Restart=on-failure
 RemainAfterExit=yes
diff --git a/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOnWithMangleTable/CustomData b/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOnWithMangleTable/CustomData
index 18604c80bcb..e1183943e03 100644
--- a/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOnWithMangleTable/CustomData
+++ b/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOnWithMangleTable/CustomData
@@ -153,7 +153,7 @@ write_files:
   encoding: gzip
   owner: root
   content: !!binary |
-    H4sIAAAAAAAC/xzNMU7DQBBG4X5O4Qs4e4ItiEhBm4AoLBdj+w8esZ61ZmZRzOkRqZ+evuFDJUZ6hc8me0jVfBZduq02je67TSiIbuFgGm6wH5kx0hUebJGr9neW0gx0xcaiL/eAXR4S+YDT+7EjV4WvNejywHx7XmkSTRP72qW6R+LfZkhz1WBRmP/npX/6J1+Jhjf14FJG+mQNLOcjb62E9M1hp2D7QtBfAAAA//8tGsoCxwAAAA==
+    H4sIAAAAAAAC/0zNsU6EUBCF4X6eghcAnuAWbtzCltVYEIoBzspEmIszc83i0xupLE/+fDn9m0oM9AyfTPaQrOkiOldbLhrVZxmxIqqZg6nDVxGDp02jOTs93QP2b1N/g33LhIE6eLBFylrfWdZioA4bi57m+pBIB5xejx0pK3zJQdcHptup2lG0HdmXqs17tPxTDO2UNVgU5n95rs/Pxhei/kU9eF0HemcNzJcjbWUNqYvDmmD7QNBvAAAA///RbR0T6wAAAA==
 
 - path: /etc/systemd/system/dhcpv6.service
   permissions: "0644"
diff --git a/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOnWithMangleTable/line156.sh b/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOnWithMangleTable/line156.sh
index 019b0dfc0e2..a7d193529ca 100644
--- a/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOnWithMangleTable/line156.sh
+++ b/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOnWithMangleTable/line156.sh
@@ -1,5 +1,8 @@
 [Unit]
 Description=Bind mount kubelet data
+Requires=mnt.mount
+After=mnt.mount
+
 [Service]
 Restart=on-failure
 RemainAfterExit=yes
diff --git a/pkg/agent/testdata/AKSUbuntu2204+ImplicitlyDisableKubeletServingCertificateRotation/CustomData b/pkg/agent/testdata/AKSUbuntu2204+ImplicitlyDisableKubeletServingCertificateRotation/CustomData
index 855e35ff588..793e1931d41 100644
--- a/pkg/agent/testdata/AKSUbuntu2204+ImplicitlyDisableKubeletServingCertificateRotation/CustomData
+++ b/pkg/agent/testdata/AKSUbuntu2204+ImplicitlyDisableKubeletServingCertificateRotation/CustomData
@@ -153,7 +153,7 @@ write_files:
   encoding: gzip
   owner: root
   content: !!binary |
-    H4sIAAAAAAAC/xzNMU7DQBBG4X5O4Qs4e4ItiEhBm4AoLBdj+w8esZ61ZmZRzOkRqZ+evuFDJUZ6hc8me0jVfBZduq02je67TSiIbuFgGm6wH5kx0hUebJGr9neW0gx0xcaiL/eAXR4S+YDT+7EjV4WvNejywHx7XmkSTRP72qW6R+LfZkhz1WBRmP/npX/6J1+Jhjf14FJG+mQNLOcjb62E9M1hp2D7QtBfAAAA//8tGsoCxwAAAA==
+    H4sIAAAAAAAC/0zNsU6EUBCF4X6eghcAnuAWbtzCltVYEIoBzspEmIszc83i0xupLE/+fDn9m0oM9AyfTPaQrOkiOldbLhrVZxmxIqqZg6nDVxGDp02jOTs93QP2b1N/g33LhIE6eLBFylrfWdZioA4bi57m+pBIB5xejx0pK3zJQdcHptup2lG0HdmXqs17tPxTDO2UNVgU5n95rs/Pxhei/kU9eF0HemcNzJcjbWUNqYvDmmD7QNBvAAAA///RbR0T6wAAAA==
 
 - path: /etc/systemd/system/dhcpv6.service
   permissions: "0644"
diff --git a/pkg/agent/testdata/AKSUbuntu2204+ImplicitlyDisableKubeletServingCertificateRotation/line156.sh b/pkg/agent/testdata/AKSUbuntu2204+ImplicitlyDisableKubeletServingCertificateRotation/line156.sh
index 019b0dfc0e2..a7d193529ca 100644
--- a/pkg/agent/testdata/AKSUbuntu2204+ImplicitlyDisableKubeletServingCertificateRotation/line156.sh
+++ b/pkg/agent/testdata/AKSUbuntu2204+ImplicitlyDisableKubeletServingCertificateRotation/line156.sh
@@ -1,5 +1,8 @@
 [Unit]
 Description=Bind mount kubelet data
+Requires=mnt.mount
+After=mnt.mount
+
 [Service]
 Restart=on-failure
 RemainAfterExit=yes
diff --git a/pkg/agent/testdata/AKSUbuntu2204+KubeletServingCertificateRotation+CustomKubeletConfig/CustomData b/pkg/agent/testdata/AKSUbuntu2204+KubeletServingCertificateRotation+CustomKubeletConfig/CustomData
index edbec84c081..7e1a4fea746 100644
--- a/pkg/agent/testdata/AKSUbuntu2204+KubeletServingCertificateRotation+CustomKubeletConfig/CustomData
+++ b/pkg/agent/testdata/AKSUbuntu2204+KubeletServingCertificateRotation+CustomKubeletConfig/CustomData
@@ -153,7 +153,7 @@ write_files:
   encoding: gzip
   owner: root
   content: !!binary |
-    H4sIAAAAAAAC/xzNMU7DQBBG4X5O4Qs4e4ItiEhBm4AoLBdj+w8esZ61ZmZRzOkRqZ+evuFDJUZ6hc8me0jVfBZduq02je67TSiIbuFgGm6wH5kx0hUebJGr9neW0gx0xcaiL/eAXR4S+YDT+7EjV4WvNejywHx7XmkSTRP72qW6R+LfZkhz1WBRmP/npX/6J1+Jhjf14FJG+mQNLOcjb62E9M1hp2D7QtBfAAAA//8tGsoCxwAAAA==
+    H4sIAAAAAAAC/0zNsU6EUBCF4X6eghcAnuAWbtzCltVYEIoBzspEmIszc83i0xupLE/+fDn9m0oM9AyfTPaQrOkiOldbLhrVZxmxIqqZg6nDVxGDp02jOTs93QP2b1N/g33LhIE6eLBFylrfWdZioA4bi57m+pBIB5xejx0pK3zJQdcHptup2lG0HdmXqs17tPxTDO2UNVgU5n95rs/Pxhei/kU9eF0HemcNzJcjbWUNqYvDmmD7QNBvAAAA///RbR0T6wAAAA==
 
 - path: /etc/systemd/system/dhcpv6.service
   permissions: "0644"
diff --git a/pkg/agent/testdata/AKSUbuntu2204+KubeletServingCertificateRotation+CustomKubeletConfig/line156.sh b/pkg/agent/testdata/AKSUbuntu2204+KubeletServingCertificateRotation+CustomKubeletConfig/line156.sh
index 019b0dfc0e2..a7d193529ca 100644
--- a/pkg/agent/testdata/AKSUbuntu2204+KubeletServingCertificateRotation+CustomKubeletConfig/line156.sh
+++ b/pkg/agent/testdata/AKSUbuntu2204+KubeletServingCertificateRotation+CustomKubeletConfig/line156.sh
@@ -1,5 +1,8 @@
 [Unit]
 Description=Bind mount kubelet data
+Requires=mnt.mount
+After=mnt.mount
+
 [Service]
 Restart=on-failure
 RemainAfterExit=yes
diff --git a/pkg/agent/testdata/AKSUbuntu2204+KubeletServingCertificateRotation/CustomData b/pkg/agent/testdata/AKSUbuntu2204+KubeletServingCertificateRotation/CustomData
index fc10b6bf50a..92c0acc744d 100644
--- a/pkg/agent/testdata/AKSUbuntu2204+KubeletServingCertificateRotation/CustomData
+++ b/pkg/agent/testdata/AKSUbuntu2204+KubeletServingCertificateRotation/CustomData
@@ -153,7 +153,7 @@ write_files:
   encoding: gzip
   owner: root
   content: !!binary |
-    H4sIAAAAAAAC/xzNMU7DQBBG4X5O4Qs4e4ItiEhBm4AoLBdj+w8esZ61ZmZRzOkRqZ+evuFDJUZ6hc8me0jVfBZduq02je67TSiIbuFgGm6wH5kx0hUebJGr9neW0gx0xcaiL/eAXR4S+YDT+7EjV4WvNejywHx7XmkSTRP72qW6R+LfZkhz1WBRmP/npX/6J1+Jhjf14FJG+mQNLOcjb62E9M1hp2D7QtBfAAAA//8tGsoCxwAAAA==
+    H4sIAAAAAAAC/0zNsU6EUBCF4X6eghcAnuAWbtzCltVYEIoBzspEmIszc83i0xupLE/+fDn9m0oM9AyfTPaQrOkiOldbLhrVZxmxIqqZg6nDVxGDp02jOTs93QP2b1N/g33LhIE6eLBFylrfWdZioA4bi57m+pBIB5xejx0pK3zJQdcHptup2lG0HdmXqs17tPxTDO2UNVgU5n95rs/Pxhei/kU9eF0HemcNzJcjbWUNqYvDmmD7QNBvAAAA///RbR0T6wAAAA==
 
 - path: /etc/systemd/system/dhcpv6.service
   permissions: "0644"
diff --git a/pkg/agent/testdata/AKSUbuntu2204+KubeletServingCertificateRotation/line156.sh b/pkg/agent/testdata/AKSUbuntu2204+KubeletServingCertificateRotation/line156.sh
index 019b0dfc0e2..a7d193529ca 100644
--- a/pkg/agent/testdata/AKSUbuntu2204+KubeletServingCertificateRotation/line156.sh
+++ b/pkg/agent/testdata/AKSUbuntu2204+KubeletServingCertificateRotation/line156.sh
@@ -1,5 +1,8 @@
 [Unit]
 Description=Bind mount kubelet data
+Requires=mnt.mount
+After=mnt.mount
+
 [Service]
 Restart=on-failure
 RemainAfterExit=yes
diff --git a/pkg/agent/testdata/AKSUbuntu2204+OutboundTypeBlocked/CustomData b/pkg/agent/testdata/AKSUbuntu2204+OutboundTypeBlocked/CustomData
index 855e35ff588..793e1931d41 100644
--- a/pkg/agent/testdata/AKSUbuntu2204+OutboundTypeBlocked/CustomData
+++ b/pkg/agent/testdata/AKSUbuntu2204+OutboundTypeBlocked/CustomData
@@ -153,7 +153,7 @@ write_files:
   encoding: gzip
   owner: root
   content: !!binary |
-    H4sIAAAAAAAC/xzNMU7DQBBG4X5O4Qs4e4ItiEhBm4AoLBdj+w8esZ61ZmZRzOkRqZ+evuFDJUZ6hc8me0jVfBZduq02je67TSiIbuFgGm6wH5kx0hUebJGr9neW0gx0xcaiL/eAXR4S+YDT+7EjV4WvNejywHx7XmkSTRP72qW6R+LfZkhz1WBRmP/npX/6J1+Jhjf14FJG+mQNLOcjb62E9M1hp2D7QtBfAAAA//8tGsoCxwAAAA==
+    H4sIAAAAAAAC/0zNsU6EUBCF4X6eghcAnuAWbtzCltVYEIoBzspEmIszc83i0xupLE/+fDn9m0oM9AyfTPaQrOkiOldbLhrVZxmxIqqZg6nDVxGDp02jOTs93QP2b1N/g33LhIE6eLBFylrfWdZioA4bi57m+pBIB5xejx0pK3zJQdcHptup2lG0HdmXqs17tPxTDO2UNVgU5n95rs/Pxhei/kU9eF0HemcNzJcjbWUNqYvDmmD7QNBvAAAA///RbR0T6wAAAA==
 
 - path: /etc/systemd/system/dhcpv6.service
   permissions: "0644"
diff --git a/pkg/agent/testdata/AKSUbuntu2204+OutboundTypeBlocked/line156.sh b/pkg/agent/testdata/AKSUbuntu2204+OutboundTypeBlocked/line156.sh
index 019b0dfc0e2..a7d193529ca 100644
--- a/pkg/agent/testdata/AKSUbuntu2204+OutboundTypeBlocked/line156.sh
+++ b/pkg/agent/testdata/AKSUbuntu2204+OutboundTypeBlocked/line156.sh
@@ -1,5 +1,8 @@
 [Unit]
 Description=Bind mount kubelet data
+Requires=mnt.mount
+After=mnt.mount
+
 [Service]
 Restart=on-failure
 RemainAfterExit=yes
diff --git a/pkg/agent/testdata/AKSUbuntu2204+OutboundTypeNil/CustomData b/pkg/agent/testdata/AKSUbuntu2204+OutboundTypeNil/CustomData
index 855e35ff588..793e1931d41 100644
--- a/pkg/agent/testdata/AKSUbuntu2204+OutboundTypeNil/CustomData
+++ b/pkg/agent/testdata/AKSUbuntu2204+OutboundTypeNil/CustomData
@@ -153,7 +153,7 @@ write_files:
   encoding: gzip
   owner: root
   content: !!binary |
-    H4sIAAAAAAAC/xzNMU7DQBBG4X5O4Qs4e4ItiEhBm4AoLBdj+w8esZ61ZmZRzOkRqZ+evuFDJUZ6hc8me0jVfBZduq02je67TSiIbuFgGm6wH5kx0hUebJGr9neW0gx0xcaiL/eAXR4S+YDT+7EjV4WvNejywHx7XmkSTRP72qW6R+LfZkhz1WBRmP/npX/6J1+Jhjf14FJG+mQNLOcjb62E9M1hp2D7QtBfAAAA//8tGsoCxwAAAA==
+    H4sIAAAAAAAC/0zNsU6EUBCF4X6eghcAnuAWbtzCltVYEIoBzspEmIszc83i0xupLE/+fDn9m0oM9AyfTPaQrOkiOldbLhrVZxmxIqqZg6nDVxGDp02jOTs93QP2b1N/g33LhIE6eLBFylrfWdZioA4bi57m+pBIB5xejx0pK3zJQdcHptup2lG0HdmXqs17tPxTDO2UNVgU5n95rs/Pxhei/kU9eF0HemcNzJcjbWUNqYvDmmD7QNBvAAAA///RbR0T6wAAAA==
 
 - path: /etc/systemd/system/dhcpv6.service
   permissions: "0644"
diff --git a/pkg/agent/testdata/AKSUbuntu2204+OutboundTypeNil/line156.sh b/pkg/agent/testdata/AKSUbuntu2204+OutboundTypeNil/line156.sh
index 019b0dfc0e2..a7d193529ca 100644
--- a/pkg/agent/testdata/AKSUbuntu2204+OutboundTypeNil/line156.sh
+++ b/pkg/agent/testdata/AKSUbuntu2204+OutboundTypeNil/line156.sh
@@ -1,5 +1,8 @@
 [Unit]
 Description=Bind mount kubelet data
+Requires=mnt.mount
+After=mnt.mount
+
 [Service]
 Restart=on-failure
 RemainAfterExit=yes
diff --git a/pkg/agent/testdata/AKSUbuntu2204+OutboundTypeNone/CustomData b/pkg/agent/testdata/AKSUbuntu2204+OutboundTypeNone/CustomData
index 855e35ff588..793e1931d41 100644
--- a/pkg/agent/testdata/AKSUbuntu2204+OutboundTypeNone/CustomData
+++ b/pkg/agent/testdata/AKSUbuntu2204+OutboundTypeNone/CustomData
@@ -153,7 +153,7 @@ write_files:
   encoding: gzip
   owner: root
   content: !!binary |
-    H4sIAAAAAAAC/xzNMU7DQBBG4X5O4Qs4e4ItiEhBm4AoLBdj+w8esZ61ZmZRzOkRqZ+evuFDJUZ6hc8me0jVfBZduq02je67TSiIbuFgGm6wH5kx0hUebJGr9neW0gx0xcaiL/eAXR4S+YDT+7EjV4WvNejywHx7XmkSTRP72qW6R+LfZkhz1WBRmP/npX/6J1+Jhjf14FJG+mQNLOcjb62E9M1hp2D7QtBfAAAA//8tGsoCxwAAAA==
+    H4sIAAAAAAAC/0zNsU6EUBCF4X6eghcAnuAWbtzCltVYEIoBzspEmIszc83i0xupLE/+fDn9m0oM9AyfTPaQrOkiOldbLhrVZxmxIqqZg6nDVxGDp02jOTs93QP2b1N/g33LhIE6eLBFylrfWdZioA4bi57m+pBIB5xejx0pK3zJQdcHptup2lG0HdmXqs17tPxTDO2UNVgU5n95rs/Pxhei/kU9eF0HemcNzJcjbWUNqYvDmmD7QNBvAAAA///RbR0T6wAAAA==
 
 - path: /etc/systemd/system/dhcpv6.service
   permissions: "0644"
diff --git a/pkg/agent/testdata/AKSUbuntu2204+OutboundTypeNone/line156.sh b/pkg/agent/testdata/AKSUbuntu2204+OutboundTypeNone/line156.sh
index 019b0dfc0e2..a7d193529ca 100644
--- a/pkg/agent/testdata/AKSUbuntu2204+OutboundTypeNone/line156.sh
+++ b/pkg/agent/testdata/AKSUbuntu2204+OutboundTypeNone/line156.sh
@@ -1,5 +1,8 @@
 [Unit]
 Description=Bind mount kubelet data
+Requires=mnt.mount
+After=mnt.mount
+
 [Service]
 Restart=on-failure
 RemainAfterExit=yes
diff --git a/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOff/CustomData b/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOff/CustomData
index 18604c80bcb..e1183943e03 100644
--- a/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOff/CustomData
+++ b/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOff/CustomData
@@ -153,7 +153,7 @@ write_files:
   encoding: gzip
   owner: root
   content: !!binary |
-    H4sIAAAAAAAC/xzNMU7DQBBG4X5O4Qs4e4ItiEhBm4AoLBdj+w8esZ61ZmZRzOkRqZ+evuFDJUZ6hc8me0jVfBZduq02je67TSiIbuFgGm6wH5kx0hUebJGr9neW0gx0xcaiL/eAXR4S+YDT+7EjV4WvNejywHx7XmkSTRP72qW6R+LfZkhz1WBRmP/npX/6J1+Jhjf14FJG+mQNLOcjb62E9M1hp2D7QtBfAAAA//8tGsoCxwAAAA==
+    H4sIAAAAAAAC/0zNsU6EUBCF4X6eghcAnuAWbtzCltVYEIoBzspEmIszc83i0xupLE/+fDn9m0oM9AyfTPaQrOkiOldbLhrVZxmxIqqZg6nDVxGDp02jOTs93QP2b1N/g33LhIE6eLBFylrfWdZioA4bi57m+pBIB5xejx0pK3zJQdcHptup2lG0HdmXqs17tPxTDO2UNVgU5n95rs/Pxhei/kU9eF0HemcNzJcjbWUNqYvDmmD7QNBvAAAA///RbR0T6wAAAA==
 
 - path: /etc/systemd/system/dhcpv6.service
   permissions: "0644"
diff --git a/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOff/line156.sh b/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOff/line156.sh
index 019b0dfc0e2..a7d193529ca 100644
--- a/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOff/line156.sh
+++ b/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOff/line156.sh
@@ -1,5 +1,8 @@
 [Unit]
 Description=Bind mount kubelet data
+Requires=mnt.mount
+After=mnt.mount
+
 [Service]
 Restart=on-failure
 RemainAfterExit=yes
diff --git a/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOn/CustomData b/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOn/CustomData
index 18604c80bcb..e1183943e03 100644
--- a/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOn/CustomData
+++ b/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOn/CustomData
@@ -153,7 +153,7 @@ write_files:
   encoding: gzip
   owner: root
   content: !!binary |
-    H4sIAAAAAAAC/xzNMU7DQBBG4X5O4Qs4e4ItiEhBm4AoLBdj+w8esZ61ZmZRzOkRqZ+evuFDJUZ6hc8me0jVfBZduq02je67TSiIbuFgGm6wH5kx0hUebJGr9neW0gx0xcaiL/eAXR4S+YDT+7EjV4WvNejywHx7XmkSTRP72qW6R+LfZkhz1WBRmP/npX/6J1+Jhjf14FJG+mQNLOcjb62E9M1hp2D7QtBfAAAA//8tGsoCxwAAAA==
+    H4sIAAAAAAAC/0zNsU6EUBCF4X6eghcAnuAWbtzCltVYEIoBzspEmIszc83i0xupLE/+fDn9m0oM9AyfTPaQrOkiOldbLhrVZxmxIqqZg6nDVxGDp02jOTs93QP2b1N/g33LhIE6eLBFylrfWdZioA4bi57m+pBIB5xejx0pK3zJQdcHptup2lG0HdmXqs17tPxTDO2UNVgU5n95rs/Pxhei/kU9eF0HemcNzJcjbWUNqYvDmmD7QNBvAAAA///RbR0T6wAAAA==
 
 - path: /etc/systemd/system/dhcpv6.service
   permissions: "0644"
diff --git a/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOn/line156.sh b/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOn/line156.sh
index 019b0dfc0e2..a7d193529ca 100644
--- a/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOn/line156.sh
+++ b/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOn/line156.sh
@@ -1,5 +1,8 @@
 [Unit]
 Description=Bind mount kubelet data
+Requires=mnt.mount
+After=mnt.mount
+
 [Service]
 Restart=on-failure
 RemainAfterExit=yes
diff --git a/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBoostrapping/CustomData b/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBoostrapping/CustomData
index 2aa0c46e33a..b6341f40eaf 100644
--- a/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBoostrapping/CustomData
+++ b/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBoostrapping/CustomData
@@ -153,7 +153,7 @@ write_files:
   encoding: gzip
   owner: root
   content: !!binary |
-    H4sIAAAAAAAC/xzNMU7DQBBG4X5O4Qs4e4ItiEhBm4AoLBdj+w8esZ61ZmZRzOkRqZ+evuFDJUZ6hc8me0jVfBZduq02je67TSiIbuFgGm6wH5kx0hUebJGr9neW0gx0xcaiL/eAXR4S+YDT+7EjV4WvNejywHx7XmkSTRP72qW6R+LfZkhz1WBRmP/npX/6J1+Jhjf14FJG+mQNLOcjb62E9M1hp2D7QtBfAAAA//8tGsoCxwAAAA==
+    H4sIAAAAAAAC/0zNsU6EUBCF4X6eghcAnuAWbtzCltVYEIoBzspEmIszc83i0xupLE/+fDn9m0oM9AyfTPaQrOkiOldbLhrVZxmxIqqZg6nDVxGDp02jOTs93QP2b1N/g33LhIE6eLBFylrfWdZioA4bi57m+pBIB5xejx0pK3zJQdcHptup2lG0HdmXqs17tPxTDO2UNVgU5n95rs/Pxhei/kU9eF0HemcNzJcjbWUNqYvDmmD7QNBvAAAA///RbR0T6wAAAA==
 
 - path: /etc/systemd/system/dhcpv6.service
   permissions: "0644"
diff --git a/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBoostrapping/line156.sh b/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBoostrapping/line156.sh
index 019b0dfc0e2..a7d193529ca 100644
--- a/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBoostrapping/line156.sh
+++ b/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBoostrapping/line156.sh
@@ -1,5 +1,8 @@
 [Unit]
 Description=Bind mount kubelet data
+Requires=mnt.mount
+After=mnt.mount
+
 [Service]
 Restart=on-failure
 RemainAfterExit=yes
diff --git a/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBootstrapping+CustomAADResource/CustomData b/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBootstrapping+CustomAADResource/CustomData
index 309b3d719aa..d9eef0a45d7 100644
--- a/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBootstrapping+CustomAADResource/CustomData
+++ b/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBootstrapping+CustomAADResource/CustomData
@@ -153,7 +153,7 @@ write_files:
   encoding: gzip
   owner: root
   content: !!binary |
-    H4sIAAAAAAAC/xzNMU7DQBBG4X5O4Qs4e4ItiEhBm4AoLBdj+w8esZ61ZmZRzOkRqZ+evuFDJUZ6hc8me0jVfBZduq02je67TSiIbuFgGm6wH5kx0hUebJGr9neW0gx0xcaiL/eAXR4S+YDT+7EjV4WvNejywHx7XmkSTRP72qW6R+LfZkhz1WBRmP/npX/6J1+Jhjf14FJG+mQNLOcjb62E9M1hp2D7QtBfAAAA//8tGsoCxwAAAA==
+    H4sIAAAAAAAC/0zNsU6EUBCF4X6eghcAnuAWbtzCltVYEIoBzspEmIszc83i0xupLE/+fDn9m0oM9AyfTPaQrOkiOldbLhrVZxmxIqqZg6nDVxGDp02jOTs93QP2b1N/g33LhIE6eLBFylrfWdZioA4bi57m+pBIB5xejx0pK3zJQdcHptup2lG0HdmXqs17tPxTDO2UNVgU5n95rs/Pxhei/kU9eF0HemcNzJcjbWUNqYvDmmD7QNBvAAAA///RbR0T6wAAAA==
 
 - path: /etc/systemd/system/dhcpv6.service
   permissions: "0644"
diff --git a/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBootstrapping+CustomAADResource/line156.sh b/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBootstrapping+CustomAADResource/line156.sh
index 019b0dfc0e2..a7d193529ca 100644
--- a/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBootstrapping+CustomAADResource/line156.sh
+++ b/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBootstrapping+CustomAADResource/line156.sh
@@ -1,5 +1,8 @@
 [Unit]
 Description=Bind mount kubelet data
+Requires=mnt.mount
+After=mnt.mount
+
 [Service]
 Restart=on-failure
 RemainAfterExit=yes
diff --git a/pkg/agent/testdata/AKSUbuntu2204+SecurityProfile/CustomData b/pkg/agent/testdata/AKSUbuntu2204+SecurityProfile/CustomData
index 060d2c06ad4..fc9d303d7e8 100644
--- a/pkg/agent/testdata/AKSUbuntu2204+SecurityProfile/CustomData
+++ b/pkg/agent/testdata/AKSUbuntu2204+SecurityProfile/CustomData
@@ -153,7 +153,7 @@ write_files:
   encoding: gzip
   owner: root
   content: !!binary |
-    H4sIAAAAAAAC/xzNMU7DQBBG4X5O4Qs4e4ItiEhBm4AoLBdj+w8esZ61ZmZRzOkRqZ+evuFDJUZ6hc8me0jVfBZduq02je67TSiIbuFgGm6wH5kx0hUebJGr9neW0gx0xcaiL/eAXR4S+YDT+7EjV4WvNejywHx7XmkSTRP72qW6R+LfZkhz1WBRmP/npX/6J1+Jhjf14FJG+mQNLOcjb62E9M1hp2D7QtBfAAAA//8tGsoCxwAAAA==
+    H4sIAAAAAAAC/0zNsU6EUBCF4X6eghcAnuAWbtzCltVYEIoBzspEmIszc83i0xupLE/+fDn9m0oM9AyfTPaQrOkiOldbLhrVZxmxIqqZg6nDVxGDp02jOTs93QP2b1N/g33LhIE6eLBFylrfWdZioA4bi57m+pBIB5xejx0pK3zJQdcHptup2lG0HdmXqs17tPxTDO2UNVgU5n95rs/Pxhei/kU9eF0HemcNzJcjbWUNqYvDmmD7QNBvAAAA///RbR0T6wAAAA==
 
 - path: /etc/systemd/system/dhcpv6.service
   permissions: "0644"
diff --git a/pkg/agent/testdata/AKSUbuntu2204+SecurityProfile/line156.sh b/pkg/agent/testdata/AKSUbuntu2204+SecurityProfile/line156.sh
index 019b0dfc0e2..a7d193529ca 100644
--- a/pkg/agent/testdata/AKSUbuntu2204+SecurityProfile/line156.sh
+++ b/pkg/agent/testdata/AKSUbuntu2204+SecurityProfile/line156.sh
@@ -1,5 +1,8 @@
 [Unit]
 Description=Bind mount kubelet data
+Requires=mnt.mount
+After=mnt.mount
+
 [Service]
 Restart=on-failure
 RemainAfterExit=yes
diff --git a/pkg/agent/testdata/AKSUbuntu2204+SerializeImagePulls/CustomData b/pkg/agent/testdata/AKSUbuntu2204+SerializeImagePulls/CustomData
index c94aa38f898..2492cfa7b96 100644
--- a/pkg/agent/testdata/AKSUbuntu2204+SerializeImagePulls/CustomData
+++ b/pkg/agent/testdata/AKSUbuntu2204+SerializeImagePulls/CustomData
@@ -153,7 +153,7 @@ write_files:
   encoding: gzip
   owner: root
   content: !!binary |
-    H4sIAAAAAAAC/xzNMU7DQBBG4X5O4Qs4e4ItiEhBm4AoLBdj+w8esZ61ZmZRzOkRqZ+evuFDJUZ6hc8me0jVfBZduq02je67TSiIbuFgGm6wH5kx0hUebJGr9neW0gx0xcaiL/eAXR4S+YDT+7EjV4WvNejywHx7XmkSTRP72qW6R+LfZkhz1WBRmP/npX/6J1+Jhjf14FJG+mQNLOcjb62E9M1hp2D7QtBfAAAA//8tGsoCxwAAAA==
+    H4sIAAAAAAAC/0zNsU6EUBCF4X6eghcAnuAWbtzCltVYEIoBzspEmIszc83i0xupLE/+fDn9m0oM9AyfTPaQrOkiOldbLhrVZxmxIqqZg6nDVxGDp02jOTs93QP2b1N/g33LhIE6eLBFylrfWdZioA4bi57m+pBIB5xejx0pK3zJQdcHptup2lG0HdmXqs17tPxTDO2UNVgU5n95rs/Pxhei/kU9eF0HemcNzJcjbWUNqYvDmmD7QNBvAAAA///RbR0T6wAAAA==
 
 - path: /etc/systemd/system/dhcpv6.service
   permissions: "0644"
diff --git a/pkg/agent/testdata/AKSUbuntu2204+SerializeImagePulls/line156.sh b/pkg/agent/testdata/AKSUbuntu2204+SerializeImagePulls/line156.sh
index 019b0dfc0e2..a7d193529ca 100644
--- a/pkg/agent/testdata/AKSUbuntu2204+SerializeImagePulls/line156.sh
+++ b/pkg/agent/testdata/AKSUbuntu2204+SerializeImagePulls/line156.sh
@@ -1,5 +1,8 @@
 [Unit]
 Description=Bind mount kubelet data
+Requires=mnt.mount
+After=mnt.mount
+
 [Service]
 Restart=on-failure
 RemainAfterExit=yes
diff --git a/pkg/agent/testdata/AKSUbuntu2204+cgroupv2/CustomData b/pkg/agent/testdata/AKSUbuntu2204+cgroupv2/CustomData
index 18604c80bcb..e1183943e03 100644
--- a/pkg/agent/testdata/AKSUbuntu2204+cgroupv2/CustomData
+++ b/pkg/agent/testdata/AKSUbuntu2204+cgroupv2/CustomData
@@ -153,7 +153,7 @@ write_files:
   encoding: gzip
   owner: root
   content: !!binary |
-    H4sIAAAAAAAC/xzNMU7DQBBG4X5O4Qs4e4ItiEhBm4AoLBdj+w8esZ61ZmZRzOkRqZ+evuFDJUZ6hc8me0jVfBZduq02je67TSiIbuFgGm6wH5kx0hUebJGr9neW0gx0xcaiL/eAXR4S+YDT+7EjV4WvNejywHx7XmkSTRP72qW6R+LfZkhz1WBRmP/npX/6J1+Jhjf14FJG+mQNLOcjb62E9M1hp2D7QtBfAAAA//8tGsoCxwAAAA==
+    H4sIAAAAAAAC/0zNsU6EUBCF4X6eghcAnuAWbtzCltVYEIoBzspEmIszc83i0xupLE/+fDn9m0oM9AyfTPaQrOkiOldbLhrVZxmxIqqZg6nDVxGDp02jOTs93QP2b1N/g33LhIE6eLBFylrfWdZioA4bi57m+pBIB5xejx0pK3zJQdcHptup2lG0HdmXqs17tPxTDO2UNVgU5n95rs/Pxhei/kU9eF0HemcNzJcjbWUNqYvDmmD7QNBvAAAA///RbR0T6wAAAA==
 
 - path: /etc/systemd/system/dhcpv6.service
   permissions: "0644"
diff --git a/pkg/agent/testdata/AKSUbuntu2204+cgroupv2/line156.sh b/pkg/agent/testdata/AKSUbuntu2204+cgroupv2/line156.sh
index 019b0dfc0e2..a7d193529ca 100644
--- a/pkg/agent/testdata/AKSUbuntu2204+cgroupv2/line156.sh
+++ b/pkg/agent/testdata/AKSUbuntu2204+cgroupv2/line156.sh
@@ -1,5 +1,8 @@
 [Unit]
 Description=Bind mount kubelet data
+Requires=mnt.mount
+After=mnt.mount
+
 [Service]
 Restart=on-failure
 RemainAfterExit=yes
diff --git a/pkg/agent/testdata/AKSUbuntu2204+ootcredentialprovider/CustomData b/pkg/agent/testdata/AKSUbuntu2204+ootcredentialprovider/CustomData
index 1ae05f63782..f08f9bedec6 100644
--- a/pkg/agent/testdata/AKSUbuntu2204+ootcredentialprovider/CustomData
+++ b/pkg/agent/testdata/AKSUbuntu2204+ootcredentialprovider/CustomData
@@ -153,7 +153,7 @@ write_files:
   encoding: gzip
   owner: root
   content: !!binary |
-    H4sIAAAAAAAC/xzNMU7DQBBG4X5O4Qs4e4ItiEhBm4AoLBdj+w8esZ61ZmZRzOkRqZ+evuFDJUZ6hc8me0jVfBZduq02je67TSiIbuFgGm6wH5kx0hUebJGr9neW0gx0xcaiL/eAXR4S+YDT+7EjV4WvNejywHx7XmkSTRP72qW6R+LfZkhz1WBRmP/npX/6J1+Jhjf14FJG+mQNLOcjb62E9M1hp2D7QtBfAAAA//8tGsoCxwAAAA==
+    H4sIAAAAAAAC/0zNsU6EUBCF4X6eghcAnuAWbtzCltVYEIoBzspEmIszc83i0xupLE/+fDn9m0oM9AyfTPaQrOkiOldbLhrVZxmxIqqZg6nDVxGDp02jOTs93QP2b1N/g33LhIE6eLBFylrfWdZioA4bi57m+pBIB5xejx0pK3zJQdcHptup2lG0HdmXqs17tPxTDO2UNVgU5n95rs/Pxhei/kU9eF0HemcNzJcjbWUNqYvDmmD7QNBvAAAA///RbR0T6wAAAA==
 
 - path: /etc/systemd/system/dhcpv6.service
   permissions: "0644"
diff --git a/pkg/agent/testdata/AKSUbuntu2204+ootcredentialprovider/line156.sh b/pkg/agent/testdata/AKSUbuntu2204+ootcredentialprovider/line156.sh
index 019b0dfc0e2..a7d193529ca 100644
--- a/pkg/agent/testdata/AKSUbuntu2204+ootcredentialprovider/line156.sh
+++ b/pkg/agent/testdata/AKSUbuntu2204+ootcredentialprovider/line156.sh
@@ -1,5 +1,8 @@
 [Unit]
 Description=Bind mount kubelet data
+Requires=mnt.mount
+After=mnt.mount
+
 [Service]
 Restart=on-failure
 RemainAfterExit=yes
diff --git a/pkg/agent/testdata/AzureLinuxV2+Kata/CustomData b/pkg/agent/testdata/AzureLinuxV2+Kata/CustomData
index 57c7b77291c..3a6c422cb3f 100644
--- a/pkg/agent/testdata/AzureLinuxV2+Kata/CustomData
+++ b/pkg/agent/testdata/AzureLinuxV2+Kata/CustomData
@@ -150,7 +150,7 @@ write_files:
   encoding: gzip
   owner: root
   content: !!binary |
-    H4sIAAAAAAAC/xzNMU7DQBBG4X5O4Qs4e4ItiEhBm4AoLBdj+w8esZ61ZmZRzOkRqZ+evuFDJUZ6hc8me0jVfBZduq02je67TSiIbuFgGm6wH5kx0hUebJGr9neW0gx0xcaiL/eAXR4S+YDT+7EjV4WvNejywHx7XmkSTRP72qW6R+LfZkhz1WBRmP/npX/6J1+Jhjf14FJG+mQNLOcjb62E9M1hp2D7QtBfAAAA//8tGsoCxwAAAA==
+    H4sIAAAAAAAC/0zNsU6EUBCF4X6eghcAnuAWbtzCltVYEIoBzspEmIszc83i0xupLE/+fDn9m0oM9AyfTPaQrOkiOldbLhrVZxmxIqqZg6nDVxGDp02jOTs93QP2b1N/g33LhIE6eLBFylrfWdZioA4bi57m+pBIB5xejx0pK3zJQdcHptup2lG0HdmXqs17tPxTDO2UNVgU5n95rs/Pxhei/kU9eF0HemcNzJcjbWUNqYvDmmD7QNBvAAAA///RbR0T6wAAAA==
 
 - path: /etc/systemd/system/dhcpv6.service
   permissions: "0644"
diff --git a/pkg/agent/testdata/AzureLinuxV2+Kata/line153.sh b/pkg/agent/testdata/AzureLinuxV2+Kata/line153.sh
index 019b0dfc0e2..a7d193529ca 100644
--- a/pkg/agent/testdata/AzureLinuxV2+Kata/line153.sh
+++ b/pkg/agent/testdata/AzureLinuxV2+Kata/line153.sh
@@ -1,5 +1,8 @@
 [Unit]
 Description=Bind mount kubelet data
+Requires=mnt.mount
+After=mnt.mount
+
 [Service]
 Restart=on-failure
 RemainAfterExit=yes
diff --git a/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=false/CustomData b/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=false/CustomData
index 57c7b77291c..3a6c422cb3f 100644
--- a/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=false/CustomData
+++ b/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=false/CustomData
@@ -150,7 +150,7 @@ write_files:
   encoding: gzip
   owner: root
   content: !!binary |
-    H4sIAAAAAAAC/xzNMU7DQBBG4X5O4Qs4e4ItiEhBm4AoLBdj+w8esZ61ZmZRzOkRqZ+evuFDJUZ6hc8me0jVfBZduq02je67TSiIbuFgGm6wH5kx0hUebJGr9neW0gx0xcaiL/eAXR4S+YDT+7EjV4WvNejywHx7XmkSTRP72qW6R+LfZkhz1WBRmP/npX/6J1+Jhjf14FJG+mQNLOcjb62E9M1hp2D7QtBfAAAA//8tGsoCxwAAAA==
+    H4sIAAAAAAAC/0zNsU6EUBCF4X6eghcAnuAWbtzCltVYEIoBzspEmIszc83i0xupLE/+fDn9m0oM9AyfTPaQrOkiOldbLhrVZxmxIqqZg6nDVxGDp02jOTs93QP2b1N/g33LhIE6eLBFylrfWdZioA4bi57m+pBIB5xejx0pK3zJQdcHptup2lG0HdmXqs17tPxTDO2UNVgU5n95rs/Pxhei/kU9eF0HemcNzJcjbWUNqYvDmmD7QNBvAAAA///RbR0T6wAAAA==
 
 - path: /etc/systemd/system/dhcpv6.service
   permissions: "0644"
diff --git a/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=false/line153.sh b/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=false/line153.sh
index 019b0dfc0e2..a7d193529ca 100644
--- a/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=false/line153.sh
+++ b/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=false/line153.sh
@@ -1,5 +1,8 @@
 [Unit]
 Description=Bind mount kubelet data
+Requires=mnt.mount
+After=mnt.mount
+
 [Service]
 Restart=on-failure
 RemainAfterExit=yes
diff --git a/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=true/CustomData b/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=true/CustomData
index 57c7b77291c..3a6c422cb3f 100644
--- a/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=true/CustomData
+++ b/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=true/CustomData
@@ -150,7 +150,7 @@ write_files:
   encoding: gzip
   owner: root
   content: !!binary |
-    H4sIAAAAAAAC/xzNMU7DQBBG4X5O4Qs4e4ItiEhBm4AoLBdj+w8esZ61ZmZRzOkRqZ+evuFDJUZ6hc8me0jVfBZduq02je67TSiIbuFgGm6wH5kx0hUebJGr9neW0gx0xcaiL/eAXR4S+YDT+7EjV4WvNejywHx7XmkSTRP72qW6R+LfZkhz1WBRmP/npX/6J1+Jhjf14FJG+mQNLOcjb62E9M1hp2D7QtBfAAAA//8tGsoCxwAAAA==
+    H4sIAAAAAAAC/0zNsU6EUBCF4X6eghcAnuAWbtzCltVYEIoBzspEmIszc83i0xupLE/+fDn9m0oM9AyfTPaQrOkiOldbLhrVZxmxIqqZg6nDVxGDp02jOTs93QP2b1N/g33LhIE6eLBFylrfWdZioA4bi57m+pBIB5xejx0pK3zJQdcHptup2lG0HdmXqs17tPxTDO2UNVgU5n95rs/Pxhei/kU9eF0HemcNzJcjbWUNqYvDmmD7QNBvAAAA///RbR0T6wAAAA==
 
 - path: /etc/systemd/system/dhcpv6.service
   permissions: "0644"
diff --git a/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=true/line153.sh b/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=true/line153.sh
index 019b0dfc0e2..a7d193529ca 100644
--- a/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=true/line153.sh
+++ b/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=true/line153.sh
@@ -1,5 +1,8 @@
 [Unit]
 Description=Bind mount kubelet data
+Requires=mnt.mount
+After=mnt.mount
+
 [Service]
 Restart=on-failure
 RemainAfterExit=yes
diff --git a/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=false/CustomData b/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=false/CustomData
index 57c7b77291c..3a6c422cb3f 100644
--- a/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=false/CustomData
+++ b/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=false/CustomData
@@ -150,7 +150,7 @@ write_files:
   encoding: gzip
   owner: root
   content: !!binary |
-    H4sIAAAAAAAC/xzNMU7DQBBG4X5O4Qs4e4ItiEhBm4AoLBdj+w8esZ61ZmZRzOkRqZ+evuFDJUZ6hc8me0jVfBZduq02je67TSiIbuFgGm6wH5kx0hUebJGr9neW0gx0xcaiL/eAXR4S+YDT+7EjV4WvNejywHx7XmkSTRP72qW6R+LfZkhz1WBRmP/npX/6J1+Jhjf14FJG+mQNLOcjb62E9M1hp2D7QtBfAAAA//8tGsoCxwAAAA==
+    H4sIAAAAAAAC/0zNsU6EUBCF4X6eghcAnuAWbtzCltVYEIoBzspEmIszc83i0xupLE/+fDn9m0oM9AyfTPaQrOkiOldbLhrVZxmxIqqZg6nDVxGDp02jOTs93QP2b1N/g33LhIE6eLBFylrfWdZioA4bi57m+pBIB5xejx0pK3zJQdcHptup2lG0HdmXqs17tPxTDO2UNVgU5n95rs/Pxhei/kU9eF0HemcNzJcjbWUNqYvDmmD7QNBvAAAA///RbR0T6wAAAA==
 
 - path: /etc/systemd/system/dhcpv6.service
   permissions: "0644"
diff --git a/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=false/line153.sh b/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=false/line153.sh
index 019b0dfc0e2..a7d193529ca 100644
--- a/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=false/line153.sh
+++ b/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=false/line153.sh
@@ -1,5 +1,8 @@
 [Unit]
 Description=Bind mount kubelet data
+Requires=mnt.mount
+After=mnt.mount
+
 [Service]
 Restart=on-failure
 RemainAfterExit=yes
diff --git a/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=true/CustomData b/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=true/CustomData
index 57c7b77291c..3a6c422cb3f 100644
--- a/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=true/CustomData
+++ b/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=true/CustomData
@@ -150,7 +150,7 @@ write_files:
   encoding: gzip
   owner: root
   content: !!binary |
-    H4sIAAAAAAAC/xzNMU7DQBBG4X5O4Qs4e4ItiEhBm4AoLBdj+w8esZ61ZmZRzOkRqZ+evuFDJUZ6hc8me0jVfBZduq02je67TSiIbuFgGm6wH5kx0hUebJGr9neW0gx0xcaiL/eAXR4S+YDT+7EjV4WvNejywHx7XmkSTRP72qW6R+LfZkhz1WBRmP/npX/6J1+Jhjf14FJG+mQNLOcjb62E9M1hp2D7QtBfAAAA//8tGsoCxwAAAA==
+    H4sIAAAAAAAC/0zNsU6EUBCF4X6eghcAnuAWbtzCltVYEIoBzspEmIszc83i0xupLE/+fDn9m0oM9AyfTPaQrOkiOldbLhrVZxmxIqqZg6nDVxGDp02jOTs93QP2b1N/g33LhIE6eLBFylrfWdZioA4bi57m+pBIB5xejx0pK3zJQdcHptup2lG0HdmXqs17tPxTDO2UNVgU5n95rs/Pxhei/kU9eF0HemcNzJcjbWUNqYvDmmD7QNBvAAAA///RbR0T6wAAAA==
 
 - path: /etc/systemd/system/dhcpv6.service
   permissions: "0644"
diff --git a/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=true/line153.sh b/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=true/line153.sh
index 019b0dfc0e2..a7d193529ca 100644
--- a/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=true/line153.sh
+++ b/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=true/line153.sh
@@ -1,5 +1,8 @@
 [Unit]
 Description=Bind mount kubelet data
+Requires=mnt.mount
+After=mnt.mount
+
 [Service]
 Restart=on-failure
 RemainAfterExit=yes
diff --git a/pkg/agent/testdata/CustomizedImage/CustomData b/pkg/agent/testdata/CustomizedImage/CustomData
index 7a346d9341a..50b6876e8af 100644
--- a/pkg/agent/testdata/CustomizedImage/CustomData
+++ b/pkg/agent/testdata/CustomizedImage/CustomData
@@ -148,7 +148,7 @@ write_files:
   encoding: gzip
   owner: root
   content: !!binary |
-    H4sIAAAAAAAC/xzNMU7DQBBG4X5O4Qs4e4ItiEhBm4AoLBdj+w8esZ61ZmZRzOkRqZ+evuFDJUZ6hc8me0jVfBZduq02je67TSiIbuFgGm6wH5kx0hUebJGr9neW0gx0xcaiL/eAXR4S+YDT+7EjV4WvNejywHx7XmkSTRP72qW6R+LfZkhz1WBRmP/npX/6J1+Jhjf14FJG+mQNLOcjb62E9M1hp2D7QtBfAAAA//8tGsoCxwAAAA==
+    H4sIAAAAAAAC/0zNsU6EUBCF4X6eghcAnuAWbtzCltVYEIoBzspEmIszc83i0xupLE/+fDn9m0oM9AyfTPaQrOkiOldbLhrVZxmxIqqZg6nDVxGDp02jOTs93QP2b1N/g33LhIE6eLBFylrfWdZioA4bi57m+pBIB5xejx0pK3zJQdcHptup2lG0HdmXqs17tPxTDO2UNVgU5n95rs/Pxhei/kU9eF0HemcNzJcjbWUNqYvDmmD7QNBvAAAA///RbR0T6wAAAA==
 
 - path: /etc/systemd/system/dhcpv6.service
   permissions: "0644"
diff --git a/pkg/agent/testdata/CustomizedImage/line151.sh b/pkg/agent/testdata/CustomizedImage/line151.sh
index 019b0dfc0e2..a7d193529ca 100644
--- a/pkg/agent/testdata/CustomizedImage/line151.sh
+++ b/pkg/agent/testdata/CustomizedImage/line151.sh
@@ -1,5 +1,8 @@
 [Unit]
 Description=Bind mount kubelet data
+Requires=mnt.mount
+After=mnt.mount
+
 [Service]
 Restart=on-failure
 RemainAfterExit=yes
diff --git a/pkg/agent/testdata/CustomizedImageKata/CustomData b/pkg/agent/testdata/CustomizedImageKata/CustomData
index 7a346d9341a..50b6876e8af 100644
--- a/pkg/agent/testdata/CustomizedImageKata/CustomData
+++ b/pkg/agent/testdata/CustomizedImageKata/CustomData
@@ -148,7 +148,7 @@ write_files:
   encoding: gzip
   owner: root
   content: !!binary |
-    H4sIAAAAAAAC/xzNMU7DQBBG4X5O4Qs4e4ItiEhBm4AoLBdj+w8esZ61ZmZRzOkRqZ+evuFDJUZ6hc8me0jVfBZduq02je67TSiIbuFgGm6wH5kx0hUebJGr9neW0gx0xcaiL/eAXR4S+YDT+7EjV4WvNejywHx7XmkSTRP72qW6R+LfZkhz1WBRmP/npX/6J1+Jhjf14FJG+mQNLOcjb62E9M1hp2D7QtBfAAAA//8tGsoCxwAAAA==
+    H4sIAAAAAAAC/0zNsU6EUBCF4X6eghcAnuAWbtzCltVYEIoBzspEmIszc83i0xupLE/+fDn9m0oM9AyfTPaQrOkiOldbLhrVZxmxIqqZg6nDVxGDp02jOTs93QP2b1N/g33LhIE6eLBFylrfWdZioA4bi57m+pBIB5xejx0pK3zJQdcHptup2lG0HdmXqs17tPxTDO2UNVgU5n95rs/Pxhei/kU9eF0HemcNzJcjbWUNqYvDmmD7QNBvAAAA///RbR0T6wAAAA==
 
 - path: /etc/systemd/system/dhcpv6.service
   permissions: "0644"
diff --git a/pkg/agent/testdata/CustomizedImageKata/line151.sh b/pkg/agent/testdata/CustomizedImageKata/line151.sh
index 019b0dfc0e2..a7d193529ca 100644
--- a/pkg/agent/testdata/CustomizedImageKata/line151.sh
+++ b/pkg/agent/testdata/CustomizedImageKata/line151.sh
@@ -1,5 +1,8 @@
 [Unit]
 Description=Bind mount kubelet data
+Requires=mnt.mount
+After=mnt.mount
+
 [Service]
 Restart=on-failure
 RemainAfterExit=yes
diff --git a/pkg/agent/testdata/MarinerV2+CustomCloud/CustomData b/pkg/agent/testdata/MarinerV2+CustomCloud/CustomData
index fdf5dac5399..c71f9c5a416 100644
--- a/pkg/agent/testdata/MarinerV2+CustomCloud/CustomData
+++ b/pkg/agent/testdata/MarinerV2+CustomCloud/CustomData
@@ -150,7 +150,7 @@ write_files:
   encoding: gzip
   owner: root
   content: !!binary |
-    H4sIAAAAAAAC/xzNMU7DQBBG4X5O4Qs4e4ItiEhBm4AoLBdj+w8esZ61ZmZRzOkRqZ+evuFDJUZ6hc8me0jVfBZduq02je67TSiIbuFgGm6wH5kx0hUebJGr9neW0gx0xcaiL/eAXR4S+YDT+7EjV4WvNejywHx7XmkSTRP72qW6R+LfZkhz1WBRmP/npX/6J1+Jhjf14FJG+mQNLOcjb62E9M1hp2D7QtBfAAAA//8tGsoCxwAAAA==
+    H4sIAAAAAAAC/0zNsU6EUBCF4X6eghcAnuAWbtzCltVYEIoBzspEmIszc83i0xupLE/+fDn9m0oM9AyfTPaQrOkiOldbLhrVZxmxIqqZg6nDVxGDp02jOTs93QP2b1N/g33LhIE6eLBFylrfWdZioA4bi57m+pBIB5xejx0pK3zJQdcHptup2lG0HdmXqs17tPxTDO2UNVgU5n95rs/Pxhei/kU9eF0HemcNzJcjbWUNqYvDmmD7QNBvAAAA///RbR0T6wAAAA==
 
 - path: /etc/systemd/system/dhcpv6.service
   permissions: "0644"
diff --git a/pkg/agent/testdata/MarinerV2+CustomCloud/line153.sh b/pkg/agent/testdata/MarinerV2+CustomCloud/line153.sh
index 019b0dfc0e2..a7d193529ca 100644
--- a/pkg/agent/testdata/MarinerV2+CustomCloud/line153.sh
+++ b/pkg/agent/testdata/MarinerV2+CustomCloud/line153.sh
@@ -1,5 +1,8 @@
 [Unit]
 Description=Bind mount kubelet data
+Requires=mnt.mount
+After=mnt.mount
+
 [Service]
 Restart=on-failure
 RemainAfterExit=yes
diff --git a/pkg/agent/testdata/MarinerV2+Kata/CustomData b/pkg/agent/testdata/MarinerV2+Kata/CustomData
index 99b396b3acb..909ddd7c3e9 100644
--- a/pkg/agent/testdata/MarinerV2+Kata/CustomData
+++ b/pkg/agent/testdata/MarinerV2+Kata/CustomData
@@ -150,7 +150,7 @@ write_files:
   encoding: gzip
   owner: root
   content: !!binary |
-    H4sIAAAAAAAC/xzNMU7DQBBG4X5O4Qs4e4ItiEhBm4AoLBdj+w8esZ61ZmZRzOkRqZ+evuFDJUZ6hc8me0jVfBZduq02je67TSiIbuFgGm6wH5kx0hUebJGr9neW0gx0xcaiL/eAXR4S+YDT+7EjV4WvNejywHx7XmkSTRP72qW6R+LfZkhz1WBRmP/npX/6J1+Jhjf14FJG+mQNLOcjb62E9M1hp2D7QtBfAAAA//8tGsoCxwAAAA==
+    H4sIAAAAAAAC/0zNsU6EUBCF4X6eghcAnuAWbtzCltVYEIoBzspEmIszc83i0xupLE/+fDn9m0oM9AyfTPaQrOkiOldbLhrVZxmxIqqZg6nDVxGDp02jOTs93QP2b1N/g33LhIE6eLBFylrfWdZioA4bi57m+pBIB5xejx0pK3zJQdcHptup2lG0HdmXqs17tPxTDO2UNVgU5n95rs/Pxhei/kU9eF0HemcNzJcjbWUNqYvDmmD7QNBvAAAA///RbR0T6wAAAA==
 
 - path: /etc/systemd/system/dhcpv6.service
   permissions: "0644"
diff --git a/pkg/agent/testdata/MarinerV2+Kata/line153.sh b/pkg/agent/testdata/MarinerV2+Kata/line153.sh
index 019b0dfc0e2..a7d193529ca 100644
--- a/pkg/agent/testdata/MarinerV2+Kata/line153.sh
+++ b/pkg/agent/testdata/MarinerV2+Kata/line153.sh
@@ -1,5 +1,8 @@
 [Unit]
 Description=Bind mount kubelet data
+Requires=mnt.mount
+After=mnt.mount
+
 [Service]
 Restart=on-failure
 RemainAfterExit=yes
diff --git a/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=false/CustomData b/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=false/CustomData
index 99b396b3acb..909ddd7c3e9 100644
--- a/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=false/CustomData
+++ b/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=false/CustomData
@@ -150,7 +150,7 @@ write_files:
   encoding: gzip
   owner: root
   content: !!binary |
-    H4sIAAAAAAAC/xzNMU7DQBBG4X5O4Qs4e4ItiEhBm4AoLBdj+w8esZ61ZmZRzOkRqZ+evuFDJUZ6hc8me0jVfBZduq02je67TSiIbuFgGm6wH5kx0hUebJGr9neW0gx0xcaiL/eAXR4S+YDT+7EjV4WvNejywHx7XmkSTRP72qW6R+LfZkhz1WBRmP/npX/6J1+Jhjf14FJG+mQNLOcjb62E9M1hp2D7QtBfAAAA//8tGsoCxwAAAA==
+    H4sIAAAAAAAC/0zNsU6EUBCF4X6eghcAnuAWbtzCltVYEIoBzspEmIszc83i0xupLE/+fDn9m0oM9AyfTPaQrOkiOldbLhrVZxmxIqqZg6nDVxGDp02jOTs93QP2b1N/g33LhIE6eLBFylrfWdZioA4bi57m+pBIB5xejx0pK3zJQdcHptup2lG0HdmXqs17tPxTDO2UNVgU5n95rs/Pxhei/kU9eF0HemcNzJcjbWUNqYvDmmD7QNBvAAAA///RbR0T6wAAAA==
 
 - path: /etc/systemd/system/dhcpv6.service
   permissions: "0644"
diff --git a/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=false/line153.sh b/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=false/line153.sh
index 019b0dfc0e2..a7d193529ca 100644
--- a/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=false/line153.sh
+++ b/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=false/line153.sh
@@ -1,5 +1,8 @@
 [Unit]
 Description=Bind mount kubelet data
+Requires=mnt.mount
+After=mnt.mount
+
 [Service]
 Restart=on-failure
 RemainAfterExit=yes
diff --git a/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=true/CustomData b/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=true/CustomData
index 99b396b3acb..909ddd7c3e9 100644
--- a/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=true/CustomData
+++ b/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=true/CustomData
@@ -150,7 +150,7 @@ write_files:
   encoding: gzip
   owner: root
   content: !!binary |
-    H4sIAAAAAAAC/xzNMU7DQBBG4X5O4Qs4e4ItiEhBm4AoLBdj+w8esZ61ZmZRzOkRqZ+evuFDJUZ6hc8me0jVfBZduq02je67TSiIbuFgGm6wH5kx0hUebJGr9neW0gx0xcaiL/eAXR4S+YDT+7EjV4WvNejywHx7XmkSTRP72qW6R+LfZkhz1WBRmP/npX/6J1+Jhjf14FJG+mQNLOcjb62E9M1hp2D7QtBfAAAA//8tGsoCxwAAAA==
+    H4sIAAAAAAAC/0zNsU6EUBCF4X6eghcAnuAWbtzCltVYEIoBzspEmIszc83i0xupLE/+fDn9m0oM9AyfTPaQrOkiOldbLhrVZxmxIqqZg6nDVxGDp02jOTs93QP2b1N/g33LhIE6eLBFylrfWdZioA4bi57m+pBIB5xejx0pK3zJQdcHptup2lG0HdmXqs17tPxTDO2UNVgU5n95rs/Pxhei/kU9eF0HemcNzJcjbWUNqYvDmmD7QNBvAAAA///RbR0T6wAAAA==
 
 - path: /etc/systemd/system/dhcpv6.service
   permissions: "0644"
diff --git a/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=true/line153.sh b/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=true/line153.sh
index 019b0dfc0e2..a7d193529ca 100644
--- a/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=true/line153.sh
+++ b/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=true/line153.sh
@@ -1,5 +1,8 @@
 [Unit]
 Description=Bind mount kubelet data
+Requires=mnt.mount
+After=mnt.mount
+
 [Service]
 Restart=on-failure
 RemainAfterExit=yes
diff --git a/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=false/CustomData b/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=false/CustomData
index 99b396b3acb..909ddd7c3e9 100644
--- a/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=false/CustomData
+++ b/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=false/CustomData
@@ -150,7 +150,7 @@ write_files:
   encoding: gzip
   owner: root
   content: !!binary |
-    H4sIAAAAAAAC/xzNMU7DQBBG4X5O4Qs4e4ItiEhBm4AoLBdj+w8esZ61ZmZRzOkRqZ+evuFDJUZ6hc8me0jVfBZduq02je67TSiIbuFgGm6wH5kx0hUebJGr9neW0gx0xcaiL/eAXR4S+YDT+7EjV4WvNejywHx7XmkSTRP72qW6R+LfZkhz1WBRmP/npX/6J1+Jhjf14FJG+mQNLOcjb62E9M1hp2D7QtBfAAAA//8tGsoCxwAAAA==
+    H4sIAAAAAAAC/0zNsU6EUBCF4X6eghcAnuAWbtzCltVYEIoBzspEmIszc83i0xupLE/+fDn9m0oM9AyfTPaQrOkiOldbLhrVZxmxIqqZg6nDVxGDp02jOTs93QP2b1N/g33LhIE6eLBFylrfWdZioA4bi57m+pBIB5xejx0pK3zJQdcHptup2lG0HdmXqs17tPxTDO2UNVgU5n95rs/Pxhei/kU9eF0HemcNzJcjbWUNqYvDmmD7QNBvAAAA///RbR0T6wAAAA==
 
 - path: /etc/systemd/system/dhcpv6.service
   permissions: "0644"
diff --git a/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=false/line153.sh b/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=false/line153.sh
index 019b0dfc0e2..a7d193529ca 100644
--- a/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=false/line153.sh
+++ b/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=false/line153.sh
@@ -1,5 +1,8 @@
 [Unit]
 Description=Bind mount kubelet data
+Requires=mnt.mount
+After=mnt.mount
+
 [Service]
 Restart=on-failure
 RemainAfterExit=yes
diff --git a/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=true/CustomData b/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=true/CustomData
index 99b396b3acb..909ddd7c3e9 100644
--- a/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=true/CustomData
+++ b/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=true/CustomData
@@ -150,7 +150,7 @@ write_files:
   encoding: gzip
   owner: root
   content: !!binary |
-    H4sIAAAAAAAC/xzNMU7DQBBG4X5O4Qs4e4ItiEhBm4AoLBdj+w8esZ61ZmZRzOkRqZ+evuFDJUZ6hc8me0jVfBZduq02je67TSiIbuFgGm6wH5kx0hUebJGr9neW0gx0xcaiL/eAXR4S+YDT+7EjV4WvNejywHx7XmkSTRP72qW6R+LfZkhz1WBRmP/npX/6J1+Jhjf14FJG+mQNLOcjb62E9M1hp2D7QtBfAAAA//8tGsoCxwAAAA==
+    H4sIAAAAAAAC/0zNsU6EUBCF4X6eghcAnuAWbtzCltVYEIoBzspEmIszc83i0xupLE/+fDn9m0oM9AyfTPaQrOkiOldbLhrVZxmxIqqZg6nDVxGDp02jOTs93QP2b1N/g33LhIE6eLBFylrfWdZioA4bi57m+pBIB5xejx0pK3zJQdcHptup2lG0HdmXqs17tPxTDO2UNVgU5n95rs/Pxhei/kU9eF0HemcNzJcjbWUNqYvDmmD7QNBvAAAA///RbR0T6wAAAA==
 
 - path: /etc/systemd/system/dhcpv6.service
   permissions: "0644"
diff --git a/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=true/line153.sh b/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=true/line153.sh
index 019b0dfc0e2..a7d193529ca 100644
--- a/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=true/line153.sh
+++ b/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=true/line153.sh
@@ -1,5 +1,8 @@
 [Unit]
 Description=Bind mount kubelet data
+Requires=mnt.mount
+After=mnt.mount
+
 [Service]
 Restart=on-failure
 RemainAfterExit=yes
diff --git a/pkg/agent/testdata/RawUbuntu/CustomData b/pkg/agent/testdata/RawUbuntu/CustomData
index 66aa9bd8b87..69cd5fcf6ac 100644
--- a/pkg/agent/testdata/RawUbuntu/CustomData
+++ b/pkg/agent/testdata/RawUbuntu/CustomData
@@ -153,7 +153,7 @@ write_files:
   encoding: gzip
   owner: root
   content: !!binary |
-    H4sIAAAAAAAC/xzNMU7DQBBG4X5O4Qs4e4ItiEhBm4AoLBdj+w8esZ61ZmZRzOkRqZ+evuFDJUZ6hc8me0jVfBZduq02je67TSiIbuFgGm6wH5kx0hUebJGr9neW0gx0xcaiL/eAXR4S+YDT+7EjV4WvNejywHx7XmkSTRP72qW6R+LfZkhz1WBRmP/npX/6J1+Jhjf14FJG+mQNLOcjb62E9M1hp2D7QtBfAAAA//8tGsoCxwAAAA==
+    H4sIAAAAAAAC/0zNsU6EUBCF4X6eghcAnuAWbtzCltVYEIoBzspEmIszc83i0xupLE/+fDn9m0oM9AyfTPaQrOkiOldbLhrVZxmxIqqZg6nDVxGDp02jOTs93QP2b1N/g33LhIE6eLBFylrfWdZioA4bi57m+pBIB5xejx0pK3zJQdcHptup2lG0HdmXqs17tPxTDO2UNVgU5n95rs/Pxhei/kU9eF0HemcNzJcjbWUNqYvDmmD7QNBvAAAA///RbR0T6wAAAA==
 
 - path: /etc/systemd/system/dhcpv6.service
   permissions: "0644"
diff --git a/pkg/agent/testdata/RawUbuntu/line156.sh b/pkg/agent/testdata/RawUbuntu/line156.sh
index 019b0dfc0e2..a7d193529ca 100644
--- a/pkg/agent/testdata/RawUbuntu/line156.sh
+++ b/pkg/agent/testdata/RawUbuntu/line156.sh
@@ -1,5 +1,8 @@
 [Unit]
 Description=Bind mount kubelet data
+Requires=mnt.mount
+After=mnt.mount
+
 [Service]
 Restart=on-failure
 RemainAfterExit=yes
diff --git a/pkg/agent/testdata/RawUbuntuContainerd/CustomData b/pkg/agent/testdata/RawUbuntuContainerd/CustomData
index 508aec22ff6..2fd2713bb0d 100644
--- a/pkg/agent/testdata/RawUbuntuContainerd/CustomData
+++ b/pkg/agent/testdata/RawUbuntuContainerd/CustomData
@@ -153,7 +153,7 @@ write_files:
   encoding: gzip
   owner: root
   content: !!binary |
-    H4sIAAAAAAAC/xzNMU7DQBBG4X5O4Qs4e4ItiEhBm4AoLBdj+w8esZ61ZmZRzOkRqZ+evuFDJUZ6hc8me0jVfBZduq02je67TSiIbuFgGm6wH5kx0hUebJGr9neW0gx0xcaiL/eAXR4S+YDT+7EjV4WvNejywHx7XmkSTRP72qW6R+LfZkhz1WBRmP/npX/6J1+Jhjf14FJG+mQNLOcjb62E9M1hp2D7QtBfAAAA//8tGsoCxwAAAA==
+    H4sIAAAAAAAC/0zNsU6EUBCF4X6eghcAnuAWbtzCltVYEIoBzspEmIszc83i0xupLE/+fDn9m0oM9AyfTPaQrOkiOldbLhrVZxmxIqqZg6nDVxGDp02jOTs93QP2b1N/g33LhIE6eLBFylrfWdZioA4bi57m+pBIB5xejx0pK3zJQdcHptup2lG0HdmXqs17tPxTDO2UNVgU5n95rs/Pxhei/kU9eF0HemcNzJcjbWUNqYvDmmD7QNBvAAAA///RbR0T6wAAAA==
 
 - path: /etc/systemd/system/dhcpv6.service
   permissions: "0644"
diff --git a/pkg/agent/testdata/RawUbuntuContainerd/line156.sh b/pkg/agent/testdata/RawUbuntuContainerd/line156.sh
index 019b0dfc0e2..a7d193529ca 100644
--- a/pkg/agent/testdata/RawUbuntuContainerd/line156.sh
+++ b/pkg/agent/testdata/RawUbuntuContainerd/line156.sh
@@ -1,5 +1,8 @@
 [Unit]
 Description=Bind mount kubelet data
+Requires=mnt.mount
+After=mnt.mount
+
 [Service]
 Restart=on-failure
 RemainAfterExit=yes
diff --git a/vhdbuilder/release-notes/AKSWindows/2022-containerd-gen2/20348.2762.241114-image-list.json b/vhdbuilder/release-notes/AKSWindows/2022-containerd-gen2/20348.2849.241119-image-list.json
old mode 100644
new mode 100755
similarity index 99%
rename from vhdbuilder/release-notes/AKSWindows/2022-containerd-gen2/20348.2762.241114-image-list.json
rename to vhdbuilder/release-notes/AKSWindows/2022-containerd-gen2/20348.2849.241119-image-list.json
index 3f09e3723ae..20c06372a29
--- a/vhdbuilder/release-notes/AKSWindows/2022-containerd-gen2/20348.2762.241114-image-list.json
+++ b/vhdbuilder/release-notes/AKSWindows/2022-containerd-gen2/20348.2849.241119-image-list.json
@@ -1,6 +1,6 @@
 {
   "sku": "windows-2022-containerd-gen2",
-  "imageVersion": "20348.2762.241114",
+  "imageVersion": "20348.2849.241119",
   "imageBom": [
     {
       "id": "sha256:2c989d4848540c9244c93c71184ae7fc928782714c669bb6517684153015baf5",
diff --git a/vhdbuilder/release-notes/AKSWindows/2022-containerd-gen2/20348.2762.241114.txt b/vhdbuilder/release-notes/AKSWindows/2022-containerd-gen2/20348.2849.241119.txt
old mode 100644
new mode 100755
similarity index 98%
rename from vhdbuilder/release-notes/AKSWindows/2022-containerd-gen2/20348.2762.241114.txt
rename to vhdbuilder/release-notes/AKSWindows/2022-containerd-gen2/20348.2849.241119.txt
index 0500ec248b3..8bf1ffd781b
--- a/vhdbuilder/release-notes/AKSWindows/2022-containerd-gen2/20348.2762.241114.txt
+++ b/vhdbuilder/release-notes/AKSWindows/2022-containerd-gen2/20348.2849.241119.txt
@@ -1,14 +1,14 @@
-Build Number: 20241114.7_v20241115_108194107
-Build Id:     108194107
+Build Number: 20241119.2_v20241119_108514807
+Build Id:     108514807
 Build Repo:   https://github.com/Azure/AgentBaker
-Build Branch: windows/v20241115
-Commit:       3e62fdcece37ca779b87d72bd63bee363392e045
+Build Branch: windows/v20241119
+Commit:       1f49ea44a536d267768c070a2fa761205286d087
 
-VHD ID:      7715ac23-bdf6-4cee-a5bc-0faaaa4e396f
+VHD ID:      7b92e303-2748-47b1-b48c-d2527849f5cf
 
 System Info
 	OS Name        : Windows Server 2022 Datacenter
-	OS Version     : 20348.2762
+	OS Version     : 20348.2849
 	OS InstallType : Server Core
 
 Allowed security protocols: SystemDefault
@@ -53,14 +53,14 @@ Installed Packages
 
 Installed QFEs
 	KB5044025 : Update          : https://support.microsoft.com/kb/5044025
-	KB5044281 : Security Update : https://support.microsoft.com/kb/5044281
+	KB5046616 : Security Update : https://support.microsoft.com/kb/5046616
 	KB5044414 : Security Update : https://support.microsoft.com/kb/5044414
 
 Installed Updates
 	Update for Windows Defender Antivirus antimalware platform - KB4052623 (Version 4.18.2001.10)
 	2024-10 Cumulative Update for .NET Framework 3.5, 4.8 and 4.8.1 for Microsoft server operating system version 21H2 for x64 (KB5044099)
 	Update for Microsoft Defender Antivirus antimalware platform - KB4052623 (Version 4.18.24090.11) - Current Channel (Broad)
-	Security Intelligence Update for Microsoft Defender Antivirus - KB2267602 (Version 1.421.296.0) - Current Channel (Broad)
+	Security Intelligence Update for Microsoft Defender Antivirus - KB2267602 (Version 1.421.365.0) - Current Channel (Broad)
 
 Windows Update Registry Settings
 	https://docs.microsoft.com/en-us/windows/deployment/update/waas-wu-settings