diff --git a/charts/dist/feast-0.1.0.tgz b/charts/dist/feast-0.1.0.tgz
index 4c308a3b642..2ef9685416d 100644
Binary files a/charts/dist/feast-0.1.0.tgz and b/charts/dist/feast-0.1.0.tgz differ
diff --git a/charts/dist/index.yaml b/charts/dist/index.yaml
index 9b314fd2ce4..a308301a5e6 100755
--- a/charts/dist/index.yaml
+++ b/charts/dist/index.yaml
@@ -3,11 +3,11 @@ entries:
   feast:
   - apiVersion: v1
     appVersion: 0.1.0
-    created: 2019-01-18T23:20:59.770256601+08:00
+    created: 2019-01-23T15:59:57.223680331+08:00
     description: A Helm chart to install Feast on kubernetes
-    digest: deced7dc470115e8b81815e1a719185404380e310bc6951c480f2858dd9a48ac
+    digest: 1b392c4fa1e3b7cff7afb1dc635a248d86c0c05d8b02b6fc4e884c20f6a03ff2
     name: feast
     urls:
     - feast-0.1.0.tgz
     version: 0.1.0
-generated: 2019-01-18T23:20:59.769296687+08:00
+generated: 2019-01-23T15:59:57.222635289+08:00
diff --git a/charts/feast/templates/core-service.yaml b/charts/feast/templates/core-service.yaml
index 9bc1de6bd38..3c1b4b800df 100644
--- a/charts/feast/templates/core-service.yaml
+++ b/charts/feast/templates/core-service.yaml
@@ -12,7 +12,9 @@ metadata:
     cloud.google.com/load-balancer-type: "Internal"
 spec:
   type: LoadBalancer
+  {{- if .Values.core.service.extIPAdr }}
   loadBalancerIP: {{ .Values.core.service.extIPAdr }}
+  {{- end }}
   ports:
   - name: http
     port: {{ .Values.core.service.http.port }}
diff --git a/charts/feast/templates/serving-service.yaml b/charts/feast/templates/serving-service.yaml
index a41adc76e15..dd997560460 100644
--- a/charts/feast/templates/serving-service.yaml
+++ b/charts/feast/templates/serving-service.yaml
@@ -12,6 +12,9 @@ metadata:
     cloud.google.com/load-balancer-type: "Internal"
 spec:
   type: LoadBalancer
+  {{- if .Values.serving.service.extIPAdr }}
+  loadBalancerIP: {{ .Values.serving.service.extIPAdr }}
+  {{- end}}
   ports:
   - name: grpc
     port: {{ .Values.serving.service.grpc.port }}