diff --git a/apis/installer/v1alpha1/license_proxyserver_manager_types.go b/apis/installer/v1alpha1/license_proxyserver_manager_types.go
index 95022c893..37468fbcc 100644
--- a/apis/installer/v1alpha1/license_proxyserver_manager_types.go
+++ b/apis/installer/v1alpha1/license_proxyserver_manager_types.go
@@ -52,15 +52,11 @@ type LicenseProxyserverManagerSpec struct {
 	RegistryFQDN     string `json:"registryFQDN"`
 	Image            string `json:"image"`
 	// +optional
-	Tag             string `json:"tag"`
-	ImagePullPolicy string `json:"imagePullPolicy"`
-	// +optional
-	KubeconfigSecretName string `json:"kubeconfigSecretName"`
-	// +optional
-	AddonManagerNamespace string        `json:"addonManagerNamespace"`
-	Placement             PlacementSpec `json:"placement"`
-	Kubectl               DockerImage   `json:"kubectl"`
-	Platform              PlatformSpec  `json:"platform"`
+	Tag             string        `json:"tag"`
+	ImagePullPolicy string        `json:"imagePullPolicy"`
+	Placement       PlacementSpec `json:"placement"`
+	Kubectl         DockerImage   `json:"kubectl"`
+	Platform        PlatformSpec  `json:"platform"`
 	//+optional
 	SecurityContext *core.SecurityContext `json:"securityContext"`
 	// List of sources to populate environment variables in the container.
diff --git a/charts/license-proxyserver-manager/README.md b/charts/license-proxyserver-manager/README.md
index ab8b7a62d..89e93dfff 100644
--- a/charts/license-proxyserver-manager/README.md
+++ b/charts/license-proxyserver-manager/README.md
@@ -45,34 +45,32 @@ The command removes all the Kubernetes components associated with the chart and
 
 The following table lists the configurable parameters of the `license-proxyserver-manager` chart and their default values.
 
-|                Parameter                 |                             Description                             |                         Default                          |
-|------------------------------------------|---------------------------------------------------------------------|----------------------------------------------------------|
-| nameOverride                             |                                                                     | <code>""</code>                                          |
-| fullnameOverride                         |                                                                     | <code>""</code>                                          |
-| registryFQDN                             | Docker registry fqdn used to pull license-proxyserver docker images | <code>ghcr.io</code>                                     |
-| image                                    |                                                                     | <code>ghcr.io/appscode/license-proxyserver</code>        |
-| tag                                      |                                                                     | <code>""</code>                                          |
-| imagePullPolicy                          |                                                                     | <code>Always</code>                                      |
-| kubeconfigSecretName                     |                                                                     | <code>""</code>                                          |
-| addonManagerNamespace                    |                                                                     | <code>open-cluster-management-license-proxyserver</code> |
-| placement.create                         |                                                                     | <code>true</code>                                        |
-| placement.name                           |                                                                     | <code>global</code>                                      |
-| kubectl.image                            |                                                                     | <code>ghcr.io/appscode/kubectl-nonroot:1.34</code>       |
-| platform.baseURL                         |                                                                     | <code>""</code>                                          |
-| platform.token                           |                                                                     | <code>""</code>                                          |
-| platform.tokenSecretName                 |                                                                     | <code>""</code>                                          |
-| platform.caBundle                        |                                                                     | <code>""</code>                                          |
-| platform.insecureSkipTLSVerify           |                                                                     | <code>false</code>                                       |
-| securityContext.allowPrivilegeEscalation |                                                                     | <code>false</code>                                       |
-| securityContext.privileged               |                                                                     | <code>false</code>                                       |
-| securityContext.runAsNonRoot             |                                                                     | <code>true</code>                                        |
-| securityContext.runAsUser                |                                                                     | <code>65534</code>                                       |
-| securityContext.readOnlyRootFilesystem   |                                                                     | <code>true</code>                                        |
-| securityContext.seccompProfile.type      |                                                                     | <code>RuntimeDefault</code>                              |
-| envFrom                                  | List of sources to populate environment variables in the container  | <code>[]</code>                                          |
-| env                                      | List of environment variables to set in the container               | <code>[]</code>                                          |
-| distro.openshift                         |                                                                     | <code>false</code>                                       |
-| distro.ubi                               |                                                                     | <code>""</code>                                          |
+|                Parameter                 |                             Description                             |                      Default                       |
+|------------------------------------------|---------------------------------------------------------------------|----------------------------------------------------|
+| nameOverride                             |                                                                     | <code>""</code>                                    |
+| fullnameOverride                         |                                                                     | <code>""</code>                                    |
+| registryFQDN                             | Docker registry fqdn used to pull license-proxyserver docker images | <code>ghcr.io</code>                               |
+| image                                    |                                                                     | <code>ghcr.io/appscode/license-proxyserver</code>  |
+| tag                                      |                                                                     | <code>""</code>                                    |
+| imagePullPolicy                          |                                                                     | <code>Always</code>                                |
+| placement.create                         |                                                                     | <code>true</code>                                  |
+| placement.name                           |                                                                     | <code>global</code>                                |
+| kubectl.image                            |                                                                     | <code>ghcr.io/appscode/kubectl-nonroot:1.34</code> |
+| platform.baseURL                         |                                                                     | <code>""</code>                                    |
+| platform.token                           |                                                                     | <code>""</code>                                    |
+| platform.tokenSecretName                 |                                                                     | <code>""</code>                                    |
+| platform.caBundle                        |                                                                     | <code>""</code>                                    |
+| platform.insecureSkipTLSVerify           |                                                                     | <code>false</code>                                 |
+| securityContext.allowPrivilegeEscalation |                                                                     | <code>false</code>                                 |
+| securityContext.privileged               |                                                                     | <code>false</code>                                 |
+| securityContext.runAsNonRoot             |                                                                     | <code>true</code>                                  |
+| securityContext.runAsUser                |                                                                     | <code>65534</code>                                 |
+| securityContext.readOnlyRootFilesystem   |                                                                     | <code>true</code>                                  |
+| securityContext.seccompProfile.type      |                                                                     | <code>RuntimeDefault</code>                        |
+| envFrom                                  | List of sources to populate environment variables in the container  | <code>[]</code>                                    |
+| env                                      | List of environment variables to set in the container               | <code>[]</code>                                    |
+| distro.openshift                         |                                                                     | <code>false</code>                                 |
+| distro.ubi                               |                                                                     | <code>""</code>                                    |
 
 
 Specify each parameter using the `--set key=value[,key=value]` argument to `helm upgrade -i`. For example:
diff --git a/charts/license-proxyserver-manager/crds/addon.open-cluster-management.io_clustermanagementaddons.yaml b/charts/license-proxyserver-manager/crds/addon.open-cluster-management.io_clustermanagementaddons.yaml
index f4cdb8072..a624aebb3 100644
--- a/charts/license-proxyserver-manager/crds/addon.open-cluster-management.io_clustermanagementaddons.yaml
+++ b/charts/license-proxyserver-manager/crds/addon.open-cluster-management.io_clustermanagementaddons.yaml
@@ -375,6 +375,7 @@ spec:
                 type: object
               supportedConfigs:
                 description: |-
+                  Deprecated: Will be removed and replaced with DefaultConfigs in v1beta1.
                   supportedConfigs is a list of configuration types supported by add-on.
                   An empty list means the add-on does not require configurations.
                   The default is an empty list
@@ -421,7 +422,7 @@ spec:
               add-on.
             properties:
               defaultconfigReferences:
-                description: defaultconfigReferences is a list of current add-on default
+                description: DefaultConfigReferences is a list of current add-on default
                   configuration references.
                 items:
                   description: |-
@@ -522,6 +523,9 @@ spec:
                         - type
                         type: object
                       type: array
+                      x-kubernetes-list-map-keys:
+                      - type
+                      x-kubernetes-list-type: map
                     configReferences:
                       description: configReferences is a list of current add-on configuration
                         references.
diff --git a/charts/license-proxyserver-manager/crds/cluster.open-cluster-management.io_placements.yaml b/charts/license-proxyserver-manager/crds/cluster.open-cluster-management.io_placements.yaml
index 39fe40b5c..f8d2cbf07 100644
--- a/charts/license-proxyserver-manager/crds/cluster.open-cluster-management.io_placements.yaml
+++ b/charts/license-proxyserver-manager/crds/cluster.open-cluster-management.io_placements.yaml
@@ -600,6 +600,9 @@ spec:
                   - type
                   type: object
                 type: array
+                x-kubernetes-list-map-keys:
+                - type
+                x-kubernetes-list-type: map
               decisionGroups:
                 description: List of decision groups determined by the placement and
                   DecisionStrategy.
diff --git a/charts/license-proxyserver-manager/crds/work.open-cluster-management.io_manifestworkreplicasets.yaml b/charts/license-proxyserver-manager/crds/work.open-cluster-management.io_manifestworkreplicasets.yaml
index 40f471054..062a75857 100644
--- a/charts/license-proxyserver-manager/crds/work.open-cluster-management.io_manifestworkreplicasets.yaml
+++ b/charts/license-proxyserver-manager/crds/work.open-cluster-management.io_manifestworkreplicasets.yaml
@@ -302,6 +302,14 @@ spec:
                             - type
                             type: object
                           type: array
+                        feedbackScrapeType:
+                          default: Poll
+                          description: FeedbackScrapeType represents the way to monitor
+                            resource, it could be Poll or Watch
+                          enum:
+                          - Poll
+                          - Watch
+                          type: string
                         resourceIdentifier:
                           description: |-
                             ResourceIdentifier represents the group, resource, name and namespace of a resoure.
@@ -722,6 +730,9 @@ spec:
                   - type
                   type: object
                 type: array
+                x-kubernetes-list-map-keys:
+                - type
+                x-kubernetes-list-type: map
               placementSummary:
                 description: PlacementRef Summary
                 items:
@@ -750,12 +761,20 @@ spec:
                           type: integer
                         degraded:
                           type: integer
+                        desiredTotal:
+                          description: DesiredTotal is the number of ManifestWorks
+                            that will be created by the ManifestWorkReplicaSet.
+                          type: integer
                         progressing:
                           type: integer
                         total:
                           description: Total number of ManifestWorks managed by the
                             ManifestWorkReplicaSet
                           type: integer
+                        updated:
+                          description: Updated is the number of clusters with updated
+                            revision applied.
+                          type: integer
                       type: object
                   type: object
                 type: array
@@ -772,11 +791,19 @@ spec:
                     type: integer
                   degraded:
                     type: integer
+                  desiredTotal:
+                    description: DesiredTotal is the number of ManifestWorks that
+                      will be created by the ManifestWorkReplicaSet.
+                    type: integer
                   progressing:
                     type: integer
                   total:
                     description: Total number of ManifestWorks managed by the ManifestWorkReplicaSet
                     type: integer
+                  updated:
+                    description: Updated is the number of clusters with updated revision
+                      applied.
+                    type: integer
                 type: object
             type: object
         type: object
diff --git a/charts/license-proxyserver-manager/templates/_helpers.tpl b/charts/license-proxyserver-manager/templates/_helpers.tpl
index e5b739511..8848a6c6c 100644
--- a/charts/license-proxyserver-manager/templates/_helpers.tpl
+++ b/charts/license-proxyserver-manager/templates/_helpers.tpl
@@ -50,13 +50,6 @@ app.kubernetes.io/name: {{ include "license-proxyserver-manager.name" . }}
 app.kubernetes.io/instance: {{ .Release.Name }}
 {{- end }}
 
-{{/*
-Addon manager namespace
-*/}}
-{{- define "license-proxyserver-manager.namespace" -}}
-{{ ternary .Release.Namespace (required "A valid .Values.addonManagerNamespace is required!" .Values.addonManagerNamespace) (empty .Values.kubeconfigSecretName) }}
-{{- end }}
-
 {{/*
 Returns whether the OpenShift distribution is used
 */}}
diff --git a/charts/license-proxyserver-manager/templates/k8s/cluster_role.yaml b/charts/license-proxyserver-manager/templates/cluster_role.yaml
similarity index 97%
rename from charts/license-proxyserver-manager/templates/k8s/cluster_role.yaml
rename to charts/license-proxyserver-manager/templates/cluster_role.yaml
index 84849345d..0a5fea87a 100644
--- a/charts/license-proxyserver-manager/templates/k8s/cluster_role.yaml
+++ b/charts/license-proxyserver-manager/templates/cluster_role.yaml
@@ -1,5 +1,3 @@
-{{- if not .Values.kubeconfigSecretName }}
-
 kind: ClusterRole
 apiVersion: rbac.authorization.k8s.io/v1
 metadata:
@@ -47,5 +45,3 @@ rules:
   - apiGroups: ["addon.open-cluster-management.io"]
     resources: ["managedclusteraddons/status"]
     verbs: ["update", "patch"]
-
-{{- end }}
diff --git a/charts/license-proxyserver-manager/templates/k8s/cluster_role_binding.yaml b/charts/license-proxyserver-manager/templates/cluster_role_binding.yaml
similarity index 87%
rename from charts/license-proxyserver-manager/templates/k8s/cluster_role_binding.yaml
rename to charts/license-proxyserver-manager/templates/cluster_role_binding.yaml
index 85ab105cd..84e7b7cac 100644
--- a/charts/license-proxyserver-manager/templates/k8s/cluster_role_binding.yaml
+++ b/charts/license-proxyserver-manager/templates/cluster_role_binding.yaml
@@ -1,5 +1,3 @@
-{{- if not .Values.kubeconfigSecretName }}
-
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRoleBinding
 metadata:
@@ -12,5 +10,3 @@ subjects:
   - kind: ServiceAccount
     name: license-proxyserver-manager
     namespace: {{ .Release.Namespace }}
-
-{{- end }}
diff --git a/charts/license-proxyserver-manager/templates/deployment.yaml b/charts/license-proxyserver-manager/templates/deployment.yaml
index 06e238d49..2faa93d57 100644
--- a/charts/license-proxyserver-manager/templates/deployment.yaml
+++ b/charts/license-proxyserver-manager/templates/deployment.yaml
@@ -56,7 +56,7 @@ spec:
                 fieldRef:
                   fieldPath: metadata.namespace
             - name: NAMESPACE
-              value: {{ include "license-proxyserver-manager.namespace" . }}
+              value: {{ .Release.Namespace }}
           {{- if eq "true" ( include "distro.openshift" . ) }}
           securityContext:
             {{- toYaml (omit .Values.securityContext "runAsUser" "runAsGroup" "fsGroup" "supplementalGroups") | nindent 12 }}
diff --git a/charts/license-proxyserver-manager/templates/k8s/addon.yaml b/charts/license-proxyserver-manager/templates/k8s/addon.yaml
deleted file mode 100644
index 3a154cb93..000000000
--- a/charts/license-proxyserver-manager/templates/k8s/addon.yaml
+++ /dev/null
@@ -1,15 +0,0 @@
-{{- if not .Values.kubeconfigSecretName }}
-
-{{- $restpl := $.Files.Get "common/addon/clustermanagementaddon.yaml" }}
-{{ tpl $restpl $ }}
----
-{{- $restpl := $.Files.Get "common/addon/clustersetbinding.yaml" }}
-{{ tpl $restpl $ }}
----
-{{- $restpl := $.Files.Get "common/addon/placement.yaml" }}
-{{ tpl $restpl $ }}
----
-{{- $restpl := $.Files.Get "common/work-agent/perm.yaml" }}
-{{ tpl $restpl $ }}
-
-{{- end }}
diff --git a/charts/license-proxyserver-manager/templates/ocm-mc/addon.yaml b/charts/license-proxyserver-manager/templates/ocm-mc/addon.yaml
deleted file mode 100644
index 79cf42d0c..000000000
--- a/charts/license-proxyserver-manager/templates/ocm-mc/addon.yaml
+++ /dev/null
@@ -1,52 +0,0 @@
-{{- if .Values.kubeconfigSecretName }}
-
-apiVersion: batch/v1
-kind: Job
-metadata:
-  name: license-proxy-configure-addon
-  namespace: {{ .Release.Namespace }}
-  annotations:
-    "helm.sh/hook-weight": "2"
-    "helm.sh/hook": post-install,post-upgrade,post-rollback
-    "helm.sh/hook-delete-policy": before-hook-creation,hook-succeeded,hook-failed
-spec:
-  ttlSecondsAfterFinished: 0
-  backoffLimit: 3
-  template:
-    spec:
-      automountServiceAccountToken: false
-      containers:
-      - name: kubectl
-        image: {{ .Values.kubectl.image }}
-        workingDir: /var/run/secrets/ocm
-        command:
-          - sh
-          - -c
-          - |
-              sleep 2; \
-              kubectl --kubeconfig=auth/kubeconfig create ns {{ include "license-proxyserver-manager.namespace" $ }} || true; \
-              kubectl --kubeconfig=auth/kubeconfig apply -f - <<EOF
-              {{- $restpl := $.Files.Get "common/addon/clustermanagementaddon.yaml" -}}
-              {{- tpl $restpl $ | nindent 14 }}
-              ---
-              {{- $restpl := $.Files.Get "common/addon/clustersetbinding.yaml" -}}
-              {{- tpl $restpl $ | nindent 14 }}
-              ---
-              {{- $restpl := $.Files.Get "common/addon/placement.yaml" -}}
-              {{- tpl $restpl $ | nindent 14 }}
-              ---
-              {{- $restpl := $.Files.Get "common/work-agent/perm.yaml" -}}
-              {{- tpl $restpl $ | nindent 14 }}
-              EOF
-        imagePullPolicy: {{ .Values.imagePullPolicy }}
-        volumeMounts:
-        - mountPath: /var/run/secrets/ocm/auth
-          name: ocm-auth
-      volumes:
-      - name: ocm-auth
-        secret:
-          defaultMode: 420
-          secretName: {{ .Values.kubeconfigSecretName }}
-      restartPolicy: Never
-
-{{- end }}
diff --git a/charts/license-proxyserver-manager/templates/ocm-mc/crds.yaml b/charts/license-proxyserver-manager/templates/ocm-mc/crds.yaml
deleted file mode 100644
index a121e177d..000000000
--- a/charts/license-proxyserver-manager/templates/ocm-mc/crds.yaml
+++ /dev/null
@@ -1,63 +0,0 @@
-{{- if .Values.kubeconfigSecretName }}
-{{ range $path, $data := .Files.Glob  "crds/**.yaml" }}
-
-{{ $content := toString $data }}
-{{ $crd := dig "spec" "names" "plural" "" ($content | fromYaml) }}
-{{ $job := printf "license-proxy-regcrd-%s" $crd | trunc 52 }}
----
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  name: {{ $job }}
-  namespace: {{ $.Release.Namespace }}
-  annotations:
-    "helm.sh/hook-weight": "0"
-    "helm.sh/hook": pre-install,pre-upgrade,pre-rollback
-    "helm.sh/hook-delete-policy": before-hook-creation,hook-succeeded,hook-failed
-data:
-  crd.yaml: |
-    {{- $content | nindent 4 }}
-
----
-apiVersion: batch/v1
-kind: Job
-metadata:
-  name: {{ $job }}
-  namespace: {{ $.Release.Namespace }}
-  annotations:
-    "helm.sh/hook-weight": "1"
-    "helm.sh/hook": pre-install,pre-upgrade,pre-rollback
-    "helm.sh/hook-delete-policy": before-hook-creation,hook-succeeded,hook-failed
-spec:
-  ttlSecondsAfterFinished: 0
-  backoffLimit: 3
-  template:
-    spec:
-      automountServiceAccountToken: false
-      containers:
-      - name: kubectl
-        image: {{ $.Values.kubectl.image }}
-        workingDir: /var/run/secrets/ocm
-        command:
-          - sh
-          - -c
-          - "sleep 2; \
-            kubectl --kubeconfig=auth/kubeconfig apply -f /etc/crds/crd.yaml; \
-            "
-        imagePullPolicy: {{ $.Values.imagePullPolicy }}
-        volumeMounts:
-        - mountPath: /var/run/secrets/ocm/auth
-          name: ocm-auth
-        - name: crd-volume
-          mountPath: /etc/crds
-      volumes:
-      - name: ocm-auth
-        secret:
-          defaultMode: 420
-          secretName: {{ $.Values.kubeconfigSecretName }}
-      - name: crd-volume
-        configMap:
-          name: {{ $job }}
-      restartPolicy: Never
-{{- end }}
-{{- end }}
diff --git a/charts/license-proxyserver-manager/common/addon/clustermanagementaddon.yaml b/charts/license-proxyserver-manager/templates/ocm/addon/clustermanagementaddon.yaml
similarity index 84%
rename from charts/license-proxyserver-manager/common/addon/clustermanagementaddon.yaml
rename to charts/license-proxyserver-manager/templates/ocm/addon/clustermanagementaddon.yaml
index 369980d96..69de2eeee 100644
--- a/charts/license-proxyserver-manager/common/addon/clustermanagementaddon.yaml
+++ b/charts/license-proxyserver-manager/templates/ocm/addon/clustermanagementaddon.yaml
@@ -12,4 +12,4 @@ spec:
     type: Placements
     placements:
       - name: {{ .Values.placement.name }}
-        namespace: {{ include "license-proxyserver-manager.namespace" . }}
+        namespace: {{ .Release.Namespace }}
diff --git a/charts/license-proxyserver-manager/common/addon/clustersetbinding.yaml b/charts/license-proxyserver-manager/templates/ocm/addon/clustersetbinding.yaml
similarity index 72%
rename from charts/license-proxyserver-manager/common/addon/clustersetbinding.yaml
rename to charts/license-proxyserver-manager/templates/ocm/addon/clustersetbinding.yaml
index 6facf0a6c..e3053600e 100644
--- a/charts/license-proxyserver-manager/common/addon/clustersetbinding.yaml
+++ b/charts/license-proxyserver-manager/templates/ocm/addon/clustersetbinding.yaml
@@ -4,7 +4,7 @@ apiVersion: cluster.open-cluster-management.io/v1beta2
 kind: ManagedClusterSetBinding
 metadata:
   name: global
-  namespace: {{ include "license-proxyserver-manager.namespace" . }}
+  namespace: {{ .Release.Namespace }}
 spec:
   clusterSet: global
 
diff --git a/charts/license-proxyserver-manager/common/addon/placement.yaml b/charts/license-proxyserver-manager/templates/ocm/addon/placement.yaml
similarity index 86%
rename from charts/license-proxyserver-manager/common/addon/placement.yaml
rename to charts/license-proxyserver-manager/templates/ocm/addon/placement.yaml
index 715e94966..dfd8d9929 100644
--- a/charts/license-proxyserver-manager/common/addon/placement.yaml
+++ b/charts/license-proxyserver-manager/templates/ocm/addon/placement.yaml
@@ -4,7 +4,7 @@ apiVersion: cluster.open-cluster-management.io/v1beta1
 kind: Placement
 metadata:
   name: {{ .Values.placement.name }}
-  namespace: {{ include "license-proxyserver-manager.namespace" . }}
+  namespace: {{ .Release.Namespace }}
 spec:
   clusterSets:
     - global
diff --git a/charts/license-proxyserver-manager/common/work-agent/perm.yaml b/charts/license-proxyserver-manager/templates/ocm/work-agent/perm.yaml
similarity index 96%
rename from charts/license-proxyserver-manager/common/work-agent/perm.yaml
rename to charts/license-proxyserver-manager/templates/ocm/work-agent/perm.yaml
index 45484e43f..a64a532aa 100644
--- a/charts/license-proxyserver-manager/common/work-agent/perm.yaml
+++ b/charts/license-proxyserver-manager/templates/ocm/work-agent/perm.yaml
@@ -2,7 +2,7 @@ apiVersion: work.open-cluster-management.io/v1alpha1
 kind: ManifestWorkReplicaSet
 metadata:
   name: license-agent
-  namespace: {{ include "license-proxyserver-manager.namespace" $ }}
+  namespace: {{ .Release.Namespace }}
 spec:
   placementRefs:
     - name: global
diff --git a/charts/license-proxyserver-manager/templates/k8s/serviceaccount.yaml b/charts/license-proxyserver-manager/templates/serviceaccount.yaml
similarity index 68%
rename from charts/license-proxyserver-manager/templates/k8s/serviceaccount.yaml
rename to charts/license-proxyserver-manager/templates/serviceaccount.yaml
index db95c648f..8fe1f3d05 100644
--- a/charts/license-proxyserver-manager/templates/k8s/serviceaccount.yaml
+++ b/charts/license-proxyserver-manager/templates/serviceaccount.yaml
@@ -1,9 +1,5 @@
-{{- if not .Values.kubeconfigSecretName }}
-
 apiVersion: v1
 kind: ServiceAccount
 metadata:
   name: license-proxyserver-manager
   namespace: {{ .Release.Namespace }}
-
-{{- end }}
diff --git a/charts/license-proxyserver-manager/values.openapiv3_schema.yaml b/charts/license-proxyserver-manager/values.openapiv3_schema.yaml
index b9f6ce60a..679bec5c9 100644
--- a/charts/license-proxyserver-manager/values.openapiv3_schema.yaml
+++ b/charts/license-proxyserver-manager/values.openapiv3_schema.yaml
@@ -1,6 +1,4 @@
 properties:
-  addonManagerNamespace:
-    type: string
   distro:
     properties:
       openshift:
@@ -133,8 +131,6 @@ properties:
     type: string
   imagePullPolicy:
     type: string
-  kubeconfigSecretName:
-    type: string
   kubectl:
     properties:
       image:
diff --git a/charts/license-proxyserver-manager/values.yaml b/charts/license-proxyserver-manager/values.yaml
index 22d4c45b4..b9b9db6dc 100644
--- a/charts/license-proxyserver-manager/values.yaml
+++ b/charts/license-proxyserver-manager/values.yaml
@@ -8,9 +8,6 @@ image: ghcr.io/appscode/license-proxyserver
 tag: ""
 imagePullPolicy: Always
 
-kubeconfigSecretName: ""
-addonManagerNamespace: open-cluster-management-license-proxyserver
-
 placement:
   create: true
   name: global
diff --git a/charts/opscenter-features/templates/featuresets/ocm-mc/cluster-auth-manager.yaml b/charts/opscenter-features/templates/featuresets/ocm-mc/cluster-auth-manager.yaml
deleted file mode 100644
index 77910c4fd..000000000
--- a/charts/opscenter-features/templates/featuresets/ocm-mc/cluster-auth-manager.yaml
+++ /dev/null
@@ -1,65 +0,0 @@
-{{ $defaults := printf `
-registryFQDN: %s
-image: %s
-kubectl:
-  image: %s
-kubeconfigSecretName: multicluster-controlplane-svc-kubeconfig
-addonManagerNamespace: open-cluster-management-addon
-placement:
-  create: false
-`
-  (include "registry.ghcr" $)
-  (include "image.ghcr" (merge (dict "_repo" "kluster-manager/cluster-auth") $))
-  (include "kubectl.image" $)
-  | fromYaml }}
-
-{{ $vals := dig "cluster-auth-manager" "values" (dict) .Values.helm.releases }}
-{{ $vals = mergeOverwrite $defaults $vals }}
-
-apiVersion: ui.k8s.appscode.com/v1alpha1
-kind: Feature
-metadata:
-  name: mc-auth-manager
-  labels:
-    app.kubernetes.io/part-of: ocm-mc
-spec:
-  title: Cluster Auth Manager
-  description: |
-    Deploy Cluster Auth Manager
-  icons:
-    - src: https://cdn.appscode.com/k8s/icons/menu/cluster.svg
-      type: image/svg+xml
-  featureSet: ocm-mc
-  featureBlock: multicluster-controlplane
-  recommended: true
-  requirements:
-    features:
-      - multicluster-controlplane
-      - mc-profile-manager
-      - mc-serviceaccount-manager
-  readinessChecks:
-    workloads:
-      - group: apps
-        version: v1
-        kind: Deployment
-        selector:
-          app.kubernetes.io/instance: mc-auth-manager
-          app.kubernetes.io/name: cluster-auth-manager
-  chart:
-    name: cluster-auth-manager
-    namespace: multicluster-controlplane
-    createNamespace: {{ $.Values.helm.createNamespace }}
-    version: {{ dig "cluster-auth-manager" "version" "" $.Values.helm.releases }}
-    sourceRef:
-      kind: HelmRepository
-      name: appscode-charts-oci
-      namespace: {{ .Release.Namespace }}
-  valuesFrom:
-  {{- if eq (include "distro.openshift" $) "true" }}
-    - kind: ConfigMap
-      name: ace-openshift-scc
-      valuesKey: cluster-auth-manager.yaml
-  {{- end }}
-{{- with $vals }}
-  {{- dict "values" . | toYaml | nindent 2 }}
-{{- end }}
diff --git a/charts/opscenter-features/templates/featuresets/ocm-mc/cluster-gateway-manager.yaml b/charts/opscenter-features/templates/featuresets/ocm-mc/cluster-gateway-manager.yaml
deleted file mode 100644
index cf0adf153..000000000
--- a/charts/opscenter-features/templates/featuresets/ocm-mc/cluster-gateway-manager.yaml
+++ /dev/null
@@ -1,73 +0,0 @@
-{{ $defaults := printf `
-image: %s
-clusterGateway:
-  image: %s
-kubectl:
-  image: %s
-kubeconfigSecretName: multicluster-controlplane-svc-kubeconfig
-addonManagerNamespace: open-cluster-management-addon
-placement:
-  create: false
-clusterProxy:
-  credentials:
-    namespace: multicluster-controlplane
-`
-  (include "image.ghcr" (merge (dict "_repo" "kluster-manager/cluster-gateway-manager") $))
-  (include "image.ghcr" (merge (dict "_repo" "kluster-manager/cluster-gateway") $))
-  (include "kubectl.image" $)
-  | fromYaml }}
-
-{{ $vals := dig "cluster-gateway-manager" "values" (dict) .Values.helm.releases }}
-{{ $vals = mergeOverwrite $defaults $vals }}
-
-apiVersion: ui.k8s.appscode.com/v1alpha1
-kind: Feature
-metadata:
-  name: mc-gateway-manager
-  labels:
-    app.kubernetes.io/part-of: ocm-mc
-spec:
-  title: Cluster Gateway Manager
-  description: |
-    Deploy Cluster Gateway Manager
-  icons:
-    - src: https://cdn.appscode.com/k8s/icons/menu/cluster.svg
-      type: image/svg+xml
-  featureSet: ocm-mc
-  featureBlock: multicluster-controlplane
-  recommended: true
-  requirements:
-    features:
-      - multicluster-controlplane
-      - mc-profile-manager
-      - mc-serviceaccount-manager
-      - mc-proxy-manager
-  readinessChecks:
-    workloads:
-      - group: apps
-        version: v1
-        kind: Deployment
-        selector:
-          app.kubernetes.io/instance: mc-gateway-manager
-          app.kubernetes.io/name: cluster-gateway-manager
-  chart:
-    name: cluster-gateway-manager
-    namespace: multicluster-controlplane
-    createNamespace: {{ $.Values.helm.createNamespace }}
-    version: {{ dig "cluster-gateway-manager" "version" "" $.Values.helm.releases }}
-    sourceRef:
-      kind: HelmRepository
-      name: appscode-charts-oci
-      namespace: {{ .Release.Namespace }}
-  valuesFrom:
-    - kind: Secret
-      name: multicluster-ingress-values
-      valuesKey: gateway.yaml
-  {{- if eq (include "distro.openshift" $) "true" }}
-    - kind: ConfigMap
-      name: ace-openshift-scc
-      valuesKey: cluster-gateway-manager.yaml
-  {{- end }}
-{{- with $vals }}
-  {{- dict "values" . | toYaml | nindent 2 }}
-{{- end }}
diff --git a/charts/opscenter-features/templates/featuresets/ocm-mc/cluster-profile-manager.yaml b/charts/opscenter-features/templates/featuresets/ocm-mc/cluster-profile-manager.yaml
deleted file mode 100644
index 965aa94af..000000000
--- a/charts/opscenter-features/templates/featuresets/ocm-mc/cluster-profile-manager.yaml
+++ /dev/null
@@ -1,69 +0,0 @@
-{{ $defaults := printf `
-kubeconfigSecretName: multicluster-controlplane-svc-kubeconfig
-addonManagerNamespace: open-cluster-management-addon
-registryFQDN: %s
-manager:
-  image: %s
-kubectl:
-  image: %s
-helm:
-  createNamespace: %v
-`
-  (include "registry.ghcr" $)
-  (include "image.ghcr" (merge (dict "_repo" "kluster-manager/cluster-profile") $))
-  (include "kubectl.image" $)
-  $.Values.helm.createNamespace
-  | fromYaml }}
-
-{{ $vals :=  (omit $.Values "clusterMetadata") | deepCopy }}
-{{ $vals = mergeOverwrite $defaults $vals }}
-
-apiVersion: ui.k8s.appscode.com/v1alpha1
-kind: Feature
-metadata:
-  name: mc-profile-manager
-  labels:
-    app.kubernetes.io/part-of: ocm-mc
-spec:
-  title: Cluster Profile Manager
-  description: |
-    Deploy Cluster Profile Manager
-  icons:
-    - src: https://cdn.appscode.com/k8s/icons/menu/cluster.svg
-      type: image/svg+xml
-  featureSet: ocm-mc
-  featureBlock: multicluster-controlplane
-  recommended: true
-  requirements:
-    features:
-      - multicluster-controlplane
-  readinessChecks:
-    workloads:
-      - group: apps
-        version: v1
-        kind: Deployment
-        selector:
-          app.kubernetes.io/instance: mc-profile-manager
-          app.kubernetes.io/name: cluster-profile-manager
-  chart:
-    name: cluster-profile-manager
-    namespace: multicluster-controlplane
-    createNamespace: {{ $.Values.helm.createNamespace }}
-    version: {{ dig "cluster-profile-manager" "version" "" $.Values.helm.releases }}
-    sourceRef:
-      kind: HelmRepository
-      name: appscode-charts-oci
-      namespace: {{ .Release.Namespace }}
-  valuesFrom:
-    - kind: Secret
-      name: ace-features-cred
-      valuesKey: cluster-profile-manager.yaml
-      optional: true
-  {{- if eq (include "distro.openshift" $) "true" }}
-    - kind: ConfigMap
-      name: ace-openshift-scc
-      valuesKey: cluster-profile-manager.yaml
-  {{- end }}
-{{- with $vals }}
-  {{- dict "values" . | toYaml | nindent 2 }}
-{{- end }}
diff --git a/charts/opscenter-features/templates/featuresets/ocm-mc/cluster-proxy-manager.yaml b/charts/opscenter-features/templates/featuresets/ocm-mc/cluster-proxy-manager.yaml
deleted file mode 100644
index ec2061d55..000000000
--- a/charts/opscenter-features/templates/featuresets/ocm-mc/cluster-proxy-manager.yaml
+++ /dev/null
@@ -1,71 +0,0 @@
-{{ $defaults := printf `
-registry: %s
-proxyServerImage: %s
-proxyAgentImage: %s
-kubectl:
-  image: %s
-kubeconfigSecretName: multicluster-controlplane-svc-kubeconfig
-addonManagerNamespace: open-cluster-management-addon
-placement:
-  create: false
-proxyServer:
-  entrypointLoadBalancer: false
-`
-  (include "image.ghcr" (merge (dict "_repo" "kluster-manager") $))
-  (include "image.ghcr" (merge (dict "_repo" "kluster-manager/cluster-proxy") $))
-  (include "image.ghcr" (merge (dict "_repo" "kluster-manager/cluster-proxy") $))
-  (include "kubectl.image" $)
-  | fromYaml }}
-
-{{ $vals := dig "cluster-proxy-manager" "values" (dict) .Values.helm.releases }}
-{{ $vals = mergeOverwrite $defaults $vals }}
-
-apiVersion: ui.k8s.appscode.com/v1alpha1
-kind: Feature
-metadata:
-  name: mc-proxy-manager
-  labels:
-    app.kubernetes.io/part-of: ocm-mc
-spec:
-  title: Cluster Proxy Manager
-  description: |
-    Deploy Cluster Proxy Manager
-  icons:
-    - src: https://cdn.appscode.com/k8s/icons/menu/cluster.svg
-      type: image/svg+xml
-  featureSet: ocm-mc
-  featureBlock: multicluster-controlplane
-  recommended: true
-  requirements:
-    features:
-      - multicluster-controlplane
-      - mc-profile-manager
-  readinessChecks:
-    workloads:
-      - group: apps
-        version: v1
-        kind: Deployment
-        selector:
-          app.kubernetes.io/instance: mc-proxy-manager
-          app.kubernetes.io/name: cluster-proxy-manager
-  chart:
-    name: cluster-proxy-manager
-    namespace: multicluster-controlplane
-    createNamespace: {{ $.Values.helm.createNamespace }}
-    version: {{ dig "cluster-proxy-manager" "version" "" $.Values.helm.releases }}
-    sourceRef:
-      kind: HelmRepository
-      name: appscode-charts-oci
-      namespace: {{ .Release.Namespace }}
-  valuesFrom:
-    - kind: Secret
-      name: multicluster-ingress-values
-      valuesKey: proxy.yaml
-  {{- if eq (include "distro.openshift" $) "true" }}
-    - kind: ConfigMap
-      name: ace-openshift-scc
-      valuesKey: cluster-proxy-manager.yaml
-  {{- end }}
-{{- with $vals }}
-  {{- dict "values" . | toYaml | nindent 2 }}
-{{- end }}
diff --git a/charts/opscenter-features/templates/featuresets/ocm-mc/featureset.yaml b/charts/opscenter-features/templates/featuresets/ocm-mc/featureset.yaml
deleted file mode 100644
index 87aa27a8d..000000000
--- a/charts/opscenter-features/templates/featuresets/ocm-mc/featureset.yaml
+++ /dev/null
@@ -1,20 +0,0 @@
-apiVersion: ui.k8s.appscode.com/v1alpha1
-kind: FeatureSet
-metadata:
-  name: ocm-mc
-spec:
-  title: Multicluster Controlplane
-  description: |
-    Deploys a Multicluster Controlplane
-  icons:
-    - src: https://cdn.appscode.com/k8s/icons/menu/cluster.svg
-      type: image/svg+xml
-  recommended: false
-  chart:
-    name: uik8sappscodecom-featureset-ocm-mc-editor
-    version: {{ .Chart.AppVersion }}
-    sourceRef:
-      apiGroup: source.toolkit.fluxcd.io
-      kind: HelmRepository
-      name: appscode-charts-oci
-      namespace: {{ .Release.Namespace }}
diff --git a/charts/opscenter-features/templates/featuresets/ocm-mc/fluxcd-manager.yaml b/charts/opscenter-features/templates/featuresets/ocm-mc/fluxcd-manager.yaml
deleted file mode 100644
index 7d0c89cf3..000000000
--- a/charts/opscenter-features/templates/featuresets/ocm-mc/fluxcd-manager.yaml
+++ /dev/null
@@ -1,62 +0,0 @@
-{{ $defaults := printf `
-image: %s
-kubectl:
-  image: %s
-kubeconfigSecretName: multicluster-controlplane-svc-kubeconfig
-addonManagerNamespace: open-cluster-management-addon
-placement:
-  create: false
-`
-  (include "image.ghcr" (merge (dict "_repo" "kluster-manager/fluxcd-addon") $))
-  (include "kubectl.image" $)
-  | fromYaml }}
-
-{{ $vals := dig "fluxcd-manager" "values" (dict) .Values.helm.releases }}
-{{ $vals = mergeOverwrite $defaults $vals }}
-
-apiVersion: ui.k8s.appscode.com/v1alpha1
-kind: Feature
-metadata:
-  name: mc-fluxcd-manager
-  labels:
-    app.kubernetes.io/part-of: ocm-mc
-spec:
-  title: FluxCD Manager
-  description: |
-    Deploy FluxCD Manager
-  icons:
-    - src: https://cdn.appscode.com/k8s/icons/menu/cluster.svg
-      type: image/svg+xml
-  featureSet: ocm-mc
-  featureBlock: multicluster-controlplane
-  recommended: true
-  requirements:
-    features:
-      - multicluster-controlplane
-      - mc-profile-manager
-  readinessChecks:
-    workloads:
-      - group: apps
-        version: v1
-        kind: Deployment
-        selector:
-          app.kubernetes.io/instance: mc-fluxcd-manager
-          app.kubernetes.io/name: fluxcd-manager
-  chart:
-    name: fluxcd-manager
-    namespace: multicluster-controlplane
-    createNamespace: {{ $.Values.helm.createNamespace }}
-    version: {{ dig "fluxcd-manager" "version" "" $.Values.helm.releases }}
-    sourceRef:
-      kind: HelmRepository
-      name: appscode-charts-oci
-      namespace: {{ .Release.Namespace }}
-  valuesFrom:
-  {{- if eq (include "distro.openshift" $) "true" }}
-    - kind: ConfigMap
-      name: ace-openshift-scc
-      valuesKey: fluxcd-manager.yaml
-  {{- end }}
-{{- with $vals }}
-  {{- dict "values" . | toYaml | nindent 2 }}
-{{- end }}
diff --git a/charts/opscenter-features/templates/featuresets/ocm-mc/hub-cluster-robot.yaml b/charts/opscenter-features/templates/featuresets/ocm-mc/hub-cluster-robot.yaml
deleted file mode 100644
index 839ed855b..000000000
--- a/charts/opscenter-features/templates/featuresets/ocm-mc/hub-cluster-robot.yaml
+++ /dev/null
@@ -1,50 +0,0 @@
-{{ $defaults := printf `
-kubectl:
-  image: %s
-kubeconfigSecretName: multicluster-controlplane-svc-kubeconfig
-addonManagerNamespace: open-cluster-management
-`
-  (include "kubectl.image" $)
-  | fromYaml }}
-
-{{ $vals := dig "hub-cluster-robot" "values" (dict) .Values.helm.releases }}
-{{ $vals = mergeOverwrite $defaults $vals }}
-
-apiVersion: ui.k8s.appscode.com/v1alpha1
-kind: Feature
-metadata:
-  name: mc-cluster-robot
-  labels:
-    app.kubernetes.io/part-of: ocm-mc
-spec:
-  title: Hub Cluster Robot
-  description: |
-    Deploy Hub Cluster Robot
-  icons:
-    - src: https://cdn.appscode.com/k8s/icons/menu/cluster.svg
-      type: image/svg+xml
-  featureSet: ocm-mc
-  featureBlock: multicluster-controlplane
-  recommended: true
-  requirements:
-    features:
-      - multicluster-controlplane
-      - mc-auth-manager
-  chart:
-    name: hub-cluster-robot
-    namespace: multicluster-controlplane
-    createNamespace: {{ $.Values.helm.createNamespace }}
-    version: {{ dig "hub-cluster-robot" "version" "" $.Values.helm.releases }}
-    sourceRef:
-      kind: HelmRepository
-      name: appscode-charts-oci
-      namespace: {{ .Release.Namespace }}
-  valuesFrom:
-  {{- if eq (include "distro.openshift" $) "true" }}
-    - kind: ConfigMap
-      name: ace-openshift-scc
-      valuesKey: hub-cluster-robot.yaml
-  {{- end }}
-{{- with $vals }}
-  {{- dict "values" . | toYaml | nindent 2 }}
-{{- end }}
diff --git a/charts/opscenter-features/templates/featuresets/ocm-mc/ingress-nginx.yaml b/charts/opscenter-features/templates/featuresets/ocm-mc/ingress-nginx.yaml
deleted file mode 100644
index 55387e3e9..000000000
--- a/charts/opscenter-features/templates/featuresets/ocm-mc/ingress-nginx.yaml
+++ /dev/null
@@ -1,77 +0,0 @@
-{{ $defaults := printf `
-controller:
-  image:
-    registry: %s
-  opentelemetry:
-    image:
-      registry: %s
-  admissionWebhooks:
-    enabled: false
-  ingressClassByName: true
-  ingressClassResource:
-    controllerValue: open-cluster-management.io/ingress
-    enabled: true
-    name: ocm-ingress
-  service:
-    enableHttp: false
-    enableHttps: false
-defaultBackend:
-  image:
-    registry: %s
-tcp:
-  "8090": multicluster-controlplane/proxy-entrypoint:8090
-  "8091": multicluster-controlplane/proxy-entrypoint:8091
-  "9443": multicluster-controlplane/multicluster-controlplane:443
-`
-  (include "registry.kubernetes" $)
-  (include "registry.kubernetes" $)
-  (include "registry.kubernetes" $)
-  | fromYaml }}
-
-{{ $vals := dig "ingress-nginx" "values" (dict) .Values.helm.releases }}
-{{ $vals = mergeOverwrite $defaults $vals }}
-
-apiVersion: ui.k8s.appscode.com/v1alpha1
-kind: Feature
-metadata:
-  name: ingress-nginx-mc
-  labels:
-    app.kubernetes.io/part-of: ocm-mc
-spec:
-  title: Multicluster Controlplane Ingress
-  description: |
-    Deploy Multicluster Controlplane Ingress Controller
-  icons:
-    - src: https://cdn.appscode.com/k8s/icons/menu/cluster.svg
-      type: image/svg+xml
-  featureSet: ocm-mc
-  featureBlock: multicluster-controlplane
-  recommended: true
-  readinessChecks:
-    workloads:
-      - group: apps
-        version: v1
-        kind: Deployment
-        selector:
-          app.kubernetes.io/component: controller
-          app.kubernetes.io/instance: ingress-nginx-mc
-          app.kubernetes.io/name: ingress-nginx
-          app.kubernetes.io/part-of: ingress-nginx
-  chart:
-    name: ingress-nginx
-    namespace: multicluster-controlplane
-    createNamespace: {{ $.Values.helm.createNamespace }}
-    version: {{ dig "ingress-nginx" "version" "" $.Values.helm.releases }}
-    sourceRef:
-      kind: HelmRepository
-      name: appscode-charts-oci
-      namespace: {{ .Release.Namespace }}
-  valuesFrom:
-  {{- if eq (include "distro.openshift" $) "true" }}
-    - kind: ConfigMap
-      name: ace-openshift-scc
-      valuesKey: ingress-nginx.yaml
-  {{- end }}
-{{- with $vals }}
-  {{- dict "values" . | toYaml | nindent 2 }}
-{{- end }}
diff --git a/charts/opscenter-features/templates/featuresets/ocm-mc/kube-ui-server.yaml b/charts/opscenter-features/templates/featuresets/ocm-mc/kube-ui-server.yaml
deleted file mode 100644
index 872f4d2f0..000000000
--- a/charts/opscenter-features/templates/featuresets/ocm-mc/kube-ui-server.yaml
+++ /dev/null
@@ -1,60 +0,0 @@
-{{ $defaults := printf `
-registryFQDN: %s
-kubeconfigSecretName: multicluster-controlplane-svc-kubeconfig
-addonManagerNamespace: open-cluster-management-addon
-` (include "registry.ghcr" $)
-  | fromYaml }}
-
-{{ $vals := dig "kube-ui-server" "values" (dict) .Values.helm.releases }}
-{{ $vals = mergeOverwrite $defaults $vals }}
-
-apiVersion: ui.k8s.appscode.com/v1alpha1
-kind: Feature
-metadata:
-  name: kube-ui-server-mc
-  labels:
-    app.kubernetes.io/part-of: ocm-mc
-spec:
-  title: Multicluster Controlplane UI Server
-  description: |
-    Multicluster Controlplane UI Server provides the APIs required for cluster ui
-  icons:
-  - src: https://cdn.appscode.com/k8s/icons/menu/cluster.svg
-    type: image/svg+xml
-  featureSet: ocm-mc
-  featureBlock: multicluster-controlplane
-  recommended: true
-  requirements:
-    features:
-      - multicluster-controlplane
-      - mc-profile-manager
-  readinessChecks:
-    workloads:
-    - group: apps
-      version: v1
-      kind: Deployment
-      selector:
-        app.kubernetes.io/name: kube-ui-server
-        app.kubernetes.io/instance: kube-ui-server-mc
-  chart:
-    name: kube-ui-server
-    namespace: multicluster-controlplane
-    createNamespace: {{ $.Values.helm.createNamespace }}
-    version: {{ dig "kube-ui-server" "version" "" $.Values.helm.releases }}
-    sourceRef:
-      kind: HelmRepository
-      name: appscode-charts-oci
-      namespace: {{ .Release.Namespace }}
-  valuesFrom:
-    - kind: Secret
-      name: ace-features-cred
-      valuesKey: kube-ui-server.yaml
-      optional: true
-  {{- if eq (include "distro.openshift" $) "true" }}
-    - kind: ConfigMap
-      name: ace-openshift-scc
-      valuesKey: kube-ui-server.yaml
-  {{- end }}
-{{- with $vals }}
-  {{- dict "values" . | toYaml | nindent 2 }}
-{{- end }}
diff --git a/charts/opscenter-features/templates/featuresets/ocm-mc/license-proxyserver-manager.yaml b/charts/opscenter-features/templates/featuresets/ocm-mc/license-proxyserver-manager.yaml
deleted file mode 100644
index fbd0dc198..000000000
--- a/charts/opscenter-features/templates/featuresets/ocm-mc/license-proxyserver-manager.yaml
+++ /dev/null
@@ -1,68 +0,0 @@
-{{ $defaults := printf `
-registryFQDN: %s
-image: %s
-kubectl:
-  image: %s
-kubeconfigSecretName: multicluster-controlplane-svc-kubeconfig
-addonManagerNamespace: open-cluster-management-addon
-placement:
-  create: false
-`
-  (include "registry.ghcr" $)
-  (include "image.ghcr" (merge (dict "_repo" "appscode/license-proxyserver") $))
-  (include "kubectl.image" $)
-  | fromYaml }}
-
-{{ $vals := dig "license-proxyserver-manager" "values" (dict) .Values.helm.releases }}
-{{ $vals = mergeOverwrite $defaults $vals }}
-
-apiVersion: ui.k8s.appscode.com/v1alpha1
-kind: Feature
-metadata:
-  name: mc-license-manager
-  labels:
-    app.kubernetes.io/part-of: ocm-mc
-spec:
-  title: License Proxyserver Manager
-  description: |
-    Deploy license-proxyserver-manager
-  icons:
-    - src: https://cdn.appscode.com/k8s/icons/menu/cluster.svg
-      type: image/svg+xml
-  featureSet: ocm-mc
-  featureBlock: multicluster-controlplane
-  recommended: true
-  requirements:
-    features:
-      - multicluster-controlplane
-      - mc-profile-manager
-  readinessChecks:
-    workloads:
-      - group: apps
-        version: v1
-        kind: Deployment
-        selector:
-          app.kubernetes.io/instance: mc-license-manager
-          app.kubernetes.io/name: license-proxyserver-manager
-  chart:
-    name: license-proxyserver-manager
-    namespace: multicluster-controlplane
-    createNamespace: {{ $.Values.helm.createNamespace }}
-    version: {{ dig "license-proxyserver-manager" "version" "" $.Values.helm.releases }}
-    sourceRef:
-      kind: HelmRepository
-      name: appscode-charts-oci
-      namespace: {{ .Release.Namespace }}
-  valuesFrom:
-    - kind: Secret
-      name: ace-licenseserver-cred
-      valuesKey: license-proxyserver-manager.yaml
-      optional: true
-  {{- if eq (include "distro.openshift" $) "true" }}
-    - kind: ConfigMap
-      name: ace-openshift-scc
-      valuesKey: license-proxyserver-manager.yaml
-  {{- end }}
-{{- with $vals }}
-  {{- dict "values" . | toYaml | nindent 2 }}
-{{- end }}
diff --git a/charts/opscenter-features/templates/featuresets/ocm-mc/managed-serviceaccount-manager.yaml b/charts/opscenter-features/templates/featuresets/ocm-mc/managed-serviceaccount-manager.yaml
deleted file mode 100644
index 0bbf1c9de..000000000
--- a/charts/opscenter-features/templates/featuresets/ocm-mc/managed-serviceaccount-manager.yaml
+++ /dev/null
@@ -1,62 +0,0 @@
-{{ $defaults := printf `
-image: %s
-kubectl:
-  image: %s
-kubeconfigSecretName: multicluster-controlplane-svc-kubeconfig
-addonManagerNamespace: open-cluster-management-addon
-placement:
-  create: false
-`
-  (include "image.ghcr" (merge (dict "_repo" "kluster-manager/managed-serviceaccount") $))
-  (include "kubectl.image" $)
-  | fromYaml }}
-
-{{ $vals := dig "managed-serviceaccount-manager" "values" (dict) .Values.helm.releases }}
-{{ $vals = mergeOverwrite $defaults $vals }}
-
-apiVersion: ui.k8s.appscode.com/v1alpha1
-kind: Feature
-metadata:
-  name: mc-serviceaccount-manager
-  labels:
-    app.kubernetes.io/part-of: ocm-mc
-spec:
-  title: Managed ServiceAccount Manager
-  description: |
-    Deploy Managed ServiceAccount Manager
-  icons:
-    - src: https://cdn.appscode.com/k8s/icons/menu/cluster.svg
-      type: image/svg+xml
-  featureSet: ocm-mc
-  featureBlock: multicluster-controlplane
-  recommended: true
-  requirements:
-    features:
-      - multicluster-controlplane
-      - mc-profile-manager
-  readinessChecks:
-    workloads:
-      - group: apps
-        version: v1
-        kind: Deployment
-        selector:
-          app.kubernetes.io/instance: mc-serviceaccount-manager
-          app.kubernetes.io/name: managed-serviceaccount-manager
-  chart:
-    name: managed-serviceaccount-manager
-    namespace: multicluster-controlplane
-    createNamespace: {{ $.Values.helm.createNamespace }}
-    version: {{ dig "managed-serviceaccount-manager" "version" "" $.Values.helm.releases }}
-    sourceRef:
-      kind: HelmRepository
-      name: appscode-charts-oci
-      namespace: {{ .Release.Namespace }}
-  valuesFrom:
-  {{- if eq (include "distro.openshift" $) "true" }}
-    - kind: ConfigMap
-      name: ace-openshift-scc
-      valuesKey: managed-serviceaccount-manager.yaml
-  {{- end }}
-{{- with $vals }}
-  {{- dict "values" . | toYaml | nindent 2 }}
-{{- end }}
diff --git a/charts/opscenter-features/templates/featuresets/ocm-mc/multicluster-controlplane.yaml b/charts/opscenter-features/templates/featuresets/ocm-mc/multicluster-controlplane.yaml
deleted file mode 100644
index e0da5fde4..000000000
--- a/charts/opscenter-features/templates/featuresets/ocm-mc/multicluster-controlplane.yaml
+++ /dev/null
@@ -1,77 +0,0 @@
-{{ $defaults := printf `
-registry: %q
-image: %s:v0.6.0
-selfManagementClusterName: %q
-apiserver:
-  generateCA: true
-enableSelfManagement: true
-autoApprovalBootstrapUsers: "system:admin"
-features: DefaultClusterSet=true,ManagedClusterAutoApproval=true,ManifestWorkReplicaSet=true
-imagePullPolicy: Always
-loadbalancer:
-  enabled: false
-pvc:
-  storageClassName: ""
-route:
-  enabled: false
-securityContext:
-  fsGroup: 10001
-  runAsGroup: 10001
-  runAsUser: 10001
-`
-  (include "image.ghcr" (merge (dict "_repo" "kluster-manager") $))
-  (include "image.ghcr" (merge (dict "_repo" "kluster-manager/multicluster-controlplane") $))
-  $.Values.clusterMetadata.name
-  | fromYaml }}
-
-{{ $vals := dig "multicluster-controlplane" "values" (dict) .Values.helm.releases }}
-{{ $vals = mergeOverwrite $defaults $vals }}
-
-apiVersion: ui.k8s.appscode.com/v1alpha1
-kind: Feature
-metadata:
-  name: multicluster-controlplane
-  labels:
-    app.kubernetes.io/part-of: ocm-mc
-spec:
-  title: Multicluster Controlplane
-  description: |
-    Deploy Multicluster Controlplane
-  icons:
-    - src: https://cdn.appscode.com/k8s/icons/menu/cluster.svg
-      type: image/svg+xml
-  featureSet: ocm-mc
-  featureBlock: multicluster-controlplane
-  recommended: true
-  requirements:
-    features:
-      - multicluster-ingress-reader
-  readinessChecks:
-    workloads:
-      - group: apps
-        version: v1
-        kind: Deployment
-        selector:
-          app.kubernetes.io/instance: multicluster-controlplane
-          app.kubernetes.io/name: multicluster-controlplane
-  chart:
-    name: multicluster-controlplane
-    namespace: multicluster-controlplane
-    createNamespace: {{ $.Values.helm.createNamespace }}
-    version: {{ dig "multicluster-controlplane" "version" "" $.Values.helm.releases }}
-    sourceRef:
-      kind: HelmRepository
-      name: appscode-charts-oci
-      namespace: {{ .Release.Namespace }}
-  valuesFrom:
-    - kind: Secret
-      name: multicluster-ingress-values
-      valuesKey: mc.yaml
-  {{- if eq (include "distro.openshift" $) "true" }}
-    - kind: ConfigMap
-      name: ace-openshift-scc
-      valuesKey: multicluster-controlplane.yaml
-  {{- end }}
-{{- with $vals }}
-  {{- dict "values" . | toYaml | nindent 2 }}
-{{- end }}
diff --git a/charts/opscenter-features/templates/featuresets/ocm-mc/multicluster-ingress-reader.yaml b/charts/opscenter-features/templates/featuresets/ocm-mc/multicluster-ingress-reader.yaml
deleted file mode 100644
index c329daa19..000000000
--- a/charts/opscenter-features/templates/featuresets/ocm-mc/multicluster-ingress-reader.yaml
+++ /dev/null
@@ -1,58 +0,0 @@
-{{ $defaults := printf `
-kubectl:
-  image: %s
-secret:
-  namespace: %s
-`
-  (include "kubectl.image" $)
-  $.Release.Namespace
-  | fromYaml }}
-
-{{ $vals := dig "multicluster-ingress-reader" "values" (dict) .Values.helm.releases }}
-{{ $vals = mergeOverwrite $defaults $vals }}
-
-apiVersion: ui.k8s.appscode.com/v1alpha1
-kind: Feature
-metadata:
-  name: multicluster-ingress-reader
-  labels:
-    app.kubernetes.io/part-of: ocm-mc
-spec:
-  title: Multicluster Ingress Reader
-  description: |
-    Generate Multicluster Ingress Values ConfigMap
-  icons:
-    - src: https://cdn.appscode.com/k8s/icons/menu/cluster.svg
-      type: image/svg+xml
-  featureSet: ocm-mc
-  featureBlock: multicluster-controlplane
-  recommended: true
-  requirements:
-    features:
-      - ingress-nginx-mc
-  readinessChecks:
-    workloads:
-      - group: ""
-        version: v1
-        kind: Secret
-        selector:
-          app.kubernetes.io/instance: multicluster-ingress-reader
-          app.kubernetes.io/name: multicluster-ingress-reader
-  chart:
-    name: multicluster-ingress-reader
-    namespace: multicluster-controlplane
-    createNamespace: {{ $.Values.helm.createNamespace }}
-    version: {{ dig "multicluster-ingress-reader" "version" "" $.Values.helm.releases }}
-    sourceRef:
-      kind: HelmRepository
-      name: appscode-charts-oci
-      namespace: {{ .Release.Namespace }}
-  valuesFrom:
-  {{- if eq (include "distro.openshift" $) "true" }}
-    - kind: ConfigMap
-      name: ace-openshift-scc
-      valuesKey: multicluster-ingress-reader.yaml
-  {{- end }}
-{{- with $vals }}
-  {{- dict "values" . | toYaml | nindent 2 }}
-{{- end }}
diff --git a/features.md b/features.md
index 7b2a617f4..f3f8fc3eb 100644
--- a/features.md
+++ b/features.md
@@ -22,28 +22,6 @@ graph TD;
   license-proxyserver-manager-->cluster-manager-hub;
   license-proxyserver-manager-->cluster-profile-manager;
   managed-serviceaccount-manager-->cluster-manager-hub;
-  mc-auth-manager-->multicluster-controlplane;
-  mc-auth-manager-->mc-profile-manager;
-  mc-auth-manager-->mc-serviceaccount-manager;
-  mc-gateway-manager-->multicluster-controlplane;
-  mc-gateway-manager-->mc-profile-manager;
-  mc-gateway-manager-->mc-serviceaccount-manager;
-  mc-gateway-manager-->mc-proxy-manager;
-  mc-profile-manager-->multicluster-controlplane;
-  mc-proxy-manager-->multicluster-controlplane;
-  mc-proxy-manager-->mc-profile-manager;
-  mc-fluxcd-manager-->multicluster-controlplane;
-  mc-fluxcd-manager-->mc-profile-manager;
-  mc-cluster-robot-->multicluster-controlplane;
-  mc-cluster-robot-->mc-auth-manager;
-  kube-ui-server-mc-->multicluster-controlplane;
-  kube-ui-server-mc-->mc-profile-manager;
-  mc-license-manager-->multicluster-controlplane;
-  mc-license-manager-->mc-profile-manager;
-  mc-serviceaccount-manager-->multicluster-controlplane;
-  mc-serviceaccount-manager-->mc-profile-manager;
-  multicluster-controlplane-->multicluster-ingress-reader;
-  multicluster-ingress-reader-->ingress-nginx-mc;
   kubestash-->license-proxyserver;
   stash-opscenter-->stash;
   stash-opscenter-->panopticon;
diff --git a/hack/scripts/import-crds.sh b/hack/scripts/import-crds.sh
index f1c13db43..35cb03a47 100755
--- a/hack/scripts/import-crds.sh
+++ b/hack/scripts/import-crds.sh
@@ -28,7 +28,7 @@ KUBEOPS_PETSET_TAG=${KUBEOPS_PETSET_TAG:-v0.0.16}
 KUBERNETES_SIGS_GATEWAY_API_TAG=${KUBERNETES_SIGS_GATEWAY_API_TAG:-v1.4.1}
 KUBESTASH_APIMACHINERY_TAG=${KUBESTASH_APIMACHINERY_TAG:-v0.23.0}
 KUBEVAULT_APIMACHINERY_TAG=${KUBEVAULT_APIMACHINERY_TAG:-v0.23.0}
-OPEN_CLUSTER_MANAGEMENT_IO_API_TAG=${OPEN_CLUSTER_MANAGEMENT_IO_API_TAG:-v1.1.0}
+OPEN_CLUSTER_MANAGEMENT_IO_API_TAG=${OPEN_CLUSTER_MANAGEMENT_IO_API_TAG:-v1.2.0}
 PROMETHEUS_OPERATOR_PROMETHEUS_OPERATOR=${PROMETHEUS_OPERATOR_PROMETHEUS_OPERATOR:-v0.87.1}
 X_HELM_APIMACHINERY_TAG=${X_HELM_APIMACHINERY_TAG:-v0.0.18}