diff --git a/charts/kubedb-crds/crds/ops.kubedb.com_pgbounceropsrequests.yaml b/charts/kubedb-crds/crds/ops.kubedb.com_pgbounceropsrequests.yaml
index 8c144cb39..d4d29fb75 100644
--- a/charts/kubedb-crds/crds/ops.kubedb.com_pgbounceropsrequests.yaml
+++ b/charts/kubedb-crds/crds/ops.kubedb.com_pgbounceropsrequests.yaml
@@ -78,6 +78,13 @@ spec:
                 required:
                 - pgbouncer
                 type: object
+              databaseRef:
+                properties:
+                  name:
+                    default: ""
+                    type: string
+                type: object
+                x-kubernetes-map-type: atomic
               horizontalScaling:
                 properties:
                   replicas:
@@ -86,13 +93,6 @@ spec:
                 type: object
               restart:
                 type: object
-              serverRef:
-                properties:
-                  name:
-                    default: ""
-                    type: string
-                type: object
-                x-kubernetes-map-type: atomic
               timeout:
                 type: string
               tls:
@@ -297,7 +297,7 @@ spec:
                     type: object
                 type: object
             required:
-            - serverRef
+            - databaseRef
             - type
             type: object
           status:
diff --git a/charts/kubedb-crds/crds/postgres.kubedb.com_publishers.yaml b/charts/kubedb-crds/crds/postgres.kubedb.com_publishers.yaml
index 8f381620b..34a427178 100644
--- a/charts/kubedb-crds/crds/postgres.kubedb.com_publishers.yaml
+++ b/charts/kubedb-crds/crds/postgres.kubedb.com_publishers.yaml
@@ -110,6 +110,13 @@ spec:
                 type: object
               databaseName:
                 type: string
+              databaseRef:
+                properties:
+                  name:
+                    default: ""
+                    type: string
+                type: object
+                x-kubernetes-map-type: atomic
               deletionPolicy:
                 default: Delete
                 enum:
@@ -136,21 +143,14 @@ spec:
                 type: object
               publishAllTables:
                 type: boolean
-              serverRef:
-                properties:
-                  name:
-                    default: ""
-                    type: string
-                type: object
-                x-kubernetes-map-type: atomic
               tables:
                 items:
                   type: string
                 type: array
             required:
             - databaseName
+            - databaseRef
             - name
-            - serverRef
             type: object
           status:
             properties:
diff --git a/charts/kubedb-crds/crds/postgres.kubedb.com_subscribers.yaml b/charts/kubedb-crds/crds/postgres.kubedb.com_subscribers.yaml
index 43aecb7b8..61cc14680 100644
--- a/charts/kubedb-crds/crds/postgres.kubedb.com_subscribers.yaml
+++ b/charts/kubedb-crds/crds/postgres.kubedb.com_subscribers.yaml
@@ -40,6 +40,13 @@ spec:
             properties:
               databaseName:
                 type: string
+              databaseRef:
+                properties:
+                  name:
+                    default: ""
+                    type: string
+                type: object
+                x-kubernetes-map-type: atomic
               deletionPolicy:
                 default: Delete
                 enum:
@@ -112,18 +119,11 @@ spec:
                     - refs
                     type: object
                 type: object
-              serverRef:
-                properties:
-                  name:
-                    default: ""
-                    type: string
-                type: object
-                x-kubernetes-map-type: atomic
             required:
             - databaseName
+            - databaseRef
             - name
             - publisher
-            - serverRef
             type: object
           status:
             properties:
diff --git a/crds/kubedb-crds.yaml b/crds/kubedb-crds.yaml
index 0b2eb79a3..ca44b4fc6 100644
--- a/crds/kubedb-crds.yaml
+++ b/crds/kubedb-crds.yaml
@@ -368797,6 +368797,13 @@ spec:
                 required:
                 - pgbouncer
                 type: object
+              databaseRef:
+                properties:
+                  name:
+                    default: ""
+                    type: string
+                type: object
+                x-kubernetes-map-type: atomic
               horizontalScaling:
                 properties:
                   replicas:
@@ -368805,13 +368812,6 @@ spec:
                 type: object
               restart:
                 type: object
-              serverRef:
-                properties:
-                  name:
-                    default: ""
-                    type: string
-                type: object
-                x-kubernetes-map-type: atomic
               timeout:
                 type: string
               tls:
@@ -369016,7 +369016,7 @@ spec:
                     type: object
                 type: object
             required:
-            - serverRef
+            - databaseRef
             - type
             type: object
           status:
@@ -372985,6 +372985,13 @@ spec:
                 type: object
               databaseName:
                 type: string
+              databaseRef:
+                properties:
+                  name:
+                    default: ""
+                    type: string
+                type: object
+                x-kubernetes-map-type: atomic
               deletionPolicy:
                 default: Delete
                 enum:
@@ -373011,21 +373018,14 @@ spec:
                 type: object
               publishAllTables:
                 type: boolean
-              serverRef:
-                properties:
-                  name:
-                    default: ""
-                    type: string
-                type: object
-                x-kubernetes-map-type: atomic
               tables:
                 items:
                   type: string
                 type: array
             required:
             - databaseName
+            - databaseRef
             - name
-            - serverRef
             type: object
           status:
             properties:
@@ -373125,6 +373125,13 @@ spec:
             properties:
               databaseName:
                 type: string
+              databaseRef:
+                properties:
+                  name:
+                    default: ""
+                    type: string
+                type: object
+                x-kubernetes-map-type: atomic
               deletionPolicy:
                 default: Delete
                 enum:
@@ -373197,18 +373204,11 @@ spec:
                     - refs
                     type: object
                 type: object
-              serverRef:
-                properties:
-                  name:
-                    default: ""
-                    type: string
-                type: object
-                x-kubernetes-map-type: atomic
             required:
             - databaseName
+            - databaseRef
             - name
             - publisher
-            - serverRef
             type: object
           status:
             properties: