diff --git a/ponnet/Chart.yaml b/ponnet/Chart.yaml
index 607525f..959032f 100644
--- a/ponnet/Chart.yaml
+++ b/ponnet/Chart.yaml
@@ -14,4 +14,4 @@
 # limitations under the License.
 
 name: ponnet
-version: 1.1.0
+version: 1.2.0
diff --git a/ponnet/templates/ponnet-cni.yaml b/ponnet/templates/ponnet-cni.yaml
index 0241df6..a3cf4f8 100644
--- a/ponnet/templates/ponnet-cni.yaml
+++ b/ponnet/templates/ponnet-cni.yaml
@@ -90,11 +90,12 @@
   name: ponnet-config
   namespace: kube-system
 data:
-  pon0.conf: |
+{{- range $i, $junk := until (.Values.numOlts|int) }}
+  pon{{ $i }}.conf: |
     {
-      "name": "pon0",
+      "name": "pon{{ $i }}",
       "type": "bridge",
-      "bridge": "pon0",
+      "bridge": "pon{{ $i }}",
       "isGateway": false,
       "ipMask": false,
       "ipam": {
@@ -102,11 +103,11 @@
         "subnet": "10.22.0.0/16"
       }
     }
-  pon1.conf: |
+  nni{{ $i }}.conf: |
     {
-      "name": "pon1",
+      "name": "nni{{ $i }}",
       "type": "bridge",
-      "bridge": "pon1",
+      "bridge": "nni{{ $i }}",
       "isGateway": false,
       "ipMask": false,
       "ipam": {
@@ -114,6 +115,7 @@
         "subnet": "10.23.0.0/16"
       }
     }
+{{- end }}
 
 ---
 # Install Ponnnet CNI conf on each slave node.
diff --git a/ponnet/values.yaml b/ponnet/values.yaml
index 53e9a8a..759bd95 100644
--- a/ponnet/values.yaml
+++ b/ponnet/values.yaml
@@ -23,3 +23,5 @@
 
 global:
   namespace: voltha
+
+numOlts: 1