diff --git a/5g-control-plane/Chart.yaml b/5g-control-plane/Chart.yaml
index f9fb5a0..d80905a 100644
--- a/5g-control-plane/Chart.yaml
+++ b/5g-control-plane/Chart.yaml
@@ -10,7 +10,7 @@
 name: 5g-control-plane
 icon: https://guide.opencord.org/logos/cord.svg
 
-version: 0.8.3
+version: 0.8.4
 
 dependencies:
   - name: mongodb
diff --git a/5g-control-plane/templates/deployment-smf.yaml b/5g-control-plane/templates/deployment-smf.yaml
index d60c7f7..28e6ee1 100644
--- a/5g-control-plane/templates/deployment-smf.yaml
+++ b/5g-control-plane/templates/deployment-smf.yaml
@@ -63,6 +63,8 @@
           value: {{ .Values.config.grpc.trace | quote }}
         - name: GRPC_VERBOSITY
           value: {{ .Values.config.grpc.verbosity | quote }}
+        - name: PFCP_PORT_UPF
+          value: {{ .Values.config.smf.upfPort | quote }}
         - name: POD_IP
           valueFrom:
             fieldRef:
diff --git a/5g-control-plane/templates/service-amf.yaml b/5g-control-plane/templates/service-amf.yaml
index 068d706..eafadf5 100644
--- a/5g-control-plane/templates/service-amf.yaml
+++ b/5g-control-plane/templates/service-amf.yaml
@@ -12,8 +12,10 @@
   name: amf
   labels:
 {{ tuple "amf" . | include "5g-control-plane.metadata_labels" | indent 4 }}
+{{- with .Values.config.amf.serviceAnnotations }}
   annotations:
-    external-dns.beta.kubernetes.io/hostname: {{ .Values.config.amf.serviceAnnotations.amfFqdn }}
+    {{- toYaml . | nindent 4 }}
+{{- end }}
 spec:
   type: {{ .Values.config.amf.serviceType }}
 {{- if .Values.config.amf.ngapp.externalIp }}
diff --git a/5g-control-plane/values.yaml b/5g-control-plane/values.yaml
index dc196fd..cfcce4f 100644
--- a/5g-control-plane/values.yaml
+++ b/5g-control-plane/values.yaml
@@ -418,8 +418,8 @@
             - "0.0.0.0"
   amf:
     deploy: true
-    serviceAnnotations:
-      amfFqdn: "aether-amf.tenant-site.company.com"
+    # serviceAnnotations:
+    #   external-dns.alpha.kubernetes.io/hostname: "aether-amf.tenant-site.company.com"
     podAnnotations:
       field.cattle.io/workloadMetrics: '[{"path":"/metrics","port":9089,"schema":"HTTP"}]'
     serviceType: ClusterIP
@@ -558,6 +558,7 @@
     podAnnotations:
       field.cattle.io/workloadMetrics: '[{"path":"/metrics","port":9089,"schema":"HTTP"}]'
     serviceType: ClusterIP
+    upfPort: 8805
     n4:
       port: 8805
       # Provide nodePort when serviceType is NodePort
diff --git a/5g-ran-sim/Chart.yaml b/5g-ran-sim/Chart.yaml
index d9e7f76..c29348f 100644
--- a/5g-ran-sim/Chart.yaml
+++ b/5g-ran-sim/Chart.yaml
@@ -8,4 +8,4 @@
 name: 5g-ran-sim
 icon: https://guide.opencord.org/logos/cord.svg
 
-version: 0.6.1
+version: 0.6.2
diff --git a/5g-ran-sim/templates/statefulset-gnbsim.yaml b/5g-ran-sim/templates/statefulset-gnbsim.yaml
index cae9c64..b6c4e6e 100644
--- a/5g-ran-sim/templates/statefulset-gnbsim.yaml
+++ b/5g-ran-sim/templates/statefulset-gnbsim.yaml
@@ -32,7 +32,7 @@
 {{- if semverCompare ">=1.16-0" .Capabilities.KubeVersion.GitVersion }}
                "ips": [ {{ include "gnbiplist" .}} ]
 {{- else }}
-               "ips": {{ .Values.config.gnbsim.gnb.ip | quote }}
+               "ips": {{ .Values.config.gnbsim.gnb.ips | quote }}
 {{- end }}
            }
          ]'
@@ -48,10 +48,12 @@
 {{ toYaml .Values.images.pullSecrets | indent 8 }}
     {{- end }}
       initContainers:
+    {{- if .Values.config.gnbsim.nonStandalone }}
       - name: wait-amf-module
         image: {{ .Values.images.repository }}{{ .Values.images.tags.init }}
         imagePullPolicy: {{ .Values.images.pullPolicy }}
-        command: ['sh', '-c', 'until nslookup amf; do echo waiting for nrf; sleep 4; done;']
+        command: ['sh', '-c', 'until nslookup amf; do echo waiting for amf; sleep 4; done;']
+    {{- end }}
     {{- if .Values.config.coreDump.enabled }}
     {{ tuple "gnbsim" . | include "5g-ransim-plane.coredump_init" | indent 6 }}
     {{- end }}
@@ -76,9 +78,15 @@
           valueFrom:
             fieldRef:
               fieldPath: status.podIP
-      {{- if .Values.resources.enabled }}
+      {{- if or .Values.resources.enabled .Values.config.gnbsim.sriov.enabled }}
         resources:
 {{ toYaml .Values.resources.gnbsim | indent 10 }}
+{{- if .Values.config.gnbsim.sriov.enabled }}
+          requests:
+            {{ .Values.config.gnbsim.sriov.resourceName }}: 1
+          limits:
+            {{ .Values.config.gnbsim.sriov.resourceName }}: 1
+      {{- end }}
       {{- end }}
         volumeMounts:
         - name: cp-script
diff --git a/5g-ran-sim/values.yaml b/5g-ran-sim/values.yaml
index 874f5ff..afd4534 100644
--- a/5g-ran-sim/values.yaml
+++ b/5g-ran-sim/values.yaml
@@ -33,6 +33,7 @@
     path: /tmp/coredump
   gnbsim:
     deploy: true
+    nonStandalone: true
     serviceType: ClusterIP
     networkTopo:
       - upfAddr: "192.168.252.3/32"
diff --git a/router/Chart.yaml b/router/Chart.yaml
index 1fece39..cf9f0b8 100644
--- a/router/Chart.yaml
+++ b/router/Chart.yaml
@@ -8,4 +8,4 @@
 name: router
 icon: https://guide.opencord.org/logos/cord.svg
 
-version: 0.1.0
+version: 0.1.1
diff --git a/router/templates/router-deployment.yaml b/router/templates/router-deployment.yaml
index 0b279f5..464a02e 100644
--- a/router/templates/router-deployment.yaml
+++ b/router/templates/router-deployment.yaml
@@ -42,6 +42,8 @@
             trap : TERM INT; sleep infinity & wait
         image: {{ .Values.images.tags.router }}
         securityContext:
+          privileged: true
+          runAsUser: 0
           capabilities:
             add:
               - NET_ADMIN
diff --git a/router/values.yaml b/router/values.yaml
index ab4f793..f0ee651 100644
--- a/router/values.yaml
+++ b/router/values.yaml
@@ -5,7 +5,7 @@
 images:
   repository: "" #default docker hub
   tags:
-    router: docker.io/ubuntu:latest
+    router: wbitt/network-multitool:minimal
   pullPolicy: IfNotPresent
 
 resources: