diff --git a/pkg/templates/charts/toggle/cluster-proxy-addon/templates/clustermanagementaddon.yaml b/pkg/templates/charts/toggle/cluster-proxy-addon/templates/clustermanagementaddon.yaml
index 7f5096e4..efccf5da 100644
--- a/pkg/templates/charts/toggle/cluster-proxy-addon/templates/clustermanagementaddon.yaml
+++ b/pkg/templates/charts/toggle/cluster-proxy-addon/templates/clustermanagementaddon.yaml
@@ -1,13 +1,24 @@
 apiVersion: addon.open-cluster-management.io/v1alpha1
 kind: ClusterManagementAddOn
 metadata:
+  annotations:
+    addon.open-cluster-management.io/lifecycle: addon-manager
   name: cluster-proxy
 spec:
   addOnMeta:
     displayName: cluster-proxy
     description: cluster-proxy
+  installStrategy:
+    placements:
+      - name: global
+        namespace: open-cluster-management-global-set
+        rolloutStrategy:
+          type: All
+    type: Placements
   supportedConfigs:
   - group: proxy.open-cluster-management.io
     resource: managedproxyconfigurations
     defaultConfig:
       name: cluster-proxy
+  - group: addon.open-cluster-management.io
+    resource: addondeploymentconfigs
diff --git a/pkg/templates/charts/toggle/cluster-proxy-addon/templates/manager-deployment.yaml b/pkg/templates/charts/toggle/cluster-proxy-addon/templates/manager-deployment.yaml
index f2fea39b..8ce0abdd 100644
--- a/pkg/templates/charts/toggle/cluster-proxy-addon/templates/manager-deployment.yaml
+++ b/pkg/templates/charts/toggle/cluster-proxy-addon/templates/manager-deployment.yaml
@@ -85,7 +85,6 @@ spec:
             - --signer-secret-namespace={{ .Values.global.namespace }}
             - --agent-image-name={{ .Values.global.imageOverrides.cluster_proxy }}
             - --agent-install-namespace=open-cluster-management-agent-addon
-            - --agent-install-all=true
             - --enable-kube-api-proxy=false
           securityContext:
             allowPrivilegeEscalation: false