diff --git a/Makefile b/Makefile
index c64b8f35..85ccab9c 100644
--- a/Makefile
+++ b/Makefile
@@ -46,7 +46,7 @@ config:
 
 crds:
 	mkdir -p deploy/helm/superset-operator/crds
-	cat deploy/crd/*.yaml | yq eval '.metadata.annotations["helm.sh/resource-policy"]="keep"' - > deploy/helm/superset-operator/crds/crds.yaml
+	cargo run crd | yq eval '.metadata.annotations["helm.sh/resource-policy"]="keep"' - > deploy/helm/superset-operator/crds/crds.yaml
 
 chart-lint: compile-chart
 	docker run -it -v $(shell pwd):/build/helm-charts -w /build/helm-charts quay.io/helmpack/chart-testing:v3.5.0  ct lint --config deploy/helm/ct.yaml
@@ -59,11 +59,4 @@ clean-manifests:
 generate-manifests: clean-manifests compile-chart
 	./scripts/generate-manifests.sh
 
-clean-crds:
-	rm -rf deploy/crd/*
-
-generate-crds:
-	touch rust/operator-binary/build.rs
-	cargo build
-
-regenerate-charts: clean-crds chart-clean clean-manifests generate-crds compile-chart generate-manifests
+regenerate-charts: chart-clean clean-manifests compile-chart generate-manifests
diff --git a/deploy/helm/superset-operator/README.md b/deploy/helm/superset-operator/README.md
index 9fc1e73a..64dd71a1 100644
--- a/deploy/helm/superset-operator/README.md
+++ b/deploy/helm/superset-operator/README.md
@@ -20,8 +20,9 @@ helm install superset-operator deploy/helm/superset-operator
 
 The usage of this operator and its CRDs is described in the [documentation](https://docs.stackable.tech/superset/index.html)
 
-The operator has example requests included in the [`/examples`](https://github.com/stackabletech/superset/operator/tree/main/examples) directory.
+The operator has example requests included in the [`/examples`](https://github.com/stackabletech/superset-operator/tree/main/examples) directory.
 
 ## Links
 
 https://github.com/stackabletech/superset-operator
+
diff --git a/deploy/helm/superset-operator/crds/crds.yaml b/deploy/helm/superset-operator/crds/crds.yaml
index 032c134b..82f4cf2e 100644
--- a/deploy/helm/superset-operator/crds/crds.yaml
+++ b/deploy/helm/superset-operator/crds/crds.yaml
@@ -1,81 +1,6 @@
 ---
 apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
-metadata:
-  name: druidconnections.superset.stackable.tech
-  annotations:
-    helm.sh/resource-policy: keep
-spec:
-  group: superset.stackable.tech
-  names:
-    categories: []
-    kind: DruidConnection
-    plural: druidconnections
-    shortNames: []
-    singular: druidconnection
-  scope: Namespaced
-  versions:
-    - additionalPrinterColumns: []
-      name: v1alpha1
-      schema:
-        openAPIV3Schema:
-          description: "Auto-generated derived type for DruidConnectionSpec via `CustomResource`"
-          properties:
-            spec:
-              properties:
-                druid:
-                  properties:
-                    name:
-                      type: string
-                    namespace:
-                      type: string
-                  required:
-                    - name
-                    - namespace
-                  type: object
-                superset:
-                  properties:
-                    name:
-                      type: string
-                    namespace:
-                      type: string
-                  required:
-                    - name
-                    - namespace
-                  type: object
-              required:
-                - druid
-                - superset
-              type: object
-            status:
-              nullable: true
-              properties:
-                condition:
-                  enum:
-                    - Pending
-                    - Importing
-                    - Ready
-                    - Failed
-                  type: string
-                startedAt:
-                  description: Time is a wrapper around time.Time which supports correct marshaling to YAML and JSON.  Wrappers are provided for many of the factory methods that the time package offers.
-                  format: date-time
-                  nullable: true
-                  type: string
-              required:
-                - condition
-              type: object
-          required:
-            - spec
-          title: DruidConnection
-          type: object
-      served: true
-      storage: true
-      subresources:
-        status: {}
----
-apiVersion: apiextensions.k8s.io/v1
-kind: CustomResourceDefinition
 metadata:
   name: supersetclusters.superset.stackable.tech
   annotations:
@@ -278,3 +203,78 @@ spec:
       storage: true
       subresources:
         status: {}
+---
+apiVersion: apiextensions.k8s.io/v1
+kind: CustomResourceDefinition
+metadata:
+  name: druidconnections.superset.stackable.tech
+  annotations:
+    helm.sh/resource-policy: keep
+spec:
+  group: superset.stackable.tech
+  names:
+    categories: []
+    kind: DruidConnection
+    plural: druidconnections
+    shortNames: []
+    singular: druidconnection
+  scope: Namespaced
+  versions:
+    - additionalPrinterColumns: []
+      name: v1alpha1
+      schema:
+        openAPIV3Schema:
+          description: "Auto-generated derived type for DruidConnectionSpec via `CustomResource`"
+          properties:
+            spec:
+              properties:
+                druid:
+                  properties:
+                    name:
+                      type: string
+                    namespace:
+                      type: string
+                  required:
+                    - name
+                    - namespace
+                  type: object
+                superset:
+                  properties:
+                    name:
+                      type: string
+                    namespace:
+                      type: string
+                  required:
+                    - name
+                    - namespace
+                  type: object
+              required:
+                - druid
+                - superset
+              type: object
+            status:
+              nullable: true
+              properties:
+                condition:
+                  enum:
+                    - Pending
+                    - Importing
+                    - Ready
+                    - Failed
+                  type: string
+                startedAt:
+                  description: Time is a wrapper around time.Time which supports correct marshaling to YAML and JSON.  Wrappers are provided for many of the factory methods that the time package offers.
+                  format: date-time
+                  nullable: true
+                  type: string
+              required:
+                - condition
+              type: object
+          required:
+            - spec
+          title: DruidConnection
+          type: object
+      served: true
+      storage: true
+      subresources:
+        status: {}
diff --git a/deploy/manifests/crds.yaml b/deploy/manifests/crds.yaml
index c11ca150..fb18679f 100644
--- a/deploy/manifests/crds.yaml
+++ b/deploy/manifests/crds.yaml
@@ -3,81 +3,6 @@
 ---
 apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
-metadata:
-  name: druidconnections.superset.stackable.tech
-  annotations:
-    helm.sh/resource-policy: keep
-spec:
-  group: superset.stackable.tech
-  names:
-    categories: []
-    kind: DruidConnection
-    plural: druidconnections
-    shortNames: []
-    singular: druidconnection
-  scope: Namespaced
-  versions:
-    - additionalPrinterColumns: []
-      name: v1alpha1
-      schema:
-        openAPIV3Schema:
-          description: "Auto-generated derived type for DruidConnectionSpec via `CustomResource`"
-          properties:
-            spec:
-              properties:
-                druid:
-                  properties:
-                    name:
-                      type: string
-                    namespace:
-                      type: string
-                  required:
-                    - name
-                    - namespace
-                  type: object
-                superset:
-                  properties:
-                    name:
-                      type: string
-                    namespace:
-                      type: string
-                  required:
-                    - name
-                    - namespace
-                  type: object
-              required:
-                - druid
-                - superset
-              type: object
-            status:
-              nullable: true
-              properties:
-                condition:
-                  enum:
-                    - Pending
-                    - Importing
-                    - Ready
-                    - Failed
-                  type: string
-                startedAt:
-                  description: Time is a wrapper around time.Time which supports correct marshaling to YAML and JSON.  Wrappers are provided for many of the factory methods that the time package offers.
-                  format: date-time
-                  nullable: true
-                  type: string
-              required:
-                - condition
-              type: object
-          required:
-            - spec
-          title: DruidConnection
-          type: object
-      served: true
-      storage: true
-      subresources:
-        status: {}
----
-apiVersion: apiextensions.k8s.io/v1
-kind: CustomResourceDefinition
 metadata:
   name: supersetclusters.superset.stackable.tech
   annotations:
@@ -280,4 +205,79 @@ spec:
       storage: true
       subresources:
         status: {}
+---
+apiVersion: apiextensions.k8s.io/v1
+kind: CustomResourceDefinition
+metadata:
+  name: druidconnections.superset.stackable.tech
+  annotations:
+    helm.sh/resource-policy: keep
+spec:
+  group: superset.stackable.tech
+  names:
+    categories: []
+    kind: DruidConnection
+    plural: druidconnections
+    shortNames: []
+    singular: druidconnection
+  scope: Namespaced
+  versions:
+    - additionalPrinterColumns: []
+      name: v1alpha1
+      schema:
+        openAPIV3Schema:
+          description: "Auto-generated derived type for DruidConnectionSpec via `CustomResource`"
+          properties:
+            spec:
+              properties:
+                druid:
+                  properties:
+                    name:
+                      type: string
+                    namespace:
+                      type: string
+                  required:
+                    - name
+                    - namespace
+                  type: object
+                superset:
+                  properties:
+                    name:
+                      type: string
+                    namespace:
+                      type: string
+                  required:
+                    - name
+                    - namespace
+                  type: object
+              required:
+                - druid
+                - superset
+              type: object
+            status:
+              nullable: true
+              properties:
+                condition:
+                  enum:
+                    - Pending
+                    - Importing
+                    - Ready
+                    - Failed
+                  type: string
+                startedAt:
+                  description: Time is a wrapper around time.Time which supports correct marshaling to YAML and JSON.  Wrappers are provided for many of the factory methods that the time package offers.
+                  format: date-time
+                  nullable: true
+                  type: string
+              required:
+                - condition
+              type: object
+          required:
+            - spec
+          title: DruidConnection
+          type: object
+      served: true
+      storage: true
+      subresources:
+        status: {}