diff --git a/metadata.mk b/metadata.mk
index 7823adb..efe32fe 100644
--- a/metadata.mk
+++ b/metadata.mk
@@ -55,7 +55,7 @@ GIT_REPO      ?= calico-private
 GIT_REMOTE    ?= origin
 
 RELEASE_BRANCH_PREFIX ?=release-calient
-DEV_TAG_SUFFIX        ?= calient-2.dev
+DEV_TAG_SUFFIX        ?= calient-3.dev
 
 # Part of the git remote that is common to git and HTTP representations.
 # Used to auto-detect the right remote.
@@ -92,7 +92,7 @@ WINDOWS_VERSIONS ?= ltsc2019 ltsc2022
 
 # The CNI plugin and flannel code that will be cloned and rebuilt with this repo's go-build image
 # whenever the cni-plugin image is created.
-CNI_VERSION=master
+CNI_VERSION=9ffe547cb3b66f80dd32a00fc69a6d0082b55321
 FLANNEL_VERSION=main
 
 # The libbpf version to use
diff --git a/pkg/apis/projectcalico/v3/felixconfig.go b/pkg/apis/projectcalico/v3/felixconfig.go
index c77fd73..33fa12c 100644
--- a/pkg/apis/projectcalico/v3/felixconfig.go
+++ b/pkg/apis/projectcalico/v3/felixconfig.go
@@ -1109,7 +1109,7 @@ type FelixConfigurationSpec struct {
 	// FlowLogsFileEnabledForDenied is used to enable/disable flow logs entries created for denied flows. Default is true.
 	// This parameter only takes effect when FlowLogsFileReporterEnabled is set to true.
 	FlowLogsFileEnabledForDenied *bool `json:"flowLogsFileEnabledForDenied,omitempty"`
-	// FlowLogsDynamicAggregationEnabled is used to enable/disable dynamically changing aggregation levels. Default is true.
+	// FlowLogsDynamicAggregationEnabled is used to enable/disable dynamically changing aggregation levels. Default is false.
 	FlowLogsDynamicAggregationEnabled *bool `json:"flowLogsDynamicAggregationEnabled,omitempty"`
 	// FlowLogsPositionFilePath is used specify the position of the external pipeline that reads flow logs. Default is /var/log/calico/flows.log.pos.
 	// This parameter only takes effect when FlowLogsDynamicAggregationEnabled is set to true.
diff --git a/pkg/client/applyconfiguration_generated/projectcalico/v3/felixconfigurationspec.go b/pkg/client/applyconfiguration_generated/projectcalico/v3/felixconfigurationspec.go
index 3a18739..0806b1f 100644
--- a/pkg/client/applyconfiguration_generated/projectcalico/v3/felixconfigurationspec.go
+++ b/pkg/client/applyconfiguration_generated/projectcalico/v3/felixconfigurationspec.go
@@ -689,7 +689,7 @@ type FelixConfigurationSpecApplyConfiguration struct {
 	// FlowLogsFileEnabledForDenied is used to enable/disable flow logs entries created for denied flows. Default is true.
 	// This parameter only takes effect when FlowLogsFileReporterEnabled is set to true.
 	FlowLogsFileEnabledForDenied *bool `json:"flowLogsFileEnabledForDenied,omitempty"`
-	// FlowLogsDynamicAggregationEnabled is used to enable/disable dynamically changing aggregation levels. Default is true.
+	// FlowLogsDynamicAggregationEnabled is used to enable/disable dynamically changing aggregation levels. Default is false.
 	FlowLogsDynamicAggregationEnabled *bool `json:"flowLogsDynamicAggregationEnabled,omitempty"`
 	// FlowLogsPositionFilePath is used specify the position of the external pipeline that reads flow logs. Default is /var/log/calico/flows.log.pos.
 	// This parameter only takes effect when FlowLogsDynamicAggregationEnabled is set to true.
diff --git a/pkg/openapi/generated.openapi.go b/pkg/openapi/generated.openapi.go
index 66e8f14..858c6e2 100644
--- a/pkg/openapi/generated.openapi.go
+++ b/pkg/openapi/generated.openapi.go
@@ -7009,7 +7009,7 @@ func schema_pkg_apis_projectcalico_v3_FelixConfigurationSpec(ref common.Referenc
 					},
 					"flowLogsDynamicAggregationEnabled": {
 						SchemaProps: spec.SchemaProps{
-							Description: "FlowLogsDynamicAggregationEnabled is used to enable/disable dynamically changing aggregation levels. Default is true.",
+							Description: "FlowLogsDynamicAggregationEnabled is used to enable/disable dynamically changing aggregation levels. Default is false.",
 							Type:        []string{"boolean"},
 							Format:      "",
 						},