diff --git a/kubernetes/aaf/components/aaf-cm/values.yaml b/kubernetes/aaf/components/aaf-cm/values.yaml
index 964b5c1..a8159dc 100644
--- a/kubernetes/aaf/components/aaf-cm/values.yaml
+++ b/kubernetes/aaf/components/aaf-cm/values.yaml
@@ -69,7 +69,7 @@
 ingress:
   enabled: false
   service:
-    - baseaddr: "aafcm"
+    - baseaddr: "aaf-cm-api"
       name: "aaf-cm"
       port: 8150
   config:
diff --git a/kubernetes/aaf/components/aaf-fs/values.yaml b/kubernetes/aaf/components/aaf-fs/values.yaml
index e911a10..a0e9fe9 100644
--- a/kubernetes/aaf/components/aaf-fs/values.yaml
+++ b/kubernetes/aaf/components/aaf-fs/values.yaml
@@ -70,7 +70,7 @@
 ingress:
   enabled: false
   service:
-    - baseaddr: "aaffs"
+    - baseaddr: "aaf-fs-api"
       name: "aaf-fs"
       port: 8096
   config:
diff --git a/kubernetes/aaf/components/aaf-gui/values.yaml b/kubernetes/aaf/components/aaf-gui/values.yaml
index e239e61..fd416b6 100644
--- a/kubernetes/aaf/components/aaf-gui/values.yaml
+++ b/kubernetes/aaf/components/aaf-gui/values.yaml
@@ -70,7 +70,7 @@
 ingress:
   enabled: false
   service:
-    - baseaddr: "aafgui"
+    - baseaddr: "aaf-ui"
       name: "aaf-gui"
       port: 8200
   config:
diff --git a/kubernetes/aaf/components/aaf-locate/values.yaml b/kubernetes/aaf/components/aaf-locate/values.yaml
index 0a3e4d4..86a9321 100644
--- a/kubernetes/aaf/components/aaf-locate/values.yaml
+++ b/kubernetes/aaf/components/aaf-locate/values.yaml
@@ -67,7 +67,7 @@
 ingress:
   enabled: false
   service:
-    - baseaddr: "aaflocate"
+    - baseaddr: "aaf-locate-api"
       name: "aaf-locate"
       port: 8095
   config:
diff --git a/kubernetes/aaf/components/aaf-oauth/values.yaml b/kubernetes/aaf/components/aaf-oauth/values.yaml
index 2e9b6d4..a103fb2 100644
--- a/kubernetes/aaf/components/aaf-oauth/values.yaml
+++ b/kubernetes/aaf/components/aaf-oauth/values.yaml
@@ -70,7 +70,7 @@
 ingress:
   enabled: false
   service:
-    - baseaddr: "aafoauth"
+    - baseaddr: "aaf-oauth-api"
       name: "aaf-oauth"
       port: 8140
   config:
diff --git a/kubernetes/aaf/components/aaf-service/values.yaml b/kubernetes/aaf/components/aaf-service/values.yaml
index 8d8da0d..a6f3c5d 100644
--- a/kubernetes/aaf/components/aaf-service/values.yaml
+++ b/kubernetes/aaf/components/aaf-service/values.yaml
@@ -69,7 +69,7 @@
 ingress:
   enabled: false
   service:
-    - baseaddr: "aafservice"
+    - baseaddr: "aaf-service-api"
       name: "aaf-service"
       port: 8100
   config: