diff --git a/charts/chris/templates/_helpers.tpl b/charts/chris/templates/_helpers.tpl
index a3e1bd4..ed46b36 100644
--- a/charts/chris/templates/_helpers.tpl
+++ b/charts/chris/templates/_helpers.tpl
@@ -75,10 +75,12 @@ pfdcm stuff
 */}}
 
 {{- define "chris.pfdcmInternalAddress" -}}
-{{- if (not (and .Values.pfdcm.enabled .Values.pfdcm.service.enabled)) -}}
+{{- if (not (and .Values.pfdcm.enabled)) -}}
 http://localhost
+{{- else if (eq .Values.pfdcm.kind "Deployment") -}}
+http://{{ include "pfdcm.fullname" . }}:{{ .Values.pfdcm.service.port }}
 {{- else -}}
-http://{{ .Values.pfdcm.service }}-pfdcm:{{ .Values.pfdcm.service.port }}
+http://{{ include "pfdcm.fullname" . }}.{{ .Release.Namespace }}.svc
 {{- end -}}
 {{- end -}}
 
diff --git a/charts/chris/templates/pfdcm/_helpers.tpl b/charts/chris/templates/pfdcm/_helpers.tpl
index 34ca12f..9f4ca34 100644
--- a/charts/chris/templates/pfdcm/_helpers.tpl
+++ b/charts/chris/templates/pfdcm/_helpers.tpl
@@ -1,14 +1,14 @@
 {{- define "pfdcm.name" -}}
-{{- default .Values.pfdcm.nameOverride "pfdcm-chris" | trunc 63 | trimSuffix "-" -}}
+{{- default .Values.pfdcm.nameOverride "chris-pfdcm" | trunc 63 | trimSuffix "-" -}}
 {{- end -}}
 
 {{- define "pfdcm.fullname" -}}
-{{- (dict
+{{- mustMerge (dict
   "Values" (dict
     "nameOverride" (include "pfdcm.name" .)
     "fullnameOverride" .Values.pfdcm.fullnameOverride
   )
-) | mustMerge (omit . "Values") | include "util.fullname" -}}
+) (omit . "Values") | include "util.fullname" -}}
 {{- end -}}
 
 {{- define "pfdcm.volumes" -}}
diff --git a/charts/chris/tests/pfdcm_address_test.yaml b/charts/chris/tests/pfdcm_address_test.yaml
new file mode 100644
index 0000000..e4e7415
--- /dev/null
+++ b/charts/chris/tests/pfdcm_address_test.yaml
@@ -0,0 +1,77 @@
+suite: pfdcm address
+release:
+  name: tpaddy
+  namespace: ns
+templates:
+  - cube-config.yml
+tests:
+  - it: should be a dummy value (http://localhost) if pfdcm is not enabled
+    set:
+      pfdcm.enabled: false
+    documentSelector:
+      path: kind
+      value: ConfigMap
+    asserts:
+      - equal:
+          path: data.PFDCM_ADDRESS
+          value: http://localhost
+  - it: should be pfdcm's service
+    set:
+      pfdcm.enabled: true
+    documentSelector:
+      path: kind
+      value: ConfigMap
+    asserts:
+      - equal:
+          path: data.PFDCM_ADDRESS
+          value: http://tpaddy-chris-pfdcm:4005
+  - it: should be pfdcm's knative qualified domain name
+    set:
+      pfdcm.enabled: true
+      pfdcm.kind: Service
+    documentSelector:
+      path: kind
+      value: ConfigMap
+    asserts:
+      - equal:
+          path: data.PFDCM_ADDRESS
+          value: http://tpaddy-chris-pfdcm.ns.svc
+  - it: should be able to set a custom value using cube.config
+    set:
+      pfdcm.enabled: true
+      cube.config.PFDCM_ADDRESS: http://manual.value
+    documentSelector:
+      path: kind
+      value: ConfigMap
+    asserts:
+      - equal:
+          path: data.PFDCM_ADDRESS
+          value: http://manual.value
+  - it: should be able to set a value when pfdcm not enabled
+    set:
+      pfdcm.enabled: false
+      cube.config.PFDCM_ADDRESS: http://manual.value
+    documentSelector:
+      path: kind
+      value: ConfigMap
+    asserts:
+      - equal:
+          path: data.PFDCM_ADDRESS
+          value: http://manual.value
+  - it: should be able to set a custom value using cube.secrets
+    set:
+      pfdcm.enabled: true
+      cube.secrets.PFDCM_ADDRESS: http://manual.value
+    asserts:
+      - notExists:
+          path: data.PFDCM_ADDRESS
+        documentSelector:
+          path: kind
+          value: ConfigMap
+      - equal:
+          path: data.PFDCM_ADDRESS
+          value: http://manual.value
+          decodeBase64: true
+        documentSelector:
+          path: kind
+          value: Secret