diff --git a/charts/chart_versions.yaml b/charts/chart_versions.yaml
index ed64ff6ad0..116f5a458a 100644
--- a/charts/chart_versions.yaml
+++ b/charts/chart_versions.yaml
@@ -29,7 +29,6 @@ charts:
   - version: v4.1.001
     filename: /charts/rke2-multus.yaml
     bootstrap: true
-  - version: v0.25.601
     filename: /charts/rke2-flannel.yaml
     bootstrap: true
   - version: 1.9.000
diff --git a/go.mod b/go.mod
index 5da5350ce6..9fada31d7b 100644
--- a/go.mod
+++ b/go.mod
@@ -60,6 +60,8 @@ replace (
 	k8s.io/kubectl => github.com/k3s-io/kubernetes/staging/src/k8s.io/kubectl v1.31.0-k3s3
 	k8s.io/kubelet => github.com/k3s-io/kubernetes/staging/src/k8s.io/kubelet v1.31.0-k3s3
 	k8s.io/kubernetes => github.com/k3s-io/kubernetes v1.31.0-k3s3
+
+	k8s.io/legacy-cloud-providers => github.com/k3s-io/kubernetes/staging/src/k8s.io/legacy-cloud-providers v1.30.4-k3s1 // upstream stopped producing tags
 	k8s.io/metrics => github.com/k3s-io/kubernetes/staging/src/k8s.io/metrics v1.31.0-k3s3
 	k8s.io/mount-utils => github.com/k3s-io/kubernetes/staging/src/k8s.io/mount-utils v1.31.0-k3s3
 	k8s.io/node-api => github.com/k3s-io/kubernetes/staging/src/k8s.io/node-api v1.31.0-k3s3
diff --git a/pkg/pebinaryexecutor/pebinary.go b/pkg/pebinaryexecutor/pebinary.go
index 110447cfdf..7f2000a258 100644
--- a/pkg/pebinaryexecutor/pebinary.go
+++ b/pkg/pebinaryexecutor/pebinary.go
@@ -129,8 +129,10 @@ func (p *PEBinaryConfig) Bootstrap(ctx context.Context, nodeConfig *config.Node,
 		logrus.Fatal("Unsupported CNI: ", p.CNIName)
 	}
 
-	if err := p.CNIPlugin.Setup(ctx, nodeConfig, restConfig, p.DataDir); err != nil {
-		return err
+	if p.CNIPlugin != nil {
+		if err := p.CNIPlugin.Setup(ctx, nodeConfig, restConfig, p.DataDir); err != nil {
+			return err
+		}
 	}
 
 	// required to initialize KubeProxy