diff --git a/charts/stable/omada-controller/Chart.yaml b/charts/stable/omada-controller/Chart.yaml
index 7925d997830..60369830be3 100644
--- a/charts/stable/omada-controller/Chart.yaml
+++ b/charts/stable/omada-controller/Chart.yaml
@@ -1,7 +1,7 @@
 kubeVersion: ">=1.24.0-0"
 apiVersion: v2
 name: omada-controller
-version: 12.1.7
+version: 13.0.0
 appVersion: "5.13"
 description: Omada is a SDN tool for TP-Link Omada hardware
 home: https://truecharts.org/charts/stable/omada-controller
diff --git a/charts/stable/omada-controller/templates/common.yaml b/charts/stable/omada-controller/templates/common.yaml
index edfe493639d..4818dd53663 100644
--- a/charts/stable/omada-controller/templates/common.yaml
+++ b/charts/stable/omada-controller/templates/common.yaml
@@ -1,24 +1,9 @@
 {{/* Render the templates */}}
-{{ include "tc.v1.common.loader.init" . }}
 
 {{/*
-Omada automatically redirects to that port.
-Instead of consuming the external 443 port, it's better to switch internal
-But still give user the ability to change it.
-When ingress is enabled, set this to 443, otherwise set it to whatever `port` is set to
+The old behavior of always running on port 443 seams to have changed upstream.  The 
+current upstream behavior is to not allow the port to be changed (without re-install) 
+after setup.   
 */}}
 
-{{- $port := .Values.service.main.ports.main.port -}}
-{{- if .Values.ingress.main.enabled -}}
-  {{- $port = 443 -}}
-{{- end -}}
-
-{{- $_ := set .Values.workload.main.podSpec.containers.main.env "MANAGE_HTTPS_PORT" $port -}}
-
-{{- $_ := set .Values.service.main.ports.main "targetPort" $port -}}
-
-{{- $_ := set .Values.workload.main.podSpec.containers.main.probes.liveness "port" $port -}}
-{{- $_ := set .Values.workload.main.podSpec.containers.main.probes.readiness "port" $port -}}
-{{- $_ := set .Values.workload.main.podSpec.containers.main.probes.startup "port" $port -}}
-
-{{ include "tc.v1.common.loader.apply" . }}
+{{ include "tc.v1.common.loader.all" . }}
diff --git a/charts/stable/omada-controller/values.yaml b/charts/stable/omada-controller/values.yaml
index 48a984bcc01..375ec1bf79c 100644
--- a/charts/stable/omada-controller/values.yaml
+++ b/charts/stable/omada-controller/values.yaml
@@ -67,6 +67,7 @@ workload:
       containers:
         main:
           env:
+            MANAGE_HTTPS_PORT: "{{ .Values.service.main.ports.main.port }}"
             PORTAL_HTTPS_PORT: "{{ .Values.service.comm.ports.comm.port }}"
           probes:
             startup: