diff --git a/install/0000_30_machine-api-operator_01_images.configmap.yaml b/install/0000_30_machine-api-operator_01_images.configmap.yaml
index 5b69d7573e..743b8a3f3e 100644
--- a/install/0000_30_machine-api-operator_01_images.configmap.yaml
+++ b/install/0000_30_machine-api-operator_01_images.configmap.yaml
@@ -4,4 +4,4 @@ metadata:
   name: machine-api-operator-images
   namespace: openshift-cluster-api
 data:
-  images.json: '{"machineAPIOperator": "docker.io/openshift/origin-machine-api-operator:v4.0.0", "clusterAPIControllerAWS": "docker.io/openshift/origin-aws-machine-controllers:v4.0.0", "clusterAPIControllerOpenStack": "docker.io/openshift/origin-openstack-machine-controllers:v4.0.0", "clusterAPIControllerLibvirt": "docker.io/openshift/origin-libvirt-machine-controllers:v4.0.0", "clusterAPIControllerLibvirtDeprecated": "quay.io/coreos/cluster-api-provider-libvirt:origin-v4.0-2019-01-31-041134", "clusterAPIControllerAWSDeprecated": "quay.io/coreos/cluster-api-provider-aws:origin-v4.0-2019-01-31-041134", "clusterAPIControllerOpenStackDeprecated": "quay.io/coreos/cluster-api-provider-openstack:origin-v4.0-2019-01-31-041134"}'
+  images.json: '{"machineAPIOperator": "docker.io/openshift/origin-machine-api-operator:v4.0.0", "clusterAPIControllerAWS": "docker.io/openshift/origin-aws-machine-controllers:v4.0.0", "clusterAPIControllerOpenStack": "docker.io/openshift/origin-openstack-machine-controllers:v4.0.0", "clusterAPIControllerLibvirt": "docker.io/openshift/origin-libvirt-machine-controllers:v4.0.0"}'
diff --git a/owned-manifests/clusterapi-manager-controllers.yaml b/owned-manifests/clusterapi-manager-controllers.yaml
index 95ee3f48da..4ca6d900c1 100644
--- a/owned-manifests/clusterapi-manager-controllers.yaml
+++ b/owned-manifests/clusterapi-manager-controllers.yaml
@@ -61,46 +61,6 @@ spec:
         args:
           - --logtostderr=true
           - --v=3
-      - name: controller-manager-deprecated
-        image: {{ .Controllers.ProviderDeprecated }}
-        command:
-        - "./manager"
-        args:
-          - --logtostderr=true
-          - --v=3
-        resources:
-          requests:
-            cpu: 100m
-            memory: 20Mi
-          limits:
-            cpu: 100m
-            memory: 30Mi
-      - name: machine-controller-deprecated
-        image: {{ .Controllers.ProviderDeprecated }}
-        env:
-          - name: NODE_NAME
-            valueFrom:
-              fieldRef:
-                fieldPath: spec.nodeName
-        command:
-          - /machine-controller-manager
-        args:
-          - --logtostderr=true
-          - --v=3
-      - name: nodelink-controller-deprecated
-        image: quay.io/coreos/machine-api-operator:origin-v4.0-2019-01-31-041134
-        command:
-          - /nodelink-controller
-        args:
-          - --logtostderr=true
-          - --v=3
-        resources:
-          requests:
-            cpu: 100m
-            memory: 20Mi
-          limits:
-            cpu: 100m
-            memory: 30Mi
       - name: nodelink-controller
         image: {{ .Controllers.NodeLink }}
         command:
@@ -115,20 +75,6 @@ spec:
           limits:
             cpu: 100m
             memory: 30Mi
-      - name: machine-healthcheck-deprecated
-        image: quay.io/coreos/machine-api-operator:origin-v4.0-2019-01-31-041134
-        command:
-          - /machine-healthcheck
-        args:
-          - --logtostderr=true
-          - --v=3
-        resources:
-          requests:
-            cpu: 100m
-            memory: 20Mi
-          limits:
-            cpu: 100m
-            memory: 30Mi
       - name: machine-healthcheck
         image: {{ .Controllers.MachineHealthCheck }}
         command:
diff --git a/pkg/operator/config.go b/pkg/operator/config.go
index ae7d095cbf..da456ce11a 100644
--- a/pkg/operator/config.go
+++ b/pkg/operator/config.go
@@ -41,20 +41,16 @@ type OperatorConfig struct {
 
 type Controllers struct {
 	Provider           string
-	ProviderDeprecated string
 	NodeLink           string
 	MachineHealthCheck string
 }
 
 // Images allows build systems to inject images for MAO components
 type Images struct {
-	MachineAPIOperator                      string `json:"machineAPIOperator"`
-	ClusterAPIControllerAWS                 string `json:"clusterAPIControllerAWS"`
-	ClusterAPIControllerAWSDeprecated       string `json:"clusterAPIControllerAWSDeprecated"`
-	ClusterAPIControllerOpenStack           string `json:"clusterAPIControllerOpenStack"`
-	ClusterAPIControllerLibvirt             string `json:"clusterAPIControllerLibvirt"`
-	ClusterAPIControllerLibvirtDeprecated   string `json:"clusterAPIControllerLibvirtDeprecated"`
-	ClusterAPIControllerOpenStackDeprecated string `json:"clusterAPIControllerOpenStackDeprecated"`
+	MachineAPIOperator            string `json:"machineAPIOperator"`
+	ClusterAPIControllerAWS       string `json:"clusterAPIControllerAWS"`
+	ClusterAPIControllerOpenStack string `json:"clusterAPIControllerOpenStack"`
+	ClusterAPIControllerLibvirt   string `json:"clusterAPIControllerLibvirt"`
 }
 
 // InstallConfig contains the mao relevant config coming from the install config, i.e provider
diff --git a/pkg/operator/config_test.go b/pkg/operator/config_test.go
index 994a21a3ff..cfa1c9aa8d 100644
--- a/pkg/operator/config_test.go
+++ b/pkg/operator/config_test.go
@@ -7,14 +7,11 @@ import (
 )
 
 var (
-	imagesJSONFile                   = "fixtures/images.json"
-	expectedAWSImage                 = "docker.io/openshift/origin-aws-machine-controllers:v4.0.0"
-	expectedLibvirtImage             = "docker.io/openshift/origin-libvirt-machine-controllers:v4.0.0"
-	expectedOpenstackImage           = "docker.io/openshift/origin-openstack-machine-controllers:v4.0.0"
-	expectedMachineAPIOperatorImage  = "docker.io/openshift/origin-machine-api-operator:v4.0.0"
-	expectedAWSImageDeprecated       = "quay.io/coreos/cluster-api-provider-aws:origin-v4.0-2019-01-31-041134"
-	expectedLibvirtImageDeprecated   = "quay.io/coreos/cluster-api-provider-libvirt:origin-v4.0-2019-01-31-041134"
-	expectedOpenstackImageDeprecated = "quay.io/coreos/cluster-api-provider-openstack:origin-v4.0-2019-01-31-041134"
+	imagesJSONFile                  = "fixtures/images.json"
+	expectedAWSImage                = "docker.io/openshift/origin-aws-machine-controllers:v4.0.0"
+	expectedLibvirtImage            = "docker.io/openshift/origin-libvirt-machine-controllers:v4.0.0"
+	expectedOpenstackImage          = "docker.io/openshift/origin-openstack-machine-controllers:v4.0.0"
+	expectedMachineAPIOperatorImage = "docker.io/openshift/origin-machine-api-operator:v4.0.0"
 )
 
 func TestInstallConfigFromClusterConfig(t *testing.T) {
@@ -137,15 +134,6 @@ func TestGetImagesFromJSONFile(t *testing.T) {
 	if img.ClusterAPIControllerOpenStack != expectedOpenstackImage {
 		t.Errorf("failed getImagesFromJSONFile. Expected: %s, got: %s", expectedOpenstackImage, img.ClusterAPIControllerOpenStack)
 	}
-	if img.ClusterAPIControllerAWSDeprecated != expectedAWSImageDeprecated {
-		t.Errorf("failed getImagesFromJSONFile. Expected: %s, got: %s", expectedAWSImageDeprecated, img.ClusterAPIControllerAWSDeprecated)
-	}
-	if img.ClusterAPIControllerLibvirtDeprecated != expectedLibvirtImageDeprecated {
-		t.Errorf("failed getImagesFromJSONFile. Expected: %s, got: %s", expectedLibvirtImageDeprecated, img.ClusterAPIControllerLibvirtDeprecated)
-	}
-	if img.ClusterAPIControllerOpenStackDeprecated != expectedOpenstackImageDeprecated {
-		t.Errorf("failed getImagesFromJSONFile. Expected: %s, got: %s", expectedOpenstackImageDeprecated, img.ClusterAPIControllerOpenStackDeprecated)
-	}
 }
 
 func TestGetProviderControllerFromImages(t *testing.T) {
diff --git a/pkg/operator/fixtures/images.json b/pkg/operator/fixtures/images.json
index 89f51401e9..40c303dc99 100644
--- a/pkg/operator/fixtures/images.json
+++ b/pkg/operator/fixtures/images.json
@@ -2,8 +2,5 @@
   "clusterAPIControllerAWS": "docker.io/openshift/origin-aws-machine-controllers:v4.0.0",
   "clusterAPIControllerOpenStack": "docker.io/openshift/origin-openstack-machine-controllers:v4.0.0",
   "clusterAPIControllerLibvirt": "docker.io/openshift/origin-libvirt-machine-controllers:v4.0.0",
-  "machineAPIOperator": "docker.io/openshift/origin-machine-api-operator:v4.0.0",
-  "clusterAPIControllerLibvirtDeprecated": "quay.io/coreos/cluster-api-provider-libvirt:origin-v4.0-2019-01-31-041134",
-  "clusterAPIControllerAWSDeprecated": "quay.io/coreos/cluster-api-provider-aws:origin-v4.0-2019-01-31-041134",
-  "clusterAPIControllerOpenStackDeprecated": "quay.io/coreos/cluster-api-provider-openstack:origin-v4.0-2019-01-31-041134"
+  "machineAPIOperator": "docker.io/openshift/origin-machine-api-operator:v4.0.0"
 }
diff --git a/pkg/operator/operator.go b/pkg/operator/operator.go
index b51da522b9..ea58191b1d 100644
--- a/pkg/operator/operator.go
+++ b/pkg/operator/operator.go
@@ -210,22 +210,10 @@ func (optr *Operator) maoConfigFromInstallConfig() (*OperatorConfig, error) {
 		return nil, err
 	}
 
-	// TODO: Remove once we transition over machine.openshift.io group
-	var providerDreprecatedControllerImage string
-	switch provider {
-	case AWSProvider:
-		providerDreprecatedControllerImage = images.ClusterAPIControllerAWSDeprecated
-	case LibvirtProvider:
-		providerDreprecatedControllerImage = images.ClusterAPIControllerLibvirtDeprecated
-	case OpenStackProvider:
-		providerDreprecatedControllerImage = images.ClusterAPIControllerOpenStackDeprecated
-	}
-
 	return &OperatorConfig{
 		optr.namespace,
 		Controllers{
 			providerControllerImage,
-			providerDreprecatedControllerImage,
 			machineAPIOperatorImage,
 			machineAPIOperatorImage,
 		},
diff --git a/test/e2e/main.go b/test/e2e/main.go
index 04d74deaad..58be061f59 100644
--- a/test/e2e/main.go
+++ b/test/e2e/main.go
@@ -5,7 +5,7 @@ import (
 
 	"github.com/golang/glog"
 	osconfigv1 "github.com/openshift/api/config/v1"
-	capiv1alpha1 "github.com/openshift/cluster-api/pkg/apis/cluster/v1alpha1"
+	mapiv1beta1 "github.com/openshift/cluster-api/pkg/apis/machine/v1beta1"
 	caov1alpha1 "github.com/openshift/cluster-autoscaler-operator/pkg/apis"
 	"k8s.io/client-go/kubernetes/scheme"
 	"sigs.k8s.io/controller-runtime/pkg/client"
@@ -17,7 +17,7 @@ const (
 )
 
 func init() {
-	if err := capiv1alpha1.AddToScheme(scheme.Scheme); err != nil {
+	if err := mapiv1beta1.AddToScheme(scheme.Scheme); err != nil {
 		glog.Fatal(err)
 	}
 
@@ -68,9 +68,9 @@ func runSuite() error {
 	}
 	glog.Info("PASS: ExpectOperatorAvailable")
 
-	glog.Info("RUN: ExpectOneClusterObject")
-	if err := testConfig.ExpectOneClusterObject(); err != nil {
-		glog.Errorf("FAIL: ExpectOneClusterObject: %v", err)
+	glog.Info("RUN: ExpectNoClusterObject")
+	if err := testConfig.ExpectNoClusterObject(); err != nil {
+		glog.Errorf("FAIL: ExpectNoClusterObject: %v", err)
 		return err
 	}
 	glog.Info("PASS: ExpectOneClusterObject")
diff --git a/test/e2e/operator_expectations.go b/test/e2e/operator_expectations.go
index 80acbe8b5c..042b111bba 100644
--- a/test/e2e/operator_expectations.go
+++ b/test/e2e/operator_expectations.go
@@ -10,7 +10,7 @@ import (
 
 	"github.com/golang/glog"
 	osconfigv1 "github.com/openshift/api/config/v1"
-	capiv1alpha1 "github.com/openshift/cluster-api/pkg/apis/cluster/v1alpha1"
+	mapiv1beta1 "github.com/openshift/cluster-api/pkg/apis/machine/v1beta1"
 	caov1alpha1 "github.com/openshift/cluster-autoscaler-operator/pkg/apis/autoscaling/v1alpha1"
 	cvoresourcemerge "github.com/openshift/cluster-version-operator/lib/resourcemerge"
 	kappsapi "k8s.io/api/apps/v1"
@@ -51,19 +51,19 @@ func (tc *testConfig) ExpectOperatorAvailable() error {
 	return err
 }
 
-func (tc *testConfig) ExpectOneClusterObject() error {
+func (tc *testConfig) ExpectNoClusterObject() error {
 	listOptions := client.ListOptions{
 		Namespace: namespace,
 	}
-	clusterList := capiv1alpha1.ClusterList{}
+	clusterList := mapiv1beta1.ClusterList{}
 
 	err := wait.PollImmediate(1*time.Second, waitShort, func() (bool, error) {
 		if err := tc.client.List(context.TODO(), &listOptions, &clusterList); err != nil {
 			glog.Errorf("error querying api for clusterList object: %v, retrying...", err)
 			return false, nil
 		}
-		if len(clusterList.Items) != 1 {
-			return false, errors.New("more than one cluster object found")
+		if len(clusterList.Items) > 0 {
+			return false, errors.New("a cluster object was found")
 		}
 		return true, nil
 	})
@@ -94,11 +94,11 @@ func (tc *testConfig) ExpectClusterOperatorStatusAvailable() error {
 }
 
 func (tc *testConfig) ExpectAllMachinesLinkedToANode() error {
-	machineAnnotationKey := "cluster.k8s.io/machine"
+	machineAnnotationKey := "machine.openshift.io/machine"
 	listOptions := client.ListOptions{
 		Namespace: namespace,
 	}
-	machineList := capiv1alpha1.MachineList{}
+	machineList := mapiv1beta1.MachineList{}
 	nodeList := corev1.NodeList{}
 
 	err := wait.PollImmediate(1*time.Second, waitShort, func() (bool, error) {
@@ -187,7 +187,7 @@ func (tc *testConfig) ExpectAdditiveReconcileMachineTaints() error {
 	listOptions := client.ListOptions{
 		Namespace: namespace,
 	}
-	machineList := capiv1alpha1.MachineList{}
+	machineList := mapiv1beta1.MachineList{}
 
 	if err := tc.client.List(context.TODO(), &listOptions, &machineList); err != nil {
 		return fmt.Errorf("error querying api for machineList object: %v", err)
@@ -255,7 +255,7 @@ func (tc *testConfig) ExpectNewNodeWhenDeletingMachine() error {
 	listOptions := client.ListOptions{
 		Namespace: namespace,
 	}
-	machineList := capiv1alpha1.MachineList{}
+	machineList := mapiv1beta1.MachineList{}
 	nodeList := corev1.NodeList{}
 
 	glog.Info("Get machineList")
@@ -284,7 +284,7 @@ func (tc *testConfig) ExpectNewNodeWhenDeletingMachine() error {
 
 	clusterInitialTotalNodes := len(nodeList.Items)
 	clusterInitialTotalMachines := len(machineList.Items)
-	var triagedWorkerMachine capiv1alpha1.Machine
+	var triagedWorkerMachine mapiv1beta1.Machine
 	var triagedWorkerNode corev1.Node
 MachineLoop:
 	for _, m := range machineList.Items {
@@ -361,7 +361,7 @@ func (tc *testConfig) ExpectAutoscalerScalesOut() error {
 		Namespace: namespace,
 	}
 	glog.Info("Get one machineSet")
-	machineSetList := capiv1alpha1.MachineSetList{}
+	machineSetList := mapiv1beta1.MachineSetList{}
 	err := wait.PollImmediate(1*time.Second, waitMedium, func() (bool, error) {
 		if err := tc.client.List(context.TODO(), &listOptions, &machineSetList); err != nil {
 			glog.Errorf("error querying api for nodeList object: %v, retrying...", err)
@@ -408,7 +408,7 @@ func (tc *testConfig) ExpectAutoscalerScalesOut() error {
 			ScaleTargetRef: caov1alpha1.CrossVersionObjectReference{
 				Name:       targetMachineSet.Name,
 				Kind:       "MachineSet",
-				APIVersion: "cluster.k8s.io/v1alpha1",
+				APIVersion: "machine.openshift.io/v1beta1",
 			},
 		},
 	}
@@ -513,7 +513,7 @@ func (tc *testConfig) ExpectAutoscalerScalesOut() error {
 			Namespace: namespace,
 			Name:      targetMachineSet.Name,
 		}
-		ms := &capiv1alpha1.MachineSet{}
+		ms := &mapiv1beta1.MachineSet{}
 		if err := tc.client.Get(context.TODO(), msKey, ms); err != nil {
 			glog.Errorf("error querying api for clusterAutoscaler object: %v, retrying...", err)
 			return false, nil
@@ -581,7 +581,7 @@ func (tc *testConfig) ExpectAutoscalerScalesOut() error {
 			Namespace: namespace,
 			Name:      targetMachineSet.Name,
 		}
-		ms := &capiv1alpha1.MachineSet{}
+		ms := &mapiv1beta1.MachineSet{}
 		if err := tc.client.Get(context.TODO(), msKey, ms); err != nil {
 			glog.Errorf("error querying api for machineSet object: %v, retrying...", err)
 			return false, nil
diff --git a/test/integration/main.go b/test/integration/main.go
index 6e0bd53b58..cf42081ac2 100644
--- a/test/integration/main.go
+++ b/test/integration/main.go
@@ -25,9 +25,9 @@ import (
 	"k8s.io/client-go/kubernetes/scheme"
 	"k8s.io/client-go/tools/clientcmd"
 
-	capiv1alpha1 "github.com/openshift/cluster-api/pkg/apis/cluster/v1alpha1"
+	mapiv1beta1 "github.com/openshift/cluster-api/pkg/apis/machine/v1beta1"
 	"github.com/openshift/cluster-api/pkg/client/clientset_generated/clientset"
-	capiv1alpha1scheme "github.com/openshift/cluster-api/pkg/client/clientset_generated/clientset/scheme"
+	mapiv1beta1scheme "github.com/openshift/cluster-api/pkg/client/clientset_generated/clientset/scheme"
 )
 
 const (
@@ -51,7 +51,7 @@ func usage() {
 
 // TestConfig stores clients for managing various resources
 type TestConfig struct {
-	CAPIClient          *clientset.Clientset
+	MAPIClient          *clientset.Clientset
 	APIExtensionsClient *apiextensionsclientset.Clientset
 	KubeClient          *kubernetes.Clientset
 	AWSClient           *AWSClient
@@ -64,7 +64,7 @@ func NewTestConfig(kubeconfig string) *TestConfig {
 		glog.Fatalf("Could not create Config for talking to the apiserver: %v", err)
 	}
 
-	capiclient, err := clientset.NewForConfig(config)
+	mapiclient, err := clientset.NewForConfig(config)
 	if err != nil {
 		glog.Fatalf("Could not create client for talking to the apiserver: %v", err)
 	}
@@ -80,7 +80,7 @@ func NewTestConfig(kubeconfig string) *TestConfig {
 	}
 
 	return &TestConfig{
-		CAPIClient:          capiclient,
+		MAPIClient:          mapiclient,
 		APIExtensionsClient: apiextensionsclient,
 		KubeClient:          kubeClient,
 	}
@@ -222,7 +222,7 @@ var rootCmd = &cobra.Command{
 			return err
 		}
 
-		capiv1alpha1scheme.AddToScheme(scheme.Scheme)
+		mapiv1beta1scheme.AddToScheme(scheme.Scheme)
 		apiextensionsscheme.AddToScheme(scheme.Scheme)
 		decode := scheme.Codecs.UniversalDeserializer().Decode
 		// create rbac
@@ -256,7 +256,7 @@ var rootCmd = &cobra.Command{
 		}
 
 		// create machine CRD
-		if CRDBytes, err := ioutil.ReadFile(filepath.Join(assetsPath, manifestsFolder, "0000_30_machine-api-operator_02_machine.crd.yaml")); err != nil {
+		if CRDBytes, err := ioutil.ReadFile(filepath.Join(assetsPath, manifestsFolder, "0000_30_machine-api-operator_08_machine.crd.yaml")); err != nil {
 			glog.Fatalf("Error reading %#v", err)
 		} else {
 			CRDObj, _, err := decode([]byte(CRDBytes), nil, nil)
@@ -271,7 +271,7 @@ var rootCmd = &cobra.Command{
 		}
 
 		// create machineSet CRD
-		if CRDBytes, err := ioutil.ReadFile(filepath.Join(assetsPath, manifestsFolder, "0000_30_machine-api-operator_03_machineset.crd.yaml")); err != nil {
+		if CRDBytes, err := ioutil.ReadFile(filepath.Join(assetsPath, manifestsFolder, "0000_30_machine-api-operator_09_machineset.crd.yaml")); err != nil {
 			glog.Fatalf("Error reading %#v", err)
 		} else {
 			CRDObj, _, err := decode([]byte(CRDBytes), nil, nil)
@@ -286,7 +286,7 @@ var rootCmd = &cobra.Command{
 		}
 
 		// create machineDeployment CRD
-		if CRDBytes, err := ioutil.ReadFile(filepath.Join(assetsPath, manifestsFolder, "0000_30_machine-api-operator_04_machinedeployment.crd.yaml")); err != nil {
+		if CRDBytes, err := ioutil.ReadFile(filepath.Join(assetsPath, manifestsFolder, "0000_30_machine-api-operator_10_machinedeployment.crd.yaml")); err != nil {
 			glog.Fatalf("Error reading %#v", err)
 		} else {
 			CRDObj, _, err := decode([]byte(CRDBytes), nil, nil)
@@ -301,7 +301,7 @@ var rootCmd = &cobra.Command{
 		}
 
 		// create cluster CRD
-		if CRDBytes, err := ioutil.ReadFile(filepath.Join(assetsPath, manifestsFolder, "0000_30_machine-api-operator_05_cluster.crd.yaml")); err != nil {
+		if CRDBytes, err := ioutil.ReadFile(filepath.Join(assetsPath, manifestsFolder, "0000_30_machine-api-operator_11_cluster.crd.yaml")); err != nil {
 			glog.Fatalf("Error reading %#v", err)
 		} else {
 			CRDObj, _, err := decode([]byte(CRDBytes), nil, nil)
@@ -448,8 +448,8 @@ var rootCmd = &cobra.Command{
 			if err != nil {
 				glog.Fatalf("Error decoding %#v", err)
 			}
-			cluster := clusterObj.(*capiv1alpha1.Cluster)
-			if _, err := testConfig.CAPIClient.ClusterV1alpha1().Clusters(targetNamespace).Create(cluster); err != nil {
+			cluster := clusterObj.(*mapiv1beta1.Cluster)
+			if _, err := testConfig.MAPIClient.MachineV1beta1().Clusters(targetNamespace).Create(cluster); err != nil {
 				return err
 			}
 		}
@@ -461,8 +461,8 @@ var rootCmd = &cobra.Command{
 			if err != nil {
 				glog.Fatalf("Error decoding %#v", err)
 			}
-			machineSet := machineSetObj.(*capiv1alpha1.MachineSet)
-			if _, err := testConfig.CAPIClient.ClusterV1alpha1().MachineSets(targetNamespace).Create(machineSet); err != nil {
+			machineSet := machineSetObj.(*mapiv1beta1.MachineSet)
+			if _, err := testConfig.MAPIClient.MachineV1beta1().MachineSets(targetNamespace).Create(machineSet); err != nil {
 				return err
 			}
 		}
@@ -470,17 +470,17 @@ var rootCmd = &cobra.Command{
 		// Verify cluster, machineSet and machines have been deployed
 		var cluster, machineSet, workers bool
 		err = wait.Poll(pollInterval, timeoutPoolMachineSetRunningInterval, func() (bool, error) {
-			if _, err := testConfig.CAPIClient.ClusterV1alpha1().Clusters(targetNamespace).Get(clusterID, metav1.GetOptions{}); err == nil {
+			if _, err := testConfig.MAPIClient.MachineV1beta1().Clusters(targetNamespace).Get(clusterID, metav1.GetOptions{}); err == nil {
 				cluster = true
 				log.Info("Cluster object has been created")
 			}
 
-			if _, err := testConfig.CAPIClient.ClusterV1alpha1().MachineSets(targetNamespace).Get("worker", metav1.GetOptions{}); err == nil {
+			if _, err := testConfig.MAPIClient.MachineV1beta1().MachineSets(targetNamespace).Get("worker", metav1.GetOptions{}); err == nil {
 				machineSet = true
 				log.Info("MachineSet object has been created")
 			}
 
-			if workersList, err := testConfig.CAPIClient.ClusterV1alpha1().Machines(targetNamespace).List(metav1.ListOptions{}); err == nil {
+			if workersList, err := testConfig.MAPIClient.MachineV1beta1().Machines(targetNamespace).List(metav1.ListOptions{}); err == nil {
 				if len(workersList.Items) == machineSetReplicas {
 					workers = true
 					log.Info("Machine objects has been created")
@@ -527,7 +527,7 @@ var rootCmd = &cobra.Command{
 func tearDown(testConfig *TestConfig, assetsPath string) error {
 	// delete machine set
 	// not erroring here so we try to terraform destroy
-	if err := testConfig.CAPIClient.ClusterV1alpha1().MachineSets(targetNamespace).Delete("worker", &metav1.DeleteOptions{}); err != nil {
+	if err := testConfig.MAPIClient.MachineV1beta1().MachineSets(targetNamespace).Delete("worker", &metav1.DeleteOptions{}); err != nil {
 		log.Warningf("unable to delete machineSet, %v", err)
 	}
 
diff --git a/test/integration/manifests/0000_30_machine-api-operator_02_machine.crd.yaml b/test/integration/manifests/0000_30_machine-api-operator_02_machine.crd.yaml
deleted file mode 120000
index 0a8d210ccc..0000000000
--- a/test/integration/manifests/0000_30_machine-api-operator_02_machine.crd.yaml
+++ /dev/null
@@ -1 +0,0 @@
-../../../install/0000_30_machine-api-operator_02_machine.crd.yaml
\ No newline at end of file
diff --git a/test/integration/manifests/0000_30_machine-api-operator_03_machineset.crd.yaml b/test/integration/manifests/0000_30_machine-api-operator_03_machineset.crd.yaml
deleted file mode 120000
index 46cf844798..0000000000
--- a/test/integration/manifests/0000_30_machine-api-operator_03_machineset.crd.yaml
+++ /dev/null
@@ -1 +0,0 @@
-../../../install/0000_30_machine-api-operator_03_machineset.crd.yaml
\ No newline at end of file
diff --git a/test/integration/manifests/0000_30_machine-api-operator_04_machinedeployment.crd.yaml b/test/integration/manifests/0000_30_machine-api-operator_04_machinedeployment.crd.yaml
deleted file mode 120000
index cb7f3a0b6e..0000000000
--- a/test/integration/manifests/0000_30_machine-api-operator_04_machinedeployment.crd.yaml
+++ /dev/null
@@ -1 +0,0 @@
-../../../install/0000_30_machine-api-operator_04_machinedeployment.crd.yaml
\ No newline at end of file
diff --git a/test/integration/manifests/0000_30_machine-api-operator_05_cluster.crd.yaml b/test/integration/manifests/0000_30_machine-api-operator_05_cluster.crd.yaml
deleted file mode 120000
index 5e8528a7d3..0000000000
--- a/test/integration/manifests/0000_30_machine-api-operator_05_cluster.crd.yaml
+++ /dev/null
@@ -1 +0,0 @@
-../../../install/0000_30_machine-api-operator_05_cluster.crd.yaml
\ No newline at end of file
diff --git a/test/integration/manifests/0000_30_machine-api-operator_08_machine.crd.yaml b/test/integration/manifests/0000_30_machine-api-operator_08_machine.crd.yaml
new file mode 120000
index 0000000000..790f48e71d
--- /dev/null
+++ b/test/integration/manifests/0000_30_machine-api-operator_08_machine.crd.yaml
@@ -0,0 +1 @@
+../../../install/0000_30_machine-api-operator_08_machine.crd.yaml
\ No newline at end of file
diff --git a/test/integration/manifests/0000_30_machine-api-operator_09_machineset.crd.yaml b/test/integration/manifests/0000_30_machine-api-operator_09_machineset.crd.yaml
new file mode 120000
index 0000000000..7d85b42ced
--- /dev/null
+++ b/test/integration/manifests/0000_30_machine-api-operator_09_machineset.crd.yaml
@@ -0,0 +1 @@
+../../../install/0000_30_machine-api-operator_09_machineset.crd.yaml
\ No newline at end of file
diff --git a/test/integration/manifests/0000_30_machine-api-operator_10_machinedeployment.crd.yaml b/test/integration/manifests/0000_30_machine-api-operator_10_machinedeployment.crd.yaml
new file mode 120000
index 0000000000..d2a9c26c85
--- /dev/null
+++ b/test/integration/manifests/0000_30_machine-api-operator_10_machinedeployment.crd.yaml
@@ -0,0 +1 @@
+../../../install/0000_30_machine-api-operator_10_machinedeployment.crd.yaml
\ No newline at end of file
diff --git a/test/integration/manifests/0000_30_machine-api-operator_11_cluster.crd.yaml b/test/integration/manifests/0000_30_machine-api-operator_11_cluster.crd.yaml
new file mode 120000
index 0000000000..cfdbfd2754
--- /dev/null
+++ b/test/integration/manifests/0000_30_machine-api-operator_11_cluster.crd.yaml
@@ -0,0 +1 @@
+../../../install/0000_30_machine-api-operator_11_cluster.crd.yaml
\ No newline at end of file
diff --git a/test/integration/manifests/cluster.yaml b/test/integration/manifests/cluster.yaml
index c66fbb7677..ae74e36cd9 100644
--- a/test/integration/manifests/cluster.yaml
+++ b/test/integration/manifests/cluster.yaml
@@ -1,4 +1,4 @@
-apiVersion: cluster.k8s.io/v1alpha1
+apiVersion: machine.openshift.io/v1beta1
 kind: Cluster
 metadata:
   name: {{ .ClusterID }}
diff --git a/test/integration/manifests/images.configmap.yaml b/test/integration/manifests/images.configmap.yaml
index 139cd0072e..cba0a0fa6d 100644
--- a/test/integration/manifests/images.configmap.yaml
+++ b/test/integration/manifests/images.configmap.yaml
@@ -7,8 +7,5 @@ data:
   images.json: '{
 	"clusterAPIControllerAWS": "docker.io/openshift/origin-aws-machine-controllers:v4.0.0",
 	"clusterAPIControllerLibvirt": "docker.io/openshift/origin-libvirt-machine-controllers:v4.0.0",
-	"machineAPIOperator": "{{ .Image }}",
-    "clusterAPIControllerLibvirtDeprecated": "quay.io/coreos/cluster-api-provider-libvirt:origin-v4.0-2019-01-31-041134",
-    "clusterAPIControllerAWSDeprecated": "quay.io/coreos/cluster-api-provider-aws:origin-v4.0-2019-01-31-041134",
-    "clusterAPIControllerOpenStackDeprecated": "quay.io/coreos/cluster-api-provider-aws:origin-v4.0-2019-01-31-041134"
+	"machineAPIOperator": "{{ .Image }}"
 }'
\ No newline at end of file
diff --git a/test/integration/manifests/machineset.yaml b/test/integration/manifests/machineset.yaml
index cabd583a33..5fd1308722 100644
--- a/test/integration/manifests/machineset.yaml
+++ b/test/integration/manifests/machineset.yaml
@@ -1,4 +1,4 @@
-apiVersion: cluster.k8s.io/v1alpha1
+apiVersion: machine.openshift.io/v1beta1
 kind: MachineSet
 metadata:
   labels: