diff --git a/helm-charts/templates/crds/dp.wso2.com_apis.yaml b/helm-charts/templates/crds/dp.wso2.com_apis.yaml
index 04c41c643..399c0c01f 100644
--- a/helm-charts/templates/crds/dp.wso2.com_apis.yaml
+++ b/helm-charts/templates/crds/dp.wso2.com_apis.yaml
@@ -7,6 +7,7 @@ metadata:
     cert-manager.io/inject-ca-from: {{ .Release.Namespace }}/{{ template "apk-helm.resource.prefix" . }}-common-controller-server-cert
   name: apis.dp.wso2.com
 spec:
+  {{- if .Values.wso2.apk.webhooks.conversionwebhookconfigurations }}
   conversion:
       strategy: Webhook
       webhook:
@@ -17,6 +18,7 @@ spec:
             path: /convert
         conversionReviewVersions:
         - v1
+  {{- end }}
   group: dp.wso2.com
   names:
     kind: API
diff --git a/helm-charts/values.yaml b/helm-charts/values.yaml
index 0ca8fce49..02dd78d35 100644
--- a/helm-charts/values.yaml
+++ b/helm-charts/values.yaml
@@ -22,6 +22,7 @@ wso2:
     webhooks:
       validatingwebhookconfigurations: true
       mutatingwebhookconfigurations: true
+      conversionwebhookconfigurations: true
     auth:
       enabled: true
       enableServiceAccountCreation: true
@@ -250,6 +251,9 @@ wso2:
 #                skipSSLVerification: false
 #                hostnameVerifier: "AllowAll"
 
+    cp:
+      enabled: false
+
     metrics:
       enabled: false
       # configDSBalHost: 0.0.0.0
diff --git a/helm-charts/values.yaml.template b/helm-charts/values.yaml.template
index 9750b0a7e..16f657634 100644
--- a/helm-charts/values.yaml.template
+++ b/helm-charts/values.yaml.template
@@ -24,6 +24,7 @@ wso2:
     webhooks:
       validatingwebhookconfigurations : true
       mutatingwebhookconfigurations : true
+      conversionwebhookconfigurations : true
     auth:
       # -- Enable Service Account Creation
       enabled: true