diff --git a/ponsimv2/Chart.yaml b/ponsimv2/Chart.yaml
index 567aac7..5255c98 100644
--- a/ponsimv2/Chart.yaml
+++ b/ponsimv2/Chart.yaml
@@ -17,7 +17,7 @@
 description: PON Simulator
 icon: https://guide.opencord.org/logos/cord.svg
 
-version: 1.1.1
+version: 1.2.0
 
 # VOLTHA version
-appVersion: 1.6.0
+appVersion: 1.7.0
diff --git a/ponsimv2/templates/olt.yaml b/ponsimv2/templates/olt.yaml
index 3f03ed5..fc0a50d 100644
--- a/ponsimv2/templates/olt.yaml
+++ b/ponsimv2/templates/olt.yaml
@@ -28,7 +28,7 @@
       port: 50060
       targetPort: 50060
   selector:
-    app: olt{{ $i }}
+    olt: olt{{ $i }}
 ---
 apiVersion: apps/v1beta1
 kind: Deployment
@@ -40,10 +40,23 @@
    template:
      metadata:
        labels:
-         app: olt{{ $i }}
+         app: ponsim
+         olt: olt{{ $i }}
        annotations:
          cni: "calico,nni{{ $i }}"
      spec:
+       affinity:
+        podAffinity:
+          preferredDuringSchedulingIgnoredDuringExecution:
+          - weight: 100
+            podAffinityTerm:
+              labelSelector:
+                matchExpressions:
+                - key: app
+                  operator: In
+                  values:
+                  - mininet
+              topologyKey: kubernetes.io/hostname
        containers:
          - name: olt{{ $i }}
            image: "{{ $.Values.global.registry }}{{ $.Values.images.olt.repository }}:{{ tpl $.Values.images.olt.tag $ }}"
diff --git a/ponsimv2/templates/onu.yaml b/ponsimv2/templates/onu.yaml
index f297546..5bb865f 100644
--- a/ponsimv2/templates/onu.yaml
+++ b/ponsimv2/templates/onu.yaml
@@ -17,21 +17,6 @@
 {{- range $i, $junk := until (.Values.numOlts|int) }}
 {{- range $j, $junk1 := until ($onucount) }}
 ---
-apiVersion: v1
-kind: Service
-metadata:
-   name: onu{{ $i }}-{{ $j }}
-   namespace: {{ $.Values.global.namespace }}
-   labels:
-     name: onu{{ $i }}-{{ $j }}
-spec:
-  ports:
-    - name: grpc
-      port: 50061
-      targetPort: 50061
-  selector:
-    app: onu{{ $i }}-{{ $j }}
----
 apiVersion: apps/v1beta1
 kind: Deployment
 metadata:
@@ -42,7 +27,8 @@
    template:
      metadata:
        labels:
-         app: onu{{ $i }}-{{ $j }}
+         app: ponsim
+         onu: onu{{ $i }}-{{ $j }}
        annotations:
          cni: "calico,pon{{ $i }}.{{ $j }}"
      spec:
@@ -53,7 +39,7 @@
             podAffinityTerm:
               labelSelector:
                 matchExpressions:
-                - key: app
+                - key: rg
                   operator: In
                   values:
                   - rg{{ $i }}-{{ $j }}
diff --git a/ponsimv2/templates/rg.yaml b/ponsimv2/templates/rg.yaml
index 44eb1e6..732014a 100644
--- a/ponsimv2/templates/rg.yaml
+++ b/ponsimv2/templates/rg.yaml
@@ -27,7 +27,8 @@
    template:
      metadata:
        labels:
-         app: rg{{ $i }}-{{ $j }}
+         app: ponsim
+         rg: rg{{ $i }}-{{ $j }}
        annotations:
          cni: "pon{{ $i }}.{{ $j }}"
      spec:
@@ -38,7 +39,7 @@
             podAffinityTerm:
               labelSelector:
                 matchExpressions:
-                - key: app
+                - key: onu
                   operator: In
                   values:
                   - onu{{ $i }}-{{ $j }}