diff --git a/Dockerfile b/Dockerfile
index 3542f0725..063219a13 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -6,6 +6,8 @@ RUN make
 FROM registry.svc.ci.openshift.org/ocp/4.6:base
 COPY --from=builder /go/src/github.com/openshift/cluster-storage-operator/cluster-storage-operator /usr/bin/
 COPY manifests /manifests
+COPY vendor/github.com/openshift/api/operator/v1/0000_50_cluster_storage_operator_01_crd.yaml manifests/05_crd_operator.yaml
+COPY vendor/github.com/openshift/api/operator/v1/0000_90_cluster_csi_driver_01_config.crd.yaml manifests/04_cluster_csi_driver_crd.yaml
 ENTRYPOINT ["/usr/bin/cluster-storage-operator"]
 LABEL io.openshift.release.operator true
 LABEL io.k8s.display-name="OpenShift Cluster Storage Operator" \
diff --git a/Dockerfile.rhel7 b/Dockerfile.rhel7
index c6722e48b..34fad988c 100644
--- a/Dockerfile.rhel7
+++ b/Dockerfile.rhel7
@@ -6,6 +6,8 @@ RUN make
 FROM registry.svc.ci.openshift.org/openshift/origin-v4.6:base
 COPY --from=builder /go/src/github.com/openshift/cluster-storage-operator/cluster-storage-operator /usr/bin/
 COPY manifests /manifests
+COPY vendor/github.com/openshift/api/operator/v1/0000_50_cluster_storage_operator_01_crd.yaml manifests/05_crd_operator.yaml
+COPY vendor/github.com/openshift/api/operator/v1/0000_90_cluster_csi_driver_01_config.crd.yaml manifests/04_cluster_csi_driver_crd.yaml
 ENTRYPOINT ["/usr/bin/cluster-storage-operator"]
 LABEL io.openshift.release.operator true
 LABEL io.k8s.display-name="OpenShift Cluster Storage Operator" \
