diff --git a/helm/fuel-subgraph/templates/deployment.yaml b/helm/fuel-subgraph/templates/deployment.yaml
index be8272e..fe8d60b 100644
--- a/helm/fuel-subgraph/templates/deployment.yaml
+++ b/helm/fuel-subgraph/templates/deployment.yaml
@@ -45,13 +45,13 @@ spec:
             - name: http
               containerPort: {{ .Values.service.port }}
               protocol: TCP
-            - name: firehose_port1
+            - name: firehose-port-1
               containerPort: {{ .Values.firehose.port1 }}
               protocol: TCP
-            - name: firehose_port2
+            - name: firehose-port-2
               containerPort: {{ .Values.firehose.port2 }}
               protocol: TCP
-            - name: firehose_port3
+            - name: firehose-port-3
               containerPort: {{ .Values.firehose.port3 }}
               protocol: TCP
           livenessProbe:
@@ -81,4 +81,4 @@ spec:
       {{- with .Values.tolerations }}
       tolerations:
         {{- toYaml . | nindent 8 }}
-      {{- end }}
\ No newline at end of file
+      {{- end }}
diff --git a/helm/fuel-subgraph/templates/service.yaml b/helm/fuel-subgraph/templates/service.yaml
index f0ea4c5..6fc80e7 100644
--- a/helm/fuel-subgraph/templates/service.yaml
+++ b/helm/fuel-subgraph/templates/service.yaml
@@ -11,15 +11,15 @@ spec:
       protocol: TCP
       name: http
     - port: {{ .Values.firehose.port1 }}
-      targetPort: firehose_port1
+      targetPort: firehose-port-1
       protocol: TCP
-      name: firehose_port1
+      name: firehose-port-1
     - port: {{ .Values.firehose.port2 }}
-      targetPort: firehose_port2
+      targetPort: firehose-port-2
       protocol: TCP
-      name: firehose_port2
+      name: firehose-port-2
     - port: {{ .Values.firehose.port3 }}
-      targetPort: firehose_port3
+      targetPort: firehose-port-3
       protocol: TCP
-      name: firehose_port3
+      name: firehose-port-3
   selector: {{- include "fuel-subgraph.selectorLabels" . | nindent 4 }}