diff --git a/charts/ceph-s3-operator/Chart.yaml b/charts/ceph-s3-operator/Chart.yaml
index e76cb6a..cb472f0 100644
--- a/charts/ceph-s3-operator/Chart.yaml
+++ b/charts/ceph-s3-operator/Chart.yaml
@@ -18,4 +18,4 @@ version: 0.3.0
 # incremented each time you make changes to the application. Versions are not expected to
 # follow Semantic Versioning. They should reflect the version the application is using.
 # It is recommended to use it with quotes.
-appVersion: "v0.3.6"
+appVersion: "v0.3.7"
diff --git a/charts/ceph-s3-operator/templates/s3bucket-crd.yaml b/charts/ceph-s3-operator/templates/s3bucket-crd.yaml
index a0ec009..5aebb25 100644
--- a/charts/ceph-s3-operator/templates/s3bucket-crd.yaml
+++ b/charts/ceph-s3-operator/templates/s3bucket-crd.yaml
@@ -24,7 +24,7 @@ spec:
     name: v1alpha1
     schema:
       openAPIV3Schema:
-        description: S3Bucket is the Schema for the s3buckets API
+        description: S3 Bucket Instance
         properties:
           apiVersion:
             description: 'APIVersion defines the versioned schema of this representation
diff --git a/charts/ceph-s3-operator/templates/s3user-crd.yaml b/charts/ceph-s3-operator/templates/s3user-crd.yaml
index b697af9..a717640 100644
--- a/charts/ceph-s3-operator/templates/s3user-crd.yaml
+++ b/charts/ceph-s3-operator/templates/s3user-crd.yaml
@@ -40,6 +40,8 @@ spec:
     name: v1alpha1
     schema:
       openAPIV3Schema:
+        description: S3 User is created by the S3 User Claim instance. It's not applicable
+          for the operator user.
         properties:
           apiVersion:
             description: 'APIVersion defines the versioned schema of this representation
diff --git a/charts/ceph-s3-operator/templates/s3userclaim-crd.yaml b/charts/ceph-s3-operator/templates/s3userclaim-crd.yaml
index 7b6dc3a..cbadeda 100644
--- a/charts/ceph-s3-operator/templates/s3userclaim-crd.yaml
+++ b/charts/ceph-s3-operator/templates/s3userclaim-crd.yaml
@@ -39,6 +39,7 @@ spec:
     name: v1alpha1
     schema:
       openAPIV3Schema:
+        description: S3 User Claim Instance
         properties:
           apiVersion:
             description: 'APIVersion defines the versioned schema of this representation