diff --git a/packages/ako-operator-v2/bundle/config/overlays/overlay-akodeploymentconfig.yaml b/packages/ako-operator-v2/bundle/config/overlays/overlay-akodeploymentconfig.yaml
index ca5b31cf29..a26ed7f3dd 100644
--- a/packages/ako-operator-v2/bundle/config/overlays/overlay-akodeploymentconfig.yaml
+++ b/packages/ako-operator-v2/bundle/config/overlays/overlay-akodeploymentconfig.yaml
@@ -14,10 +14,6 @@ spec:
     #@overlay/match missing_ok=True
     clusterSelector:
         matchLabels: #@ json.decode(values.akoOperator.config.avi_labels)
-#@ end
-#@ if values.akoOperator.config.avi_controller_version != "":
-    #@overlay/match missing_ok=True
-    controllerVersion: #@ values.akoOperator.config.avi_controller_version
 #@ end
     cloudName: #@ values.akoOperator.config.avi_cloud_name
     serviceEngineGroup: #@ values.akoOperator.config.avi_service_engine_group
@@ -35,10 +31,6 @@ spec:
         name: #@ values.akoOperator.config.avi_control_plane_network
         cidr: #@ values.akoOperator.config.avi_control_plane_network_cidr
     extraConfigs:
-#@ if values.akoOperator.config.avi_cni_plugin:
-#@overlay/match missing_ok=True
-        cniPlugin: #@ values.akoOperator.config.avi_cni_plugin
-#@ end
         disableStaticRouteSync: #@ values.akoOperator.config.avi_disable_static_route_sync
         ingress:
             disableIngressClass: #@ values.akoOperator.config.avi_disable_ingress_class
@@ -72,10 +64,6 @@ spec:
     clusterSelector:
         matchLabels:
             cluster-role.tkg.tanzu.vmware.com/management: ""
-#@ if values.akoOperator.config.avi_controller_version != "":
-    #@overlay/match missing_ok=True
-    controllerVersion: #@ values.akoOperator.config.avi_controller_version
-#@ end
     dataNetwork:
         name: #@ values.akoOperator.config.avi_management_cluster_vip_network_name
         cidr: #@ values.akoOperator.config.avi_management_cluster_vip_network_cidr
@@ -92,10 +80,6 @@ spec:
         name: #@ values.akoOperator.config.avi_ca_name
         namespace: #@ values.akoOperator.namespace
     extraConfigs:
-#@ if values.akoOperator.config.avi_cni_plugin:
-#@overlay/match missing_ok=True
-        cniPlugin: #@ values.akoOperator.config.avi_cni_plugin
-#@ end
         disableStaticRouteSync: #@ values.akoOperator.config.avi_disable_static_route_sync
         ingress:
             disableIngressClass: #@ values.akoOperator.config.avi_disable_ingress_class
@@ -117,3 +101,49 @@ spec:
         networksConfig:
             nsxtT1LR: #@ values.akoOperator.config.avi_nsxt_t1_lr
 #@ end
+
+#@overlay/match by=overlay.subset({"kind": "AKODeploymentConfig", "metadata": {"name": "install-ako-for-all-npl"}})
+---
+#@overlay/replace
+apiVersion: networking.tkg.tanzu.vmware.com/v1alpha1
+kind: AKODeploymentConfig
+metadata:
+    name: install-ako-for-node-port-local
+spec:
+    #@overlay/match missing_ok=True
+    clusterSelector:
+        matchLabels:
+            networking.tkg.tanzu.vmware.com/nodeportlocal: ""
+    cloudName: #@ values.akoOperator.config.avi_cloud_name
+    serviceEngineGroup: #@ values.akoOperator.config.avi_service_engine_group
+    controller: #@ values.akoOperator.config.avi_controller
+    adminCredentialRef:
+        name: #@ values.akoOperator.config.avi_admin_credential_name
+        namespace: #@ values.akoOperator.namespace
+    certificateAuthorityRef:
+        name: #@ values.akoOperator.config.avi_ca_name
+        namespace: #@ values.akoOperator.namespace
+    dataNetwork:
+        name: #@ values.akoOperator.config.avi_data_network
+        cidr: #@ values.akoOperator.config.avi_data_network_cidr
+    controlPlaneNetwork:
+        name: #@ values.akoOperator.config.avi_control_plane_network
+        cidr: #@ values.akoOperator.config.avi_control_plane_network_cidr
+    extraConfigs:
+        disableStaticRouteSync: #@ values.akoOperator.config.avi_disable_static_route_sync
+        ingress:
+            disableIngressClass: #@ values.akoOperator.config.avi_disable_ingress_class
+            defaultIngressController: #@ values.akoOperator.config.avi_ingress_default_ingress_controller
+#@ if values.akoOperator.config.avi_ingress_shard_vs_size != "":
+            #@overlay/match missing_ok=True
+            shardVSSize: #@ values.akoOperator.config.avi_ingress_shard_vs_size
+#@ end
+#@ if values.akoOperator.config.avi_ingress_node_network_list != '""':
+            #@overlay/match missing_ok=True
+            nodeNetworkList: #@ json.decode(values.akoOperator.config.avi_ingress_node_network_list)
+#@ end
+#@ if values.akoOperator.config.avi_nsxt_t1_lr:
+        #@overlay/match missing_ok=True
+        networksConfig:
+            nsxtT1LR: #@ values.akoOperator.config.avi_nsxt_t1_lr
+#@ end
diff --git a/packages/ako-operator-v2/bundle/config/upstream/akooperator/akodeploymentconfig.yaml b/packages/ako-operator-v2/bundle/config/upstream/akooperator/akodeploymentconfig.yaml
index d42d6d7e70..63de3fdc92 100644
--- a/packages/ako-operator-v2/bundle/config/upstream/akooperator/akodeploymentconfig.yaml
+++ b/packages/ako-operator-v2/bundle/config/upstream/akooperator/akodeploymentconfig.yaml
@@ -20,6 +20,7 @@ spec:
         name: ""
         cidr: ""
     extraConfigs:
+        cniPlugin: antrea
         disableStaticRouteSync: false
         ingress:
             disableIngressClass: true
@@ -50,7 +51,37 @@ spec:
         name: ""
         cidr: ""
     extraConfigs:
+        cniPlugin: antrea
         disableStaticRouteSync: false
         ingress:
             disableIngressClass: true
             defaultIngressController: false
+
+---
+apiVersion: networking.tkg.tanzu.vmware.com/v1alpha1
+kind: AKODeploymentConfig
+metadata:
+    name: install-ako-for-node-port-local
+spec:
+    cloudName: ""
+    serviceEngineGroup: ""
+    controller: ""
+    adminCredentialRef:
+        name: controller-credentials
+        namespace: default
+    certificateAuthorityRef:
+        name: controller-ca
+        namespace: default
+    dataNetwork:
+        name: ""
+        cidr: ""
+    controlPlaneNetwork:
+        name: ""
+        cidr: ""
+    extraConfigs:
+        cniPlugin: antrea
+        disableStaticRouteSync: false
+        ingress:
+            disableIngressClass: true
+            serviceType: NodePortLocal
+            defaultIngressController: false