diff --git a/kibana/templates/deployment.yaml b/kibana/templates/deployment.yaml
index c9eb05191..8bf88a3ea 100644
--- a/kibana/templates/deployment.yaml
+++ b/kibana/templates/deployment.yaml
@@ -58,7 +58,7 @@ spec:
             - start
           ports:
             - name: http
-              containerPort: 80
+              containerPort: {{ tuple "kibana" "internal" "http" . | include "helm-toolkit.endpoints.endpoint_port_lookup" }}
           env:
             - name: KIBANA_PORT
               value: {{ tuple "kibana" "internal" "kibana" . | include "helm-toolkit.endpoints.endpoint_port_lookup" | quote }}
@@ -97,7 +97,7 @@ spec:
             - start
           ports:
             - name: kibana
-              containerPort: {{ .Values.network.kibana.port }}
+              containerPort: {{ tuple "kibana" "internal" "kibana" . | include "helm-toolkit.endpoints.endpoint_port_lookup" }}
           env:
             - name: ELASTICSEARCH_URL
               value: {{ tuple "elasticsearch" "default" "client" . | include "helm-toolkit.endpoints.keystone_endpoint_uri_lookup" }}
diff --git a/kibana/templates/service.yaml b/kibana/templates/service.yaml
index e2fd36cea..61ffab1e8 100644
--- a/kibana/templates/service.yaml
+++ b/kibana/templates/service.yaml
@@ -23,7 +23,7 @@ metadata:
 spec:
   ports:
   - name: http
-    port: 80
+    port: {{ tuple "kibana" "internal" "http" . | include "helm-toolkit.endpoints.endpoint_port_lookup" }}
     {{ if .Values.network.kibana.node_port.enabled }}
     nodePort: {{ .Values.network.kibana.node_port.port }}
     {{ end }}
diff --git a/kibana/values.yaml b/kibana/values.yaml
index dd534f4a1..295f6b43c 100644
--- a/kibana/values.yaml
+++ b/kibana/values.yaml
@@ -169,6 +169,8 @@ endpoints:
     port:
       kibana:
         default: 5601
+      http:
+        default: 80
 
 network:
   kibana: