diff --git a/test/integration/manifests/cnsconfig/azurecnidualstackoverlaylinuxconfigmap.yaml b/test/integration/manifests/cnsconfig/azurecnidualstackoverlaylinuxconfigmap.yaml
index d2f489c6ae..e8e52dd1b8 100644
--- a/test/integration/manifests/cnsconfig/azurecnidualstackoverlaylinuxconfigmap.yaml
+++ b/test/integration/manifests/cnsconfig/azurecnidualstackoverlaylinuxconfigmap.yaml
@@ -21,14 +21,16 @@ data:
           "NodeID": "",
           "NodeSyncIntervalInSeconds": 30
       },
+      "AsyncPodDeletePath": "/var/run/azure-vnet/deleteIDs",
       "ChannelMode": "CRD",
-      "InitializeFromCNI": true,
-      "ManageEndpointState": false,
-      "ProgramSNATIPTables" : false,
-      "EnableCNIConflistGeneration": true,
       "CNIConflistFilepath": "/etc/cni/net.d/15-azure-swift-overlay.conflist",
       "CNIConflistScenario": "overlay",
       "EnableAsyncPodDelete": false,
-      "AsyncPodDeletePath": "/var/run/azure-vnet/deleteIDs",
-      "EnableIPAMv2": true
+      "EnableCNIConflistGeneration": true,
+      "EnableIPAMv2": true,
+      "EnableStateMigration": false,
+      "EnableSubnetScarcity": false,
+      "InitializeFromCNI": true,
+      "ManageEndpointState": false,
+      "ProgramSNATIPTables": false
     }
diff --git a/test/integration/manifests/cnsconfig/azurecnidualstackoverlaywindowsconfigmap.yaml b/test/integration/manifests/cnsconfig/azurecnidualstackoverlaywindowsconfigmap.yaml
index 476d5ca1b5..e6dd333fca 100644
--- a/test/integration/manifests/cnsconfig/azurecnidualstackoverlaywindowsconfigmap.yaml
+++ b/test/integration/manifests/cnsconfig/azurecnidualstackoverlaywindowsconfigmap.yaml
@@ -21,16 +21,17 @@ data:
           "NodeID": "",
           "NodeSyncIntervalInSeconds": 30
       },
-      "EnableSubnetScarcity": false,
+      "AsyncPodDeletePath": "/var/run/azure-vnet/deleteIDs",
       "ChannelMode": "CRD",
-      "InitializeFromCNI": true,
-      "ManageEndpointState": false,
-      "ProgramSNATIPTables" : false,
-      "MetricsBindAddress": ":10092",
-      "EnableCNIConflistGeneration": false,
       "CNIConflistFilepath": "C:\\k\\azurecni\\netconf\\10-azure.conflist",
       "CNIConflistScenario": "dualStackOverlay",
       "EnableAsyncPodDelete": false,
-      "AsyncPodDeletePath": "/var/run/azure-vnet/deleteIDs",
-      "EnableIPAMv2": true
+      "EnableCNIConflistGeneration": false,
+      "EnableIPAMv2": true,
+      "EnableStateMigration": false,
+      "EnableSubnetScarcity": false,
+      "InitializeFromCNI": true,
+      "ManageEndpointState": false,
+      "MetricsBindAddress": ":10092",
+      "ProgramSNATIPTables": false
     }
diff --git a/test/integration/manifests/cnsconfig/azurecnioverlaylinuxconfigmap.yaml b/test/integration/manifests/cnsconfig/azurecnioverlaylinuxconfigmap.yaml
index ce1e875ce5..1c158df4e0 100644
--- a/test/integration/manifests/cnsconfig/azurecnioverlaylinuxconfigmap.yaml
+++ b/test/integration/manifests/cnsconfig/azurecnioverlaylinuxconfigmap.yaml
@@ -21,14 +21,16 @@ data:
           "NodeID": "",
           "NodeSyncIntervalInSeconds": 30
       },
+      "AsyncPodDeletePath": "/var/run/azure-vnet/deleteIDs",
       "ChannelMode": "CRD",
-      "InitializeFromCNI": true,
-      "ManageEndpointState": false,
-      "ProgramSNATIPTables" : false,
-      "EnableCNIConflistGeneration": true,
       "CNIConflistFilepath": "/etc/cni/net.d/15-azure-swift-overlay.conflist",
       "CNIConflistScenario": "v4overlay",
       "EnableAsyncPodDelete": true,
-      "AsyncPodDeletePath": "/var/run/azure-vnet/deleteIDs",
-      "EnableIPAMv2": true
+      "EnableCNIConflistGeneration": true,
+      "EnableIPAMv2": true,
+      "EnableStateMigration": false,
+      "EnableSubnetScarcity": false,
+      "InitializeFromCNI": true,
+      "ManageEndpointState": false,
+      "ProgramSNATIPTables": false
     }
diff --git a/test/integration/manifests/cnsconfig/azurecnioverlaywindowsconfigmap.yaml b/test/integration/manifests/cnsconfig/azurecnioverlaywindowsconfigmap.yaml
index 6119752370..40be0c0e3d 100644
--- a/test/integration/manifests/cnsconfig/azurecnioverlaywindowsconfigmap.yaml
+++ b/test/integration/manifests/cnsconfig/azurecnioverlaywindowsconfigmap.yaml
@@ -21,16 +21,17 @@ data:
           "NodeID": "",
           "NodeSyncIntervalInSeconds": 30
       },
-      "EnableSubnetScarcity": false,
+      "AsyncPodDeletePath": "/var/run/azure-vnet/deleteIDs",
       "ChannelMode": "CRD",
-      "InitializeFromCNI": true,
-      "ManageEndpointState": false,
-      "ProgramSNATIPTables" : false,
-      "MetricsBindAddress": ":10092",
-      "EnableCNIConflistGeneration": false,
       "CNIConflistFilepath": "C:\\k\\azurecni\\netconf\\10-azure.conflist",
       "CNIConflistScenario": "v4overlay",
       "EnableAsyncPodDelete": true,
-      "AsyncPodDeletePath": "/var/run/azure-vnet/deleteIDs",
-      "EnableIPAMv2": true
+      "EnableCNIConflistGeneration": false,
+      "EnableIPAMv2": true,
+      "EnableStateMigration": false,
+      "EnableSubnetScarcity": false,
+      "InitializeFromCNI": true,
+      "ManageEndpointState": false,
+      "MetricsBindAddress": ":10092",
+      "ProgramSNATIPTables": false
     }
diff --git a/test/integration/manifests/cnsconfig/azurestatelesscnioverlaywindowsconfigmap.yaml b/test/integration/manifests/cnsconfig/azurestatelesscnioverlaywindowsconfigmap.yaml
index 964cd5ee72..f1488e2860 100644
--- a/test/integration/manifests/cnsconfig/azurestatelesscnioverlaywindowsconfigmap.yaml
+++ b/test/integration/manifests/cnsconfig/azurestatelesscnioverlaywindowsconfigmap.yaml
@@ -21,16 +21,17 @@ data:
           "NodeID": "",
           "NodeSyncIntervalInSeconds": 30
       },
-      "EnableSubnetScarcity": false,
+      "AsyncPodDeletePath": "/var/run/azure-vnet/deleteIDs",
       "ChannelMode": "CRD",
-      "InitializeFromCNI": false,
-      "ManageEndpointState": true,
-      "ProgramSNATIPTables" : false,
-      "MetricsBindAddress": ":10092",
-      "EnableCNIConflistGeneration": false,
       "CNIConflistFilepath": "C:\\k\\azurecni\\netconf\\10-azure.conflist",
       "CNIConflistScenario": "v4overlay",
       "EnableAsyncPodDelete": true,
-      "AsyncPodDeletePath": "/var/run/azure-vnet/deleteIDs",
-      "EnableIPAMv2": true
+      "EnableCNIConflistGeneration": false,
+      "EnableIPAMv2": true,
+      "EnableStateMigration": false,
+      "EnableSubnetScarcity": false,
+      "InitializeFromCNI": false,
+      "ManageEndpointState": true,
+      "MetricsBindAddress": ":10092",
+      "ProgramSNATIPTables": false
     }
diff --git a/test/integration/manifests/cnsconfig/ciliumconfigmap.yaml b/test/integration/manifests/cnsconfig/ciliumconfigmap.yaml
index 80a393d3db..5d1b3f585c 100644
--- a/test/integration/manifests/cnsconfig/ciliumconfigmap.yaml
+++ b/test/integration/manifests/cnsconfig/ciliumconfigmap.yaml
@@ -21,14 +21,16 @@ data:
           "NodeID": "",
           "NodeSyncIntervalInSeconds": 30
       },
+      "AsyncPodDeletePath": "/var/run/azure-vnet/deleteIDs",
       "ChannelMode": "CRD",
-      "InitializeFromCNI": false,
-      "ManageEndpointState": true,
-      "ProgramSNATIPTables" : true,
-      "EnableCNIConflistGeneration": true,
       "CNIConflistFilepath": "/etc/cni/net.d/05-cilium.conflist",
       "CNIConflistScenario": "cilium",
       "EnableAsyncPodDelete": true,
-      "AsyncPodDeletePath": "/var/run/azure-vnet/deleteIDs",
-      "EnableIPAMv2": true
+      "EnableCNIConflistGeneration": true,
+      "EnableIPAMv2": true,
+      "EnableStateMigration": false,
+      "EnableSubnetScarcity": false,
+      "InitializeFromCNI": false,
+      "ManageEndpointState": true,
+      "ProgramSNATIPTables": true
     }
diff --git a/test/integration/manifests/cnsconfig/ciliumnodesubnetconfigmap.yaml b/test/integration/manifests/cnsconfig/ciliumnodesubnetconfigmap.yaml
index e399af2bf4..6796b8068b 100644
--- a/test/integration/manifests/cnsconfig/ciliumnodesubnetconfigmap.yaml
+++ b/test/integration/manifests/cnsconfig/ciliumnodesubnetconfigmap.yaml
@@ -21,14 +21,16 @@ data:
           "NodeID": "",
           "NodeSyncIntervalInSeconds": 30
       },
+      "AsyncPodDeletePath": "/var/run/azure-vnet/deleteIDs",
       "ChannelMode": "AzureHost",
-      "InitializeFromCNI": false,
-      "ManageEndpointState": true,
-      "ProgramSNATIPTables" : false,
-      "EnableCNIConflistGeneration": true,
       "CNIConflistFilepath": "/etc/cni/net.d/05-cilium.conflist",
       "CNIConflistScenario": "cilium",
       "EnableAsyncPodDelete": true,
-      "AsyncPodDeletePath": "/var/run/azure-vnet/deleteIDs",
-      "EnableIPAMv2": true
+      "EnableCNIConflistGeneration": true,
+      "EnableIPAMv2": true,
+      "EnableStateMigration": false,
+      "EnableSubnetScarcity": false,
+      "InitializeFromCNI": false,
+      "ManageEndpointState": true,
+      "ProgramSNATIPTables": false
     }
diff --git a/test/integration/manifests/cnsconfig/overlayconfigmap.yaml b/test/integration/manifests/cnsconfig/overlayconfigmap.yaml
index 2677f1cb98..3321ec3698 100644
--- a/test/integration/manifests/cnsconfig/overlayconfigmap.yaml
+++ b/test/integration/manifests/cnsconfig/overlayconfigmap.yaml
@@ -21,14 +21,16 @@ data:
           "NodeID": "",
           "NodeSyncIntervalInSeconds": 30
       },
+      "AsyncPodDeletePath": "/var/run/azure-vnet/deleteIDs",
       "ChannelMode": "CRD",
-      "InitializeFromCNI": false,
-      "ManageEndpointState": true,
-      "ProgramSNATIPTables" : false,
-      "EnableCNIConflistGeneration": true,
       "CNIConflistFilepath": "/etc/cni/net.d/05-cilium.conflist",
       "CNIConflistScenario": "cilium",
       "EnableAsyncPodDelete": true,
-      "AsyncPodDeletePath": "/var/run/azure-vnet/deleteIDs",
-      "EnableIPAMv2": true
+      "EnableCNIConflistGeneration": true,
+      "EnableIPAMv2": true,
+      "EnableStateMigration": false,
+      "EnableSubnetScarcity": false,
+      "InitializeFromCNI": false,
+      "ManageEndpointState": true,
+      "ProgramSNATIPTables": false
     }
diff --git a/test/integration/manifests/cnsconfig/swiftlinuxconfigmap.yaml b/test/integration/manifests/cnsconfig/swiftlinuxconfigmap.yaml
index 254118e391..5b842dd278 100644
--- a/test/integration/manifests/cnsconfig/swiftlinuxconfigmap.yaml
+++ b/test/integration/manifests/cnsconfig/swiftlinuxconfigmap.yaml
@@ -25,7 +25,9 @@ data:
       "ChannelMode": "CRD",
       "EnableAsyncPodDelete": true,
       "EnableIPAMv2": true,
+      "EnableStateMigration": false,
+      "EnableSubnetScarcity": false,
       "InitializeFromCNI": true,
       "ManageEndpointState": false,
-      "ProgramSNATIPTables" : false
+      "ProgramSNATIPTables": false
     }
diff --git a/test/integration/manifests/cnsconfig/swiftwindowsconfigmap.yaml b/test/integration/manifests/cnsconfig/swiftwindowsconfigmap.yaml
index aeb9541669..829e964442 100644
--- a/test/integration/manifests/cnsconfig/swiftwindowsconfigmap.yaml
+++ b/test/integration/manifests/cnsconfig/swiftwindowsconfigmap.yaml
@@ -21,11 +21,13 @@ data:
           "NodeID": "",
           "NodeSyncIntervalInSeconds": 30
       },
+      "AsyncPodDeletePath": "/var/run/azure-vnet/deleteIDs",
       "ChannelMode": "CRD",
+      "EnableAsyncPodDelete": true,
+      "EnableIPAMv2": true,
+      "EnableStateMigration": false,
+      "EnableSubnetScarcity": false,
       "InitializeFromCNI": true,
       "ManageEndpointState": false,
-      "ProgramSNATIPTables": false,
-      "EnableAsyncPodDelete": true,
-      "AsyncPodDeletePath": "/var/run/azure-vnet/deleteIDs",
-      "EnableIPAMv2": true
+      "ProgramSNATIPTables": false
     }