diff --git a/charts/virtual-machine/templates/service.yaml b/charts/virtual-machine/templates/service.yaml
index b79b385..9af7476 100644
--- a/charts/virtual-machine/templates/service.yaml
+++ b/charts/virtual-machine/templates/service.yaml
@@ -7,4 +7,9 @@
   selector:
     app: {{ .Values.name }}
   ports:
-    {{- toYaml .Values.servicePorts | nindent 4 }}
+  {{- range .Values.ports }}
+  - name: {{ .name }}
+    port: {{ .value }}
+    targetPort: {{ .name }}
+    protocol: {{ .protocol }}
+  {{- end }}
diff --git a/charts/virtual-machine/templates/vm.yaml b/charts/virtual-machine/templates/vm.yaml
index 40c4a34..3a0a446 100644
--- a/charts/virtual-machine/templates/vm.yaml
+++ b/charts/virtual-machine/templates/vm.yaml
@@ -25,9 +25,11 @@
               # masquerade: {}
               bridge: {}
               ports:
-                {{- range .Values.ports }}
-                - port: {{ . }}
-                {{- end }}
+              {{- range .Values.ports }}
+              - name: {{ .name }}
+                port: {{ .value }}
+                protocol: {{ .protocol }}
+              {{- end }}
           disks:
             - name: disk0
               disk:
diff --git a/charts/virtual-machine/values.yaml b/charts/virtual-machine/values.yaml
index 79ea0a9..0199d6f 100644
--- a/charts/virtual-machine/values.yaml
+++ b/charts/virtual-machine/values.yaml
@@ -8,4 +8,3 @@
 cloudInit:
   userData: "" # base64 encoded
   networkData: "" # base64 encoded
-ports: []