diff --git a/templates/deployment.yaml b/templates/deployment.yaml
index 3a79a9a..41bdf80 100644
--- a/templates/deployment.yaml
+++ b/templates/deployment.yaml
@@ -87,6 +87,12 @@ spec:
           image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
           imagePullPolicy: {{ .Values.image.pullPolicy }}
 {{- if .Values.nginxproxy.enabled }}
+{{- if .Values.ports.livePort }}
+          ports:
+          - name: live
+            containerPort: {{ .Values.ports.livePort }}
+            protocol: TCP
+{{- end }}
           livenessProbe:
             httpGet:
               path: /
@@ -99,9 +105,14 @@ spec:
             initialDelaySeconds: 60
 {{- else }}
           ports:
-            - name: http
-              containerPort: {{ .Values.ports.peertubePort }}
-              protocol: TCP
+          - name: http
+            containerPort: {{ .Values.ports.peertubePort }}
+            protocol: TCP
+{{- if .Values.ports.livePort }}
+          - name: live
+            containerPort: {{ .Values.ports.livePort }}
+            protocol: TCP
+{{- end }}
           livenessProbe:
             httpGet:
               path: /
diff --git a/templates/service.yaml b/templates/service.yaml
index 6d741a0..3eab6a6 100644
--- a/templates/service.yaml
+++ b/templates/service.yaml
@@ -20,6 +20,12 @@ spec:
       targetPort: http
       protocol: TCP
       name: http
+{{- end }}
+{{- if .Values.ports.livePort }}
+    - port: {{ .Values.ports.livePort }}
+      targetPort: {{ .Values.ports.livePort }}
+      protocol: TCP
+      name: live
 {{- end }}
   selector:
     app: {{ template "peertube.name" . }}
diff --git a/values.yaml b/values.yaml
index d78f721..c55aba6 100644
--- a/values.yaml
+++ b/values.yaml
@@ -20,6 +20,9 @@ ports:
   # The chart uses the correct port for service and ingress according to configuration
   peertubePort: 9000
   nginxproxyPort: 9001
+  # livePort is a directly exposed TCP port used for the live streaming feature.
+  # Should match your live configuration in production.yml, and default to 1935
+  livePort: 1935
 
 ingress:
   enabled: true
@@ -92,8 +95,11 @@ environment:
   admin: peertube@peertube.domain.tld
   transcoding: true
 
+# WARNING nginxproxy is not compatible with live at the moment
+# Because it search .../streaming-playlists/... in URL path directly in filesystem path
+# and if you use .../streaming_playlists/... on filesystem, live is broken (notice the - vs _)
 nginxproxy:
-  enabled: true
+  enabled: false
   image:
     repository: nginx
     tag: 1.17.9