diff --git a/common-go-libs/apis/dp/v1alpha2/api_types.go b/common-go-libs/apis/dp/v1alpha2/api_types.go
index 4579e5e0b..f86f9873d 100644
--- a/common-go-libs/apis/dp/v1alpha2/api_types.go
+++ b/common-go-libs/apis/dp/v1alpha2/api_types.go
@@ -95,6 +95,7 @@ type APISpec struct {
 	// Organization denotes the organization.
 	// related to the API
 	//
+	// +kubebuilder:default:=default
 	// +optional
 	Organization string `json:"organization"`
 
diff --git a/common-go-libs/apis/dp/v1alpha2/apipolicy_types.go b/common-go-libs/apis/dp/v1alpha2/apipolicy_types.go
index c92ad8bdc..97058433e 100644
--- a/common-go-libs/apis/dp/v1alpha2/apipolicy_types.go
+++ b/common-go-libs/apis/dp/v1alpha2/apipolicy_types.go
@@ -60,7 +60,7 @@ type PolicySpec struct {
 	//
 	// +kubebuilder:default:=false
 	// +optional
-	SubscriptionValidation bool `json:"subscriptionValidation,omitempty"`
+	SubscriptionValidation bool `json:"subscriptionValidation"`
 }
 
 // BackendJWTToken holds backend JWT token information
@@ -76,7 +76,7 @@ type CORSPolicy struct {
 	//
 	// +kubebuilder:default=true
 	// +optional
-	Enabled bool `json:"enabled,omitempty"`
+	Enabled bool `json:"enabled"`
 
 	// AllowCredentials indicates whether the request can include user credentials like
 	// cookies, HTTP authentication or client side SSL certificates.
diff --git a/common-go-libs/config/crd/bases/dp.wso2.com_apis.yaml b/common-go-libs/config/crd/bases/dp.wso2.com_apis.yaml
index 7846de3ca..fd4dc65a3 100644
--- a/common-go-libs/config/crd/bases/dp.wso2.com_apis.yaml
+++ b/common-go-libs/config/crd/bases/dp.wso2.com_apis.yaml
@@ -276,6 +276,7 @@ spec:
                   be used as a default API
                 type: boolean
               organization:
+                default: default
                 description: Organization denotes the organization. related to the
                   API
                 type: string
diff --git a/helm-charts/templates/crds/dp.wso2.com_apis.yaml b/helm-charts/templates/crds/dp.wso2.com_apis.yaml
index 399c0c01f..935ae56f3 100644
--- a/helm-charts/templates/crds/dp.wso2.com_apis.yaml
+++ b/helm-charts/templates/crds/dp.wso2.com_apis.yaml
@@ -289,6 +289,7 @@ spec:
                   be used as a default API
                 type: boolean
               organization:
+                default: default
                 description: Organization denotes the organization. related to the
                   API
                 type: string