diff --git a/manifests/04_cluster_csi_driver_crd.yaml b/manifests/04_cluster_csi_driver_crd.yaml
deleted file mode 100644
index a9525b301..000000000
--- a/manifests/04_cluster_csi_driver_crd.yaml
+++ /dev/null
@@ -1,151 +0,0 @@
-apiVersion: apiextensions.k8s.io/v1beta1
-kind: CustomResourceDefinition
-metadata:
-  name: clustercsidrivers.operator.openshift.io
-spec:
-  group: operator.openshift.io
-  names:
-    kind: ClusterCSIDriver
-    plural: clustercsidrivers
-    singular: clustercsidriver
-  preserveUnknownFields: false
-  scope: Cluster
-  subresources:
-    status: {}
-  validation:
-    openAPIV3Schema:
-      description: ClusterCSIDriver object allows management and configuration of
-        a CSI driver operator installed by default in OpenShift. Name of the object
-        must be name of the CSI driver it operates. See CSIDriverName type for list
-        of allowed values.
-      properties:
-        apiVersion:
-          description: 'APIVersion defines the versioned schema of this representation
-            of an object. Servers should convert recognized schemas to the latest
-            internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
-          type: string
-        kind:
-          description: 'Kind is a string value representing the REST resource this
-            object represents. Servers may infer this from the endpoint the client
-            submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
-          type: string
-        metadata:
-          properties:
-            name:
-              enum:
-              - ebs.csi.aws.com
-              - manila.csi.openstack.org
-              - csi.ovirt.org
-              type: string
-          type: object
-        spec:
-          description: spec holds user settable values for configuration
-          properties:
-            logLevel:
-              description: logLevel is an intent based logging for an overall component.  It
-                does not give fine grained control, but it is a simple way to manage
-                coarse grained logging choices that operators have to interpret for
-                their operands.
-              type: string
-            managementState:
-              description: managementState indicates whether and how the operator
-                should manage the component
-              pattern: ^(Managed|Unmanaged|Force|Removed)$
-              type: string
-            observedConfig:
-              description: observedConfig holds a sparse config that controller has
-                observed from the cluster state.  It exists in spec because it is
-                an input to the level for the operator
-              nullable: true
-              type: object
-              x-kubernetes-preserve-unknown-fields: true
-            operatorLogLevel:
-              description: operatorLogLevel is an intent based logging for the operator
-                itself.  It does not give fine grained control, but it is a simple
-                way to manage coarse grained logging choices that operators have to
-                interpret for themselves.
-              type: string
-            unsupportedConfigOverrides:
-              description: 'unsupportedConfigOverrides holds a sparse config that
-                will override any previously set options.  It only needs to be the
-                fields to override it will end up overlaying in the following order:
-                1. hardcoded defaults 2. observedConfig 3. unsupportedConfigOverrides'
-              nullable: true
-              type: object
-              x-kubernetes-preserve-unknown-fields: true
-          type: object
-        status:
-          description: status holds observed values from the cluster. They may not
-            be overridden.
-          properties:
-            conditions:
-              description: conditions is a list of conditions and their status
-              items:
-                description: OperatorCondition is just the standard condition fields.
-                properties:
-                  lastTransitionTime:
-                    format: date-time
-                    type: string
-                  message:
-                    type: string
-                  reason:
-                    type: string
-                  status:
-                    type: string
-                  type:
-                    type: string
-                type: object
-              type: array
-            generations:
-              description: generations are used to determine when an item needs to
-                be reconciled or has changed in a way that needs a reaction.
-              items:
-                description: GenerationStatus keeps track of the generation for a
-                  given resource so that decisions about forced updates can be made.
-                properties:
-                  group:
-                    description: group is the group of the thing you're tracking
-                    type: string
-                  hash:
-                    description: hash is an optional field set for resources without
-                      generation that are content sensitive like secrets and configmaps
-                    type: string
-                  lastGeneration:
-                    description: lastGeneration is the last generation of the workload
-                      controller involved
-                    format: int64
-                    type: integer
-                  name:
-                    description: name is the name of the thing you're tracking
-                    type: string
-                  namespace:
-                    description: namespace is where the thing you're tracking is
-                    type: string
-                  resource:
-                    description: resource is the resource type of the thing you're
-                      tracking
-                    type: string
-                type: object
-              type: array
-            observedGeneration:
-              description: observedGeneration is the last generation change you've
-                dealt with
-              format: int64
-              type: integer
-            readyReplicas:
-              description: readyReplicas indicates how many replicas are ready and
-                at the desired state
-              format: int32
-              type: integer
-            version:
-              description: version is the level this availability applies to
-              type: string
-          type: object
-      required:
-      - spec
-      type: object
-  version: v1
-  versions:
-  - name: v1
-    served: true
-    storage: true
diff --git a/manifests/05_crd_operator.yaml b/manifests/05_crd_operator.yaml
deleted file mode 100644
index 28d7c8837..000000000
--- a/manifests/05_crd_operator.yaml
+++ /dev/null
@@ -1,142 +0,0 @@
-apiVersion: apiextensions.k8s.io/v1beta1
-kind: CustomResourceDefinition
-metadata:
-  name: storages.operator.openshift.io
-spec:
-  group: operator.openshift.io
-  names:
-    kind: Storage
-    plural: storages
-    singular: storage
-  preserveUnknownFields: false
-  scope: Cluster
-  subresources:
-    status: {}
-  version: v1
-  versions:
-  - name: v1
-    served: true
-    storage: true
-  validation:
-    openAPIV3Schema:
-      description: Storage provides a means to configure an operator to manage the
-        cluster storage operator. `cluster` is the canonical name.
-      type: object
-      required:
-      - spec
-      properties:
-        apiVersion:
-          description: 'APIVersion defines the versioned schema of this representation
-            of an object. Servers should convert recognized schemas to the latest
-            internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
-          type: string
-        kind:
-          description: 'Kind is a string value representing the REST resource this
-            object represents. Servers may infer this from the endpoint the client
-            submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
-          type: string
-        metadata:
-          type: object
-        spec:
-          description: spec holds user settable values for configuration
-          type: object
-          properties:
-            logLevel:
-              description: logLevel is an intent based logging for an overall component.  It
-                does not give fine grained control, but it is a simple way to manage
-                coarse grained logging choices that operators have to interpret for
-                their operands.
-              type: string
-            managementState:
-              description: managementState indicates whether and how the operator
-                should manage the component
-              type: string
-              pattern: ^(Managed|Unmanaged|Force|Removed)$
-            observedConfig:
-              description: observedConfig holds a sparse config that controller has
-                observed from the cluster state.  It exists in spec because it is
-                an input to the level for the operator
-              type: object
-              nullable: true
-              x-kubernetes-preserve-unknown-fields: true
-            operatorLogLevel:
-              description: operatorLogLevel is an intent based logging for the operator
-                itself.  It does not give fine grained control, but it is a simple
-                way to manage coarse grained logging choices that operators have to
-                interpret for themselves.
-              type: string
-            unsupportedConfigOverrides:
-              description: 'unsupportedConfigOverrides holds a sparse config that
-                will override any previously set options.  It only needs to be the
-                fields to override it will end up overlaying in the following order:
-                1. hardcoded defaults 2. observedConfig 3. unsupportedConfigOverrides'
-              type: object
-              nullable: true
-              x-kubernetes-preserve-unknown-fields: true
-        status:
-          description: status holds observed values from the cluster. They may not
-            be overridden.
-          type: object
-          properties:
-            conditions:
-              description: conditions is a list of conditions and their status
-              type: array
-              items:
-                description: OperatorCondition is just the standard condition fields.
-                type: object
-                properties:
-                  lastTransitionTime:
-                    type: string
-                    format: date-time
-                  message:
-                    type: string
-                  reason:
-                    type: string
-                  status:
-                    type: string
-                  type:
-                    type: string
-            generations:
-              description: generations are used to determine when an item needs to
-                be reconciled or has changed in a way that needs a reaction.
-              type: array
-              items:
-                description: GenerationStatus keeps track of the generation for a
-                  given resource so that decisions about forced updates can be made.
-                type: object
-                properties:
-                  group:
-                    description: group is the group of the thing you're tracking
-                    type: string
-                  hash:
-                    description: hash is an optional field set for resources without
-                      generation that are content sensitive like secrets and configmaps
-                    type: string
-                  lastGeneration:
-                    description: lastGeneration is the last generation of the workload
-                      controller involved
-                    type: integer
-                    format: int64
-                  name:
-                    description: name is the name of the thing you're tracking
-                    type: string
-                  namespace:
-                    description: namespace is where the thing you're tracking is
-                    type: string
-                  resource:
-                    description: resource is the resource type of the thing you're
-                      tracking
-                    type: string
-            observedGeneration:
-              description: observedGeneration is the last generation change you've
-                dealt with
-              type: integer
-              format: int64
-            readyReplicas:
-              description: readyReplicas indicates how many replicas are ready and
-                at the desired state
-              type: integer
-              format: int32
-            version:
-              description: version is the level this availability applies to
-              type: string