diff --git a/charts/onechart/templates/deployment.yaml b/charts/onechart/templates/deployment.yaml
index 14cf35d..9daa390 100644
--- a/charts/onechart/templates/deployment.yaml
+++ b/charts/onechart/templates/deployment.yaml
@@ -54,12 +54,16 @@ spec:
             {{- end }}
           {{- end }}
           ports:
-            {{- if not .Values.containerPortYaml }}
+            {{- if not .Values.ports }}
             - name: http
               containerPort: {{ .Values.containerPort }}
               protocol: TCP
             {{ else }}
-              {{- toYaml .Values.containerPortYaml | nindent 12 }}
+            {{- range .Values.ports }}
+            - name: {{ .name }}
+              containerPort: {{ .containerPort }}
+              protocol: TCP
+            {{- end }}
             {{- end }}
           {{- if .Values.probe.enabled }}
           readinessProbe:
diff --git a/charts/onechart/templates/service.yaml b/charts/onechart/templates/service.yaml
index eba90b3..f8da0b3 100644
--- a/charts/onechart/templates/service.yaml
+++ b/charts/onechart/templates/service.yaml
@@ -8,6 +8,7 @@ metadata:
 spec:
   type: {{ if .Values.nodePortEnabled }}NodePort{{ else }}ClusterIP{{ end }}
   ports:
+    {{- if not .Values.ports }}
     - port: {{ if .Values.svcPort }}{{ .Values.svcPort }}{{ else }}{{ .Values.containerPort }}{{ end }}
       targetPort: http
       protocol: TCP
@@ -15,5 +16,16 @@ spec:
       {{- if .Values.nodePort }}
       nodePort: {{ .Values.nodePort }}
       {{- end }}
+    {{ else }}
+    {{- range .Values.ports }}
+    - name: {{ .name }}
+      port: {{ if .svcPort }}{{ .svcPort }}{{ else }}{{ .containerPort }}{{ end }}
+      {{- if .nodePort }}
+      nodePort: {{ .nodePort }}
+      {{- end }}
+      targetPort: {{ .name }}
+      protocol: TCP
+    {{- end }}
+    {{- end }}
   selector:
     {{- include "helm-chart.selectorLabels" . | nindent 4 }}
diff --git a/charts/onechart/tests/deployment_contianer_port_yaml_test.yaml b/charts/onechart/tests/deployment_ports_test.yaml
similarity index 53%
rename from charts/onechart/tests/deployment_contianer_port_yaml_test.yaml
rename to charts/onechart/tests/deployment_ports_test.yaml
index eee4f22..ea9d28b 100644
--- a/charts/onechart/tests/deployment_contianer_port_yaml_test.yaml
+++ b/charts/onechart/tests/deployment_ports_test.yaml
@@ -5,35 +5,26 @@ templates:
 tests:
   - it: Should set custom ports
     set:
-      containerPortYaml:
-        - port: 21
-          targetPort: ftp
-          protocol: TCP
+      ports:
+        - containerPort: 21
           name: ftp
-        - port: 3001
-          targetPort: passive-1
-          protocol: TCP
+        - containerPort: 3001
           name: passive-1
-        - port: 3002
-          targetPort: passive-2
-          protocol: TCP
+        - containerPort: 3002
           name: passive-2
     asserts:
       - equal:
           path: spec.template.spec.containers[0].ports
           value:
-            - port: 21
-              targetPort: ftp
+            - name: ftp
+              containerPort: 21
               protocol: TCP
-              name: ftp
-            - port: 3001
-              targetPort: passive-1
+            - name: passive-1
+              containerPort: 3001
               protocol: TCP
-              name: passive-1
-            - port: 3002
-              targetPort: passive-2
+            - name: passive-2
+              containerPort: 3002
               protocol: TCP
-              name: passive-2
   - it: Should set default port
     asserts:
       - equal:
diff --git a/charts/onechart/tests/service_ports_test.yaml b/charts/onechart/tests/service_ports_test.yaml
new file mode 100644
index 0000000..1fca29a
--- /dev/null
+++ b/charts/onechart/tests/service_ports_test.yaml
@@ -0,0 +1,66 @@
+suite: test deployment
+templates:
+  - service.yaml
+tests:
+  - it: Should set custom ports
+    set:
+      ports:
+        - containerPort: 21
+          name: ftp
+        - containerPort: 3001
+          name: passive-1
+        - containerPort: 3002
+          name: passive-2
+    asserts:
+      - equal:
+          path: spec.ports
+          value:
+            - name: ftp
+              port: 21
+              targetPort: ftp
+              protocol: TCP
+            - name: passive-1
+              port: 3001
+              targetPort: passive-1
+              protocol: TCP
+            - name: passive-2
+              port: 3002
+              targetPort: passive-2
+              protocol: TCP
+  - it: Should set custom svc port
+    set:
+      ports:
+        - containerPort: 2021
+          svcPort: 21
+          name: ftp
+        - containerPort: 3001
+          nodePort: 33001
+          name: passive-1
+        - containerPort: 3002
+          name: passive-2
+    asserts:
+      - equal:
+          path: spec.ports
+          value:
+            - name: ftp
+              port: 21
+              targetPort: ftp
+              protocol: TCP
+            - name: passive-1
+              port: 3001
+              nodePort: 33001
+              targetPort: passive-1
+              protocol: TCP
+            - name: passive-2
+              port: 3002
+              targetPort: passive-2
+              protocol: TCP
+  - it: Should set default port
+    asserts:
+      - equal:
+          path: spec.ports
+          value:
+            - port: 80
+              targetPort: http
+              protocol: TCP
+              name: http