diff --git a/addons/main.go b/addons/main.go
index b6c9f555bc..b975e77fb0 100644
--- a/addons/main.go
+++ b/addons/main.go
@@ -90,6 +90,7 @@ type addonFlags struct {
 	addonClusterRoleBinding         string
 	addonImagePullPolicy            string
 	corePackageRepoName             string
+	webhookServerPort               int
 	healthdAddr                     string
 	ipFamilyClusterVarName          string
 	featureGateClusterBootstrap     bool
@@ -120,6 +121,7 @@ func parseAddonFlags(addonFlags *addonFlags) {
 	flag.StringVar(&addonFlags.addonImagePullPolicy, "addon-image-pull-policy", "IfNotPresent", "The addon image pull policy")
 	flag.StringVar(&addonFlags.corePackageRepoName, "core-package-repo-name", "tanzu-core", "The name of core package repository")
 	flag.StringVar(&addonFlags.healthdAddr, "health-addr", ":18316", "The address the health endpoint binds to.")
+	flag.IntVar(&addonFlags.webhookServerPort, "webhook-server-port", 9865, "The port that the webhook server serves at.")
 	flag.StringVar(&addonFlags.ipFamilyClusterVarName, "ip-family-cluster-var-name", constants.DefaultIPFamilyClusterClassVarName, "IP family setting cluster variable name")
 	flag.BoolVar(&addonFlags.featureGateClusterBootstrap, "feature-gate-cluster-bootstrap", false, "Feature gate to enable clusterbootstap and addonconfig controllers that rely on TKR v1alphav3")
 	flag.BoolVar(&addonFlags.featureGatePackageInstallStatus, "feature-gate-package-install-status", false, "Feature gate to enable packageinstallstatus controller")
@@ -165,7 +167,7 @@ func main() {
 	mgr, err := ctrl.NewManager(ctrl.GetConfigOrDie(), ctrl.Options{
 		Scheme:                 scheme,
 		MetricsBindAddress:     flags.metricsAddr,
-		Port:                   9865,
+		Port:                   flags.webhookServerPort,
 		CertDir:                constants.WebhookCertDir,
 		LeaderElection:         flags.enableLeaderElection,
 		LeaderElectionID:       "5832a104.run.tanzu.addons",
diff --git a/packages/management/addons-manager/bundle/config/upstream/addons-manager.yaml b/packages/management/addons-manager/bundle/config/upstream/addons-manager.yaml
index cfa0dc3bb3..015acd7488 100644
--- a/packages/management/addons-manager/bundle/config/upstream/addons-manager.yaml
+++ b/packages/management/addons-manager/bundle/config/upstream/addons-manager.yaml
@@ -246,7 +246,8 @@ spec:
       - args:
         - --metrics-bind-addr=0
         - --leader-elect=false
-        - --health-addr=:18316
+        - #@ "--health-addr=:{}".format(data.values.tanzuAddonsManager.deployment.healthzPort)
+        - #@ "--webhook-server-port={}".format(data.values.tanzuAddonsManager.deployment.webhookServerPort)
         - #@ "--addon-namespace={}".format(data.values.tanzuAddonsManager.namespace)
         #@ if/end data.values.tanzuAddonsManager.featureGates.clusterBootstrapController:
         - --feature-gate-cluster-bootstrap=true
@@ -263,10 +264,10 @@ spec:
             cpu: 100m
             memory: 40Mi
         ports:
-          - containerPort: 9865
+          - containerPort: #@ data.values.tanzuAddonsManager.deployment.webhookServerPort
             name: webhook-server
             protocol: TCP
-          - containerPort: 18316
+          - containerPort: #@ data.values.tanzuAddonsManager.deployment.healthzPort
             name: healthz
             protocol: TCP
         readinessProbe:
diff --git a/packages/management/addons-manager/bundle/config/values.yaml b/packages/management/addons-manager/bundle/config/values.yaml
index 399c8364d3..ce920fcb22 100644
--- a/packages/management/addons-manager/bundle/config/values.yaml
+++ b/packages/management/addons-manager/bundle/config/values.yaml
@@ -10,6 +10,7 @@ tanzuAddonsManager:
     priorityClassName: null
     nodeSelector: null
     tolerations: []
+    webhookServerPort: 9865
     healthzPort: 18316
   featureGates:
     clusterBootstrapController: false
diff --git a/packages/management/framework/bundle/config/values.yaml b/packages/management/framework/bundle/config/values.yaml
index 69cbd4a91f..bd90e9a3f4 100644
--- a/packages/management/framework/bundle/config/values.yaml
+++ b/packages/management/framework/bundle/config/values.yaml
@@ -30,6 +30,7 @@ addonsManagerPackageValues:
       priorityClassName: system-cluster-critical
       nodeSelector: null
       tolerations: []
+      webhookServerPort: 9865
       healthzPort: 18316
     featureGates:
       clusterBootstrapController: false
diff --git a/packages/management/tkg/bundle/config/values.yaml b/packages/management/tkg/bundle/config/values.yaml
index 811a380482..855fdbc3ab 100644
--- a/packages/management/tkg/bundle/config/values.yaml
+++ b/packages/management/tkg/bundle/config/values.yaml
@@ -41,6 +41,8 @@ frameworkPackage:
         priorityClassName: system-cluster-critical
         nodeSelector: null
         tolerations: []
+        webhookServerPort: 9865
+        healthzPort: 18316
       featureGates:
         clusterBootstrapController: false
         packageInstallStatus: false