diff --git a/apps/google-phylo/Chart.yaml b/apps/google-phylo/Chart.yaml
index 5c50ffb..bd7d067 100644
--- a/apps/google-phylo/Chart.yaml
+++ b/apps/google-phylo/Chart.yaml
@@ -7,4 +7,4 @@
 description: Google Video Analytics Application for Aether
 name: google-phylo
 
-version: 0.1.1
+version: 0.2.0
diff --git a/apps/google-phylo/templates/deployment-phylo.yaml b/apps/google-phylo/templates/deployment-phylo.yaml
index 8e31eb3..0158711 100644
--- a/apps/google-phylo/templates/deployment-phylo.yaml
+++ b/apps/google-phylo/templates/deployment-phylo.yaml
@@ -1,9 +1,7 @@
 {{- /*
-
 # Copyright 2020-present Open Networking Foundation
 #
 # SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
-
 */ -}}
 
 {{ tuple "phylo" . | include "phylo.service_account" }}
@@ -26,11 +24,23 @@
     metadata:
       labels:
 {{ tuple $name $context | include "phylo.metadata_labels" | indent 8 }}
+    {{- if $context.Values.config.userPlane.enabled }}
+      annotations:
+        danm.k8s.io/interfaces: |
+          [
+            {"clusterNetwork": "default"},
+            {"clusterNetwork": {{ $context.Values.config.userPlane.name | quote }}, "ip": "dynamic"}
+          ]
+    {{- end }}
     spec:
     {{- if $context.Values.nodeSelectors.enabled }}
       nodeSelector:
         {{ $context.Values.nodeSelectors.phylo.label }}: {{ $context.Values.nodeSelectors.phylo.value }}
     {{- end }}
+    {{- if $context.Values.images.credentials }}
+      imagePullSecrets:
+        - name: {{ $context.Release.Name }}.registry
+    {{- end }}
       serviceAccountName: phylo
       initContainers:
       - name: phylo-dep-check
diff --git a/apps/google-phylo/templates/deployment-wowza-server.yaml b/apps/google-phylo/templates/deployment-wowza-server.yaml
index d9f7798..0ba1bd5 100644
--- a/apps/google-phylo/templates/deployment-wowza-server.yaml
+++ b/apps/google-phylo/templates/deployment-wowza-server.yaml
@@ -1,9 +1,7 @@
 {{- /*
-
 # Copyright 2020-present Open Networking Foundation
 #
 # SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
-
 */ -}}
 
 ---
@@ -22,11 +20,23 @@
     metadata:
       labels:
 {{ tuple "wowza" . | include "phylo.metadata_labels" | indent 8 }}
+    {{- if .Values.config.userPlane.enabled }}
+      annotations:
+        danm.k8s.io/interfaces: |
+          [
+            {"clusterNetwork": "default"},
+            {"clusterNetwork": {{ .Values.config.userPlane.name | quote }}, "ip": "dynamic"}
+          ]
+    {{- end }}
     spec:
     {{- if .Values.nodeSelectors.enabled }}
       nodeSelector:
         {{ .Values.nodeSelectors.wowza.label }}: {{ .Values.nodeSelectors.wowza.value }}
     {{- end }}
+    {{- if .Values.images.credentials }}
+      imagePullSecrets:
+        - name: {{ .Release.Name }}.registry
+    {{- end }}
       containers:
       - name: wowza
         image: {{ .Values.images.tags.wowza }}
diff --git a/apps/google-phylo/templates/secret-registry.yaml b/apps/google-phylo/templates/secret-registry.yaml
new file mode 100644
index 0000000..1502049
--- /dev/null
+++ b/apps/google-phylo/templates/secret-registry.yaml
@@ -0,0 +1,18 @@
+{{/*
+# Copyright 2020-present Open Networking Foundation
+
+# SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
+*/}}
+
+{{- if .Values.images.credentials }}
+---
+kind: Secret
+apiVersion: v1
+metadata:
+  name: {{ .Release.Name }}.registry
+  labels:
+    release: {{ .Release.Name }}
+type: kubernetes.io/dockerconfigjson
+data:
+  .dockerconfigjson: {{ printf `{"auths":{%s:{"auth":"%s"}}}` (.Values.images.credentials.registry | quote) (printf "%s:%s" .Values.images.credentials.username .Values.images.credentials.password | b64enc) | b64enc | quote }}
+{{- end }}
diff --git a/apps/google-phylo/templates/service-phylo-rabbitmq.yaml b/apps/google-phylo/templates/service-phylo-rabbitmq.yaml
index cdd7b0a..d788b74 100644
--- a/apps/google-phylo/templates/service-phylo-rabbitmq.yaml
+++ b/apps/google-phylo/templates/service-phylo-rabbitmq.yaml
@@ -11,7 +11,7 @@
 apiVersion: v1
 kind: Service
 metadata:
-  name: rabbitmq-{{ .key }}-external
+  name: rabbitmq-{{ .key }}
   labels:
 {{ tuple $name $context | include "phylo.metadata_labels" | indent 4 }}
 spec:
diff --git a/apps/google-phylo/templates/service-phylo-rtsp-server.yaml b/apps/google-phylo/templates/service-phylo-rtsp-server.yaml
index fd79bd1..22a0a81 100644
--- a/apps/google-phylo/templates/service-phylo-rtsp-server.yaml
+++ b/apps/google-phylo/templates/service-phylo-rtsp-server.yaml
@@ -11,16 +11,25 @@
 apiVersion: v1
 kind: Service
 metadata:
-  name: rtsp-server-{{ .key }}-external
+  name: rtsp-server-{{ .key }}
   labels:
 {{ tuple $name $context | include "phylo.metadata_labels" | indent 4 }}
+{{- if $context.Values.config.userPlane.enabled }}
+  annotations:
+    danm.k8s.io/clusterNetwork: {{ $context.Values.config.userPlane.name }}
+    danm.k8s.io/selector: '{"app": {{ $name | quote }}}'
+{{- end }}
 spec:
+{{- if $context.Values.config.userPlane.enabled }}
+  clusterIP: None
+{{- else }}
   selector:
 {{ tuple $name $context | include "phylo.metadata_labels" | indent 4 }}
+  type: NodePort
   ports:
     - port: 8554
       targetPort: 8554
       protocol: TCP
       name: tcp-8554
-  type: NodePort
+{{- end }}
 {{ end }}
diff --git a/apps/google-phylo/templates/service-wowza.yaml b/apps/google-phylo/templates/service-wowza.yaml
index 663ccde..09993bd 100644
--- a/apps/google-phylo/templates/service-wowza.yaml
+++ b/apps/google-phylo/templates/service-wowza.yaml
@@ -1,9 +1,7 @@
 {{- /*
-
 # Copyright 2020-present Open Networking Foundation
 #
 # SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
-
 */ -}}
 
 ---
@@ -13,46 +11,15 @@
   name: wowza
   labels:
 {{ tuple "wowza" . | include "phylo.metadata_labels" | indent 4 }}
+{{- if .Values.config.userPlane.enabled }}
+  annotations:
+    danm.k8s.io/clusterNetwork: {{ .Values.config.userPlane.name }}
+    danm.k8s.io/selector: '{"app": "wowza"}'
+{{- end }}
 spec:
-  selector:
-{{ tuple "wowza" . | include "phylo.metadata_labels" | indent 4 }}
-  ports:
-    - port: 554 #
-      targetPort: 554
-      protocol: TCP
-      name: tcp-554
-    - port: 1935 # RTMP/RTMPT/RTMPE/RTSP(interleaved)
-      targetPort: 1935
-      protocol: TCP
-      name: tcp-1935
-    - port: 8084 #
-      targetPort: 8084
-      protocol: TCP
-      name: tcp-8084
-    - port: 8085 #
-      targetPort: 8085
-      protocol: TCP
-      name: tcp-8085
-    - port: 8086 #
-      targetPort: 8086
-      protocol: TCP
-      name: tcp-8086
-    - port: 8087 #
-      targetPort: 8087
-      protocol: TCP
-      name: tcp-8087
-    - port: 8088 #
-      targetPort: 8088
-      protocol: TCP
-      name: tcp-8088
----
-apiVersion: v1
-kind: Service
-metadata:
-  name: wowza-external
-  labels:
-{{ tuple "wowza" . | include "phylo.metadata_labels" | indent 4 }}
-spec:
+{{- if .Values.config.userPlane.enabled }}
+  clusterIP: None
+{{- else }}
   selector:
 {{ tuple "wowza" . | include "phylo.metadata_labels" | indent 4 }}
   type: NodePort
@@ -66,3 +33,4 @@
       targetPort: 1935
       protocol: TCP
       nodePort: 31935
+{{- end }}
diff --git a/apps/google-phylo/values.yaml b/apps/google-phylo/values.yaml
index 18cd206..f05db5b 100644
--- a/apps/google-phylo/values.yaml
+++ b/apps/google-phylo/values.yaml
@@ -4,18 +4,22 @@
 
 images:
   tags:
-    cameraIngestion: registry.central.aetherproject.net/google/phylo-camera-ingestion-client:latest
-    videoAnalyticsServer: registry.central.aetherproject.net/google/phylo-video-analytics-server:latest
-    phyloRabbitmq: registry.central.aetherproject.net/google/phylo-rabbitmq:latest
-    phyloRabbitmqPubsub: registry.central.aetherproject.net/google/phylo-rmq-pubsub:latest
-    rtspServer: registry.central.aetherproject.net/google/phylo_rmq-rtsp-server:0.2.0
-    rmqRestream: registry.central.aetherproject.net/google/phylo-rmq-restream:latest
-    wowza: registry.central.aetherproject.net/google/wowza:latest
-    depCheck: registry.central.aetherproject.net/kubernetes-entrypoint:v0.3.1
+    cameraIngestion: registry.aetherproject.org/google/phylo-camera-ingestion-client:latest
+    videoAnalyticsServer: registry.aetherproject.org/google/phylo-video-analytics-server:latest
+    phyloRabbitmq: registry.aetherproject.org/google/phylo-rabbitmq:latest
+    phyloRabbitmqPubsub: registry.aetherproject.org/google/phylo-rmq-pubsub:latest
+    rtspServer: registry.aetherproject.org/google/phylo_rmq-rtsp-server:0.2.0
+    wowza: registry.aetherproject.org/google/wowza:latest
+    depCheck: quay.io/stackanetes/kubernetes-entrypoint:v0.3.1
   pullPolicy: "Always"
+  credentials: {}
+  # If specified, use this credential to access the image
+  #  registry: registry.aetherproject.org
+  #  username:
+  #  password:
 
 nodeSelectors:
-  enabled: true
+  enabled: false
   phylo:
     label: google-phylo
     value: enabled
@@ -72,6 +76,11 @@
   phylo:
     sources:
       - key: mystream
-        uri: rtmp://10.93.1.30:31935/live/myStream
+        uri: rtmp://wowza:1935/live/myStream
   wowza:
+    # wowza login: mwc / stream
     replica: 1
+  userPlane:
+    # Set true if a separate user plane network is applicable
+    enabled: true
+    name: core