diff --git a/install/0000_50_machine-api-operator_08_machine.crd.yaml b/install/0000_50_machine-api-operator_08_machine.crd.yaml
new file mode 100644
index 0000000000..54fd350cd1
--- /dev/null
+++ b/install/0000_50_machine-api-operator_08_machine.crd.yaml
@@ -0,0 +1,120 @@
+apiVersion: apiextensions.k8s.io/v1beta1
+kind: CustomResourceDefinition
+metadata:
+  labels:
+    controller-tools.k8s.io: "1.0"
+  name: machines.machine.openshift.io
+spec:
+  additionalPrinterColumns:
+  - JSONPath: .status.providerStatus.instanceId
+    name: Instance
+    description: Instance ID of machine created in AWS
+    type: string
+  - JSONPath: .status.providerStatus.instanceState
+    name: State
+    description: State of the AWS instance
+    type: string
+  - JSONPath: .spec.providerSpec.value.instanceType
+    name: Type
+    description: Type of instance
+    type: string
+  - JSONPath: .spec.providerSpec.value.placement.region
+    name: Region
+    description: Region associated with machine
+    type: string
+  - JSONPath: .spec.providerSpec.value.placement.availabilityZone
+    name: Zone
+    description: Zone associated with machine
+    type: string
+  - JSONPath: .metadata.creationTimestamp
+    name: Age
+    type: date
+  group: machine.openshift.io
+  names:
+    kind: Machine
+    plural: machines
+  scope: Namespaced
+  subresources:
+    status: {}
+  validation:
+    openAPIV3Schema:
+      properties:
+        apiVersion:
+          type: string
+        kind:
+          type: string
+        metadata:
+          type: object
+        spec:
+          type: object
+          properties:
+            configSource:
+              type: object
+            metadata:
+              type: object
+            providerSpec:
+              properties:
+                value:
+                  type: object
+                valueFrom:
+                  properties:
+                    machineClass:
+                      properties:
+                        provider:
+                          type: string
+                      type: object
+                  type: object
+              type: object
+            taints:
+              items:
+                type: object
+              type: array
+            versions:
+              properties:
+                controlPlane:
+                  type: string
+                kubelet:
+                  type: string
+              required:
+              - kubelet
+              type: object
+          required:
+          - providerSpec
+        status:
+          properties:
+            addresses:
+              items:
+                type: object
+              type: array
+            conditions:
+              items:
+                type: object
+              type: array
+            errorMessage:
+              type: string
+            errorReason:
+              type: string
+            lastUpdated:
+              format: date-time
+              type: string
+            nodeRef:
+              type: object
+            providerStatus:
+              type: object
+            versions:
+              properties:
+                controlPlane:
+                  type: string
+                kubelet:
+                  type: string
+              required:
+              - kubelet
+              type: object
+          type: object
+  version: v1beta1
+status:
+  acceptedNames:
+    kind: ""
+    plural: ""
+  conditions: []
+  storedVersions: []
diff --git a/install/0000_50_machine-api-operator_09_machineset.crd.yaml b/install/0000_50_machine-api-operator_09_machineset.crd.yaml
new file mode 100644
index 0000000000..ff12050c03
--- /dev/null
+++ b/install/0000_50_machine-api-operator_09_machineset.crd.yaml
@@ -0,0 +1,131 @@
+apiVersion: apiextensions.k8s.io/v1beta1
+kind: CustomResourceDefinition
+metadata:
+  labels:
+    controller-tools.k8s.io: "1.0"
+  name: machinesets.machine.openshift.io
+spec:
+  group: machine.openshift.io
+  names:
+    kind: MachineSet
+    plural: machinesets
+  scope: Namespaced
+  subresources:
+    scale:
+      labelSelectorPath: .status.labelSelector
+      specReplicasPath: .spec.replicas
+      statusReplicasPath: .status.replicas
+    status: {}
+  validation:
+    openAPIV3Schema:
+      properties:
+        apiVersion:
+          type: string
+        kind:
+          type: string
+        metadata:
+          type: object
+        spec:
+          type: object
+          properties:
+            minReadySeconds:
+              format: int32
+              type: integer
+            replicas:
+              format: int32
+              type: integer
+            selector:
+              type: object
+            template:
+              type: object
+              properties:
+                metadata:
+                  type: object
+                spec:
+                  type: object
+                  properties:
+                    configSource:
+                      type: object
+                    metadata:
+                      type: object
+                    providerSpec:
+                      properties:
+                        value:
+                          type: object
+                        valueFrom:
+                          properties:
+                            machineClass:
+                              properties:
+                                provider:
+                                  type: string
+                              type: object
+                          type: object
+                      type: object
+                    taints:
+                      items:
+                        type: object
+                      type: array
+                    versions:
+                      properties:
+                        controlPlane:
+                          type: string
+                        kubelet:
+                          type: string
+                      required:
+                      - kubelet
+                      type: object
+                  required:
+                  - providerSpec
+          required:
+          - selector
+        status:
+          properties:
+            availableReplicas:
+              format: int32
+              type: integer
+            errorMessage:
+              type: string
+            errorReason:
+              type: string
+            fullyLabeledReplicas:
+              format: int32
+              type: integer
+            observedGeneration:
+              format: int64
+              type: integer
+            readyReplicas:
+              format: int32
+              type: integer
+            replicas:
+              format: int32
+              type: integer
+          required:
+          - replicas
+          type: object
+  version: v1beta1
+  additionalPrinterColumns:
+  - JSONPath: .spec.replicas
+    description: Desired Replicas
+    name: Desired
+    type: integer
+  - JSONPath: .status.replicas
+    description: Current Replicas
+    name: Current
+    type: integer
+  - JSONPath: .status.readyReplicas
+    description: Ready Replicas
+    name: Ready
+    type: integer
+  - JSONPath: .status.availableReplicas
+    name: Available
+    description: Observed number of available replicas
+    type: string
+  - JSONPath: .metadata.creationTimestamp
+    name: Age
+    type: date
+status:
+  acceptedNames:
+    kind: ""
+    plural: ""
+  conditions: []
+  storedVersions: []
diff --git a/install/0000_50_machine-api-operator_10_machinedeployment.crd.yaml b/install/0000_50_machine-api-operator_10_machinedeployment.crd.yaml
new file mode 100644
index 0000000000..6f54dbec23
--- /dev/null
+++ b/install/0000_50_machine-api-operator_10_machinedeployment.crd.yaml
@@ -0,0 +1,127 @@
+apiVersion: apiextensions.k8s.io/v1beta1
+kind: CustomResourceDefinition
+metadata:
+  labels:
+    controller-tools.k8s.io: "1.0"
+  name: machinedeployments.machine.openshift.io
+spec:
+  group: machine.openshift.io
+  names:
+    kind: MachineDeployment
+    plural: machinedeployments
+  scope: Namespaced
+  subresources:
+    scale:
+      labelSelectorPath: .status.labelSelector
+      specReplicasPath: .spec.replicas
+      statusReplicasPath: .status.replicas
+    status: {}
+  validation:
+    openAPIV3Schema:
+      properties:
+        apiVersion:
+          type: string
+        kind:
+          type: string
+        metadata:
+          type: object
+        spec:
+          type: object
+          properties:
+            minReadySeconds:
+              format: int32
+              type: integer
+            paused:
+              type: boolean
+            progressDeadlineSeconds:
+              format: int32
+              type: integer
+            replicas:
+              format: int32
+              type: integer
+            revisionHistoryLimit:
+              format: int32
+              type: integer
+            selector:
+              type: object
+            strategy:
+              properties:
+                rollingUpdate:
+                  properties:
+                    maxSurge: {}
+                    maxUnavailable: {}
+                  type: object
+                type:
+                  type: string
+              type: object
+            template:
+              type: object
+              properties:
+                metadata:
+                  type: object
+                spec:
+                  type: object
+                  properties:
+                    configSource:
+                      type: object
+                    metadata:
+                      type: object
+                    providerSpec:
+                      properties:
+                        value:
+                          type: object
+                        valueFrom:
+                          properties:
+                            machineClass:
+                              properties:
+                                provider:
+                                  type: string
+                              type: object
+                          type: object
+                      type: object
+                    taints:
+                      items:
+                        type: object
+                      type: array
+                    versions:
+                      properties:
+                        controlPlane:
+                          type: string
+                        kubelet:
+                          type: string
+                      required:
+                      - kubelet
+                      type: object
+                  required:
+                  - providerSpec
+          required:
+          - selector
+          - template
+        status:
+          properties:
+            availableReplicas:
+              format: int32
+              type: integer
+            observedGeneration:
+              format: int64
+              type: integer
+            readyReplicas:
+              format: int32
+              type: integer
+            replicas:
+              format: int32
+              type: integer
+            unavailableReplicas:
+              format: int32
+              type: integer
+            updatedReplicas:
+              format: int32
+              type: integer
+          type: object
+  version: v1beta1
+status:
+  acceptedNames:
+    kind: ""
+    plural: ""
+  conditions: []
+  storedVersions: []
diff --git a/install/0000_50_machine-api-operator_11_cluster.crd.yaml b/install/0000_50_machine-api-operator_11_cluster.crd.yaml
new file mode 100644
index 0000000000..0bd71b8b7c
--- /dev/null
+++ b/install/0000_50_machine-api-operator_11_cluster.crd.yaml
@@ -0,0 +1,97 @@
+apiVersion: apiextensions.k8s.io/v1beta1
+kind: CustomResourceDefinition
+metadata:
+  labels:
+    controller-tools.k8s.io: "1.0"
+  name: clusters.machine.openshift.io
+spec:
+  group: machine.openshift.io
+  names:
+    kind: Cluster
+    plural: clusters
+  scope: Namespaced
+  subresources:
+    status: {}
+  validation:
+    openAPIV3Schema:
+      properties:
+        apiVersion:
+          type: string
+        kind:
+          type: string
+        metadata:
+          type: object
+        spec:
+          properties:
+            clusterNetwork:
+              properties:
+                pods:
+                  properties:
+                    cidrBlocks:
+                      items:
+                        type: string
+                      type: array
+                  required:
+                  - cidrBlocks
+                  type: object
+                serviceDomain:
+                  type: string
+                services:
+                  properties:
+                    cidrBlocks:
+                      items:
+                        type: string
+                      type: array
+                  required:
+                  - cidrBlocks
+                  type: object
+              required:
+              - services
+              - pods
+              - serviceDomain
+              type: object
+            providerSpec:
+              properties:
+                value:
+                  type: object
+                valueFrom:
+                  properties:
+                    machineClass:
+                      properties:
+                        provider:
+                          type: string
+                      type: object
+                  type: object
+              type: object
+          required:
+          - clusterNetwork
+          type: object
+        status:
+          properties:
+            apiEndpoints:
+              items:
+                properties:
+                  host:
+                    type: string
+                  port:
+                    format: int64
+                    type: integer
+                required:
+                - host
+                - port
+                type: object
+              type: array
+            errorMessage:
+              type: string
+            errorReason:
+              type: string
+            providerStatus:
+              type: object
+          type: object
+  version: v1beta1
+status:
+  acceptedNames:
+    kind: ""
+    plural: ""
+  conditions: []
+  storedVersions: []
diff --git a/install/0000_50_machine-api-operator_12_machineclass.crd.yaml b/install/0000_50_machine-api-operator_12_machineclass.crd.yaml
new file mode 100644
index 0000000000..a328aede92
--- /dev/null
+++ b/install/0000_50_machine-api-operator_12_machineclass.crd.yaml
@@ -0,0 +1,32 @@
+apiVersion: apiextensions.k8s.io/v1beta1
+kind: CustomResourceDefinition
+metadata:
+  labels:
+    controller-tools.k8s.io: "1.0"
+  name: machineclasses.machine.openshift.io
+spec:
+  group: machine.openshift.io
+  names:
+    kind: MachineClass
+    plural: machineclasses
+  scope: Namespaced
+  validation:
+    openAPIV3Schema:
+      properties:
+        apiVersion:
+          type: string
+        kind:
+          type: string
+        metadata:
+          type: object
+        providerSpec:
+          type: object
+      required:
+      - providerSpec
+  version: v1beta1
+status:
+  acceptedNames:
+    kind: ""
+    plural: ""
+  conditions: []
+  storedVersions: []
diff --git a/install/0000_50_machine-api-operator_08_rbac.yaml b/install/0000_50_machine-api-operator_13_rbac.yaml
similarity index 100%
rename from install/0000_50_machine-api-operator_08_rbac.yaml
rename to install/0000_50_machine-api-operator_13_rbac.yaml
diff --git a/install/0000_50_machine-api-operator_09_deployment.yaml b/install/0000_50_machine-api-operator_14_deployment.yaml
similarity index 100%
rename from install/0000_50_machine-api-operator_09_deployment.yaml
rename to install/0000_50_machine-api-operator_14_deployment.yaml
diff --git a/owned-manifests/clusterapi-manager-cluster-role.yaml b/owned-manifests/clusterapi-manager-cluster-role.yaml
index 0ec40df288..00da933fb6 100644
--- a/owned-manifests/clusterapi-manager-cluster-role.yaml
+++ b/owned-manifests/clusterapi-manager-cluster-role.yaml
@@ -23,6 +23,27 @@ rules:
   - update
   - patch
   - delete
+
+- apiGroups:
+    - machine.openshift.io
+  resources:
+    - clusters
+    - clusters/status
+    - machines
+    - machines/status
+    - machinesets
+    - machinesets/status
+    - machinedeployments
+    - machinedeployments/status
+  verbs:
+    - get
+    - list
+    - watch
+    - create
+    - update
+    - patch
+    - delete
+
 - apiGroups:
   - ""
   resources: