diff --git a/charts/fission-all/templates/svc.yaml b/charts/fission-all/templates/svc.yaml
index 1f756168..49c92f24 100644
--- a/charts/fission-all/templates/svc.yaml
+++ b/charts/fission-all/templates/svc.yaml
@@ -10,7 +10,9 @@ spec:
   ports:
   - port: 80
     targetPort: 8888
+{{ if eq .Values.serviceType "NodePort" }}
     nodePort: {{ .Values.routerPort }}
+{{ end }}
   selector:
     svc: router
 
@@ -27,7 +29,9 @@ spec:
   ports:
   - port: 80
     targetPort: 8888
+{{ if eq .Values.serviceType "NodePort" }}
     nodePort: {{ .Values.controllerPort }}
+{{ end }}
   selector:
     svc: controller
 
@@ -44,7 +48,9 @@ spec:
   ports:
   - port: 4222
     targetPort: 4222
+{{ if eq .Values.serviceType "NodePort" }}
     nodePort: {{ .Values.natsStreamingPort }}
+{{ end }}
   selector:
     svc: nats-streaming
 
diff --git a/charts/fission-core/templates/svc.yaml b/charts/fission-core/templates/svc.yaml
index 7a63273e..4ca2f0b7 100644
--- a/charts/fission-core/templates/svc.yaml
+++ b/charts/fission-core/templates/svc.yaml
@@ -10,7 +10,9 @@ spec:
   ports:
   - port: 80
     targetPort: 8888
+{{ if eq .Values.serviceType "NodePort" }}
     nodePort: {{ .Values.routerPort }}
+{{ end }}
   selector:
     svc: router
 
@@ -27,7 +29,9 @@ spec:
   ports:
   - port: 80
     targetPort: 8888
+{{ if eq .Values.serviceType "NodePort" }}
     nodePort: {{ .Values.controllerPort }}
+{{ end }}
   selector:
     svc: controller