diff --git a/charts/stable/unifi/Chart.yaml b/charts/stable/unifi/Chart.yaml
index 4a88679a..c688df1e 100644
--- a/charts/stable/unifi/Chart.yaml
+++ b/charts/stable/unifi/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 appVersion: 6.0.45
 description: Ubiquiti Network's Unifi Controller
 name: unifi
-version: 1.5.6
+version: 2.0.0
 keywords:
   - ubiquiti
   - unifi
diff --git a/charts/stable/unifi/templates/captive-ingress.yaml b/charts/stable/unifi/templates/captive-ingress.yaml
index 18ba2099..a3f6d2b9 100644
--- a/charts/stable/unifi/templates/captive-ingress.yaml
+++ b/charts/stable/unifi/templates/captive-ingress.yaml
@@ -48,16 +48,16 @@ spec:
                 name: {{ $fullName }}-captiveportalservice
                 port:
                   {{- if $captivePortalHttps }}
-                  name: captive-https
+                  name: https-captive
                   {{- else }}
-                  name: captive-http
+                  name: http-captive
                   {{- end }}
             {{- else }}
               serviceName: {{ $fullName }}-captiveportalservice
               {{- if $captivePortalHttps }}
-              servicePort: captive-https
+              servicePort: https-captive
               {{- else }}
-              servicePort: captive-http
+              servicePort: http-captive
               {{- end }}
             {{- end -}}
     {{- end }}
diff --git a/charts/stable/unifi/templates/captive-svc.yaml b/charts/stable/unifi/templates/captive-svc.yaml
index 81e0b144..6c1156e7 100644
--- a/charts/stable/unifi/templates/captive-svc.yaml
+++ b/charts/stable/unifi/templates/captive-svc.yaml
@@ -42,16 +42,16 @@ spec:
   {{- end }}
   ports:
     - port: {{ .Values.captivePortalService.http }}
-      targetPort: captive-http
+      targetPort: http-captive
       protocol: TCP
-      name: captive-http
+      name: http-captive
 {{ if (and (eq .Values.captivePortalService.type "NodePort") (not (empty .Values.captivePortalService.http))) }}
       nodePort: {{.Values.captivePortalService.http}}
 {{ end }}
     - port: {{ .Values.captivePortalService.https }}
-      targetPort: captive-https
+      targetPort: https-captive
       protocol: TCP
-      name: captive-https
+      name: https-captive
 {{ if (and (eq .Values.captivePortalService.type "NodePort") (not (empty .Values.captivePortalService.https))) }}
       nodePort: {{.Values.captivePortalService.https}}
 {{ end }}
diff --git a/charts/stable/unifi/templates/deployment.yaml b/charts/stable/unifi/templates/deployment.yaml
index d945d408..0aee69f6 100644
--- a/charts/stable/unifi/templates/deployment.yaml
+++ b/charts/stable/unifi/templates/deployment.yaml
@@ -68,10 +68,10 @@ spec:
               containerPort: 5514
               protocol: UDP
             {{- if .Values.captivePortalService.enabled }}
-            - name: captive-http
+            - name: http-captive
               containerPort: {{ .Values.captivePortalService.http }}
               protocol: TCP
-            - name: captive-https
+            - name: https-captive
               containerPort: {{ .Values.captivePortalService.https }}
               protocol: TCP
             {{- end }}
diff --git a/charts/stable/unifi/templates/unified-svc.yaml b/charts/stable/unifi/templates/unified-svc.yaml
index aab4c4eb..363b84db 100644
--- a/charts/stable/unifi/templates/unified-svc.yaml
+++ b/charts/stable/unifi/templates/unified-svc.yaml
@@ -77,17 +77,17 @@ spec:
       nodePort: {{.Values.guiService.nodePort}}
 {{ end }}
 {{ if .Values.captivePortalService.enabled }}
-    - name: captive-http
+    - name: http-captive
       port: {{ .Values.captivePortalService.http }}
       protocol: TCP
-      targetPort: captive-http
+      targetPort: http-captive
 {{ if (and (eq .Values.unifiedService.type "NodePort") (not (empty .Values.captivePortalService.http))) }}
       nodePort: {{.Values.captivePortalService.http}}
 {{ end }}
-    - name: captive-https
+    - name: https-captive
       port: {{ .Values.captivePortalService.https }}
       protocol: TCP
-      targetPort: captive-https
+      targetPort: https-captive
 {{ if (and (eq .Values.unifiedService.type "NodePort") (not (empty .Values.captivePortalService.https))) }}
       nodePort: {{.Values.captivePortalService.https}}
 {{ end }}