diff --git a/deploy/kubernetes/charts/carts/templates/configmap.yml b/deploy/kubernetes/charts/carts/templates/configmap.yaml
similarity index 86%
rename from deploy/kubernetes/charts/carts/templates/configmap.yml
rename to deploy/kubernetes/charts/carts/templates/configmap.yaml
index 1cdd4bf0f..b06fee105 100644
--- a/deploy/kubernetes/charts/carts/templates/configmap.yml
+++ b/deploy/kubernetes/charts/carts/templates/configmap.yaml
@@ -12,7 +12,7 @@ data:
   CARTS_DYNAMODB_CREATETABLE: "true"
   AWS_ACCESS_KEY_ID: key
   AWS_SECRET_ACCESS_KEY: secret
-  CARTS_DYNAMODB_ENDPOINT: http://carts-dynamodb:8000
+  CARTS_DYNAMODB_ENDPOINT: http://{{ include "carts.dynamodb.fullname" . }}:8000
   {{- end }}
   {{- end }}
 {{- end }}
diff --git a/deploy/kubernetes/charts/checkout/templates/configmap.yml b/deploy/kubernetes/charts/checkout/templates/configmap.yaml
similarity index 79%
rename from deploy/kubernetes/charts/checkout/templates/configmap.yml
rename to deploy/kubernetes/charts/checkout/templates/configmap.yaml
index 1c1c651fa..b19e0bd7c 100644
--- a/deploy/kubernetes/charts/checkout/templates/configmap.yml
+++ b/deploy/kubernetes/charts/checkout/templates/configmap.yaml
@@ -5,7 +5,7 @@ metadata:
   name: {{ include "checkout.configMapName" . }}
 data:
   {{- if .Values.redis.create }}
-  REDIS_URL: redis://checkout-redis:6379
+  REDIS_URL: redis://{{ include "checkout.redis.fullname" . }}:{{ .Values.redis.service.port }}
   {{- else }}
   REDIS_URL: redis://{{ .Values.redis.address }}:{{ .Values.redis.port }}
   {{- end }}