diff --git a/pkg/cluster/networkprofile_test.go b/pkg/cluster/networkprofile_test.go
index 1bfc14ce9a5..8c6ca7c4b6a 100644
--- a/pkg/cluster/networkprofile_test.go
+++ b/pkg/cluster/networkprofile_test.go
@@ -8,7 +8,7 @@ import (
 	"strings"
 	"testing"
 
-	mcv1 "github.com/openshift/machine-config-operator/pkg/apis/machineconfiguration.openshift.io/v1"
+	mcfgv1 "github.com/openshift/api/machineconfiguration/v1"
 	mcofake "github.com/openshift/machine-config-operator/pkg/generated/clientset/versioned/fake"
 	"github.com/stretchr/testify/assert"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -163,7 +163,7 @@ func TestEnsureMTUSize(t *testing.T) {
 					},
 				},
 				mcocli: mcofake.NewSimpleClientset(
-					&mcv1.MachineConfig{
+					&mcfgv1.MachineConfig{
 						ObjectMeta: metav1.ObjectMeta{
 							Name: "master",
 						},
@@ -197,7 +197,7 @@ func TestEnsureMTUSize(t *testing.T) {
 					},
 				},
 				mcocli: mcofake.NewSimpleClientset(
-					&mcv1.MachineConfig{
+					&mcfgv1.MachineConfig{
 						ObjectMeta: metav1.ObjectMeta{
 							Name: "master",
 						},
@@ -228,7 +228,7 @@ func TestEnsureMTUSize(t *testing.T) {
 					},
 				},
 				mcocli: mcofake.NewSimpleClientset(
-					&mcv1.MachineConfig{
+					&mcfgv1.MachineConfig{
 						ObjectMeta: metav1.ObjectMeta{
 							Name: "99-master-mtu",
 						},
@@ -259,7 +259,7 @@ func TestEnsureMTUSize(t *testing.T) {
 					},
 				},
 				mcocli: mcofake.NewSimpleClientset(
-					&mcv1.MachineConfig{
+					&mcfgv1.MachineConfig{
 						ObjectMeta: metav1.ObjectMeta{
 							Name: "master",
 						},
diff --git a/pkg/monitor/cluster/machineconfigpool_test.go b/pkg/monitor/cluster/machineconfigpool_test.go
index e4b3ba8fe8a..a6d1b140738 100644
--- a/pkg/monitor/cluster/machineconfigpool_test.go
+++ b/pkg/monitor/cluster/machineconfigpool_test.go
@@ -7,7 +7,7 @@ import (
 	"context"
 	"testing"
 
-	mcv1 "github.com/openshift/machine-config-operator/pkg/apis/machineconfiguration.openshift.io/v1"
+	mcfgv1 "github.com/openshift/api/machineconfiguration/v1"
 	mcofake "github.com/openshift/machine-config-operator/pkg/generated/clientset/versioned/fake"
 	"go.uber.org/mock/gomock"
 	corev1 "k8s.io/api/core/v1"
@@ -35,11 +35,11 @@ func TestEmitMachineConfigPoolUnmanagedNodes(t *testing.T) {
 					Name: "aro-master-0",
 				},
 			},
-			mcps: &mcv1.MachineConfigPool{
+			mcps: &mcfgv1.MachineConfigPool{
 				ObjectMeta: metav1.ObjectMeta{
 					Name: "machine-config-pool",
 				},
-				Status: mcv1.MachineConfigPoolStatus{
+				Status: mcfgv1.MachineConfigPoolStatus{
 					MachineCount: 0,
 				},
 			},
@@ -52,11 +52,11 @@ func TestEmitMachineConfigPoolUnmanagedNodes(t *testing.T) {
 					Name: "aro-master-0",
 				},
 			},
-			mcps: &mcv1.MachineConfigPool{
+			mcps: &mcfgv1.MachineConfigPool{
 				ObjectMeta: metav1.ObjectMeta{
 					Name: "machine-config-pool",
 				},
-				Status: mcv1.MachineConfigPoolStatus{
+				Status: mcfgv1.MachineConfigPoolStatus{
 					MachineCount: 2,
 				},
 			},
diff --git a/pkg/monitor/cluster/machineconfigpoolconditions.go b/pkg/monitor/cluster/machineconfigpoolconditions.go
index 6e310b1e56c..15d93526d56 100644
--- a/pkg/monitor/cluster/machineconfigpoolconditions.go
+++ b/pkg/monitor/cluster/machineconfigpoolconditions.go
@@ -6,18 +6,18 @@ package cluster
 import (
 	"context"
 
-	mcv1 "github.com/openshift/machine-config-operator/pkg/apis/machineconfiguration.openshift.io/v1"
+	mcfgv1 "github.com/openshift/api/machineconfiguration/v1"
 	"github.com/sirupsen/logrus"
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
 
-var machineConfigPoolConditionsExpected = map[mcv1.MachineConfigPoolConditionType]corev1.ConditionStatus{
-	mcv1.MachineConfigPoolDegraded:       corev1.ConditionFalse,
-	mcv1.MachineConfigPoolNodeDegraded:   corev1.ConditionFalse,
-	mcv1.MachineConfigPoolRenderDegraded: corev1.ConditionFalse,
-	mcv1.MachineConfigPoolUpdated:        corev1.ConditionTrue,
-	mcv1.MachineConfigPoolUpdating:       corev1.ConditionFalse,
+var machineConfigPoolConditionsExpected = map[mcfgv1.MachineConfigPoolConditionType]corev1.ConditionStatus{
+	mcfgv1.MachineConfigPoolDegraded:       corev1.ConditionFalse,
+	mcfgv1.MachineConfigPoolNodeDegraded:   corev1.ConditionFalse,
+	mcfgv1.MachineConfigPoolRenderDegraded: corev1.ConditionFalse,
+	mcfgv1.MachineConfigPoolUpdated:        corev1.ConditionTrue,
+	mcfgv1.MachineConfigPoolUpdating:       corev1.ConditionFalse,
 }
 
 func (mon *Monitor) emitMachineConfigPoolConditions(ctx context.Context) error {
diff --git a/pkg/monitor/cluster/machineconfigpoolconditions_test.go b/pkg/monitor/cluster/machineconfigpoolconditions_test.go
index 17abf24ac9d..4348291e1ad 100644
--- a/pkg/monitor/cluster/machineconfigpoolconditions_test.go
+++ b/pkg/monitor/cluster/machineconfigpoolconditions_test.go
@@ -7,7 +7,7 @@ import (
 	"context"
 	"testing"
 
-	mcv1 "github.com/openshift/machine-config-operator/pkg/apis/machineconfiguration.openshift.io/v1"
+	mcfgv1 "github.com/openshift/api/machineconfiguration/v1"
 	mcofake "github.com/openshift/machine-config-operator/pkg/generated/clientset/versioned/fake"
 	"go.uber.org/mock/gomock"
 	corev1 "k8s.io/api/core/v1"
@@ -19,30 +19,30 @@ import (
 func TestEmitMachineConfigPoolConditions(t *testing.T) {
 	ctx := context.Background()
 
-	mcocli := mcofake.NewSimpleClientset(&mcv1.MachineConfigPool{
+	mcocli := mcofake.NewSimpleClientset(&mcfgv1.MachineConfigPool{
 		ObjectMeta: metav1.ObjectMeta{
 			Name: "machine-config-pool",
 		},
-		Status: mcv1.MachineConfigPoolStatus{
-			Conditions: []mcv1.MachineConfigPoolCondition{
+		Status: mcfgv1.MachineConfigPoolStatus{
+			Conditions: []mcfgv1.MachineConfigPoolCondition{
 				{
-					Type:   mcv1.MachineConfigPoolDegraded,
+					Type:   mcfgv1.MachineConfigPoolDegraded,
 					Status: corev1.ConditionTrue,
 				},
 				{
-					Type:   mcv1.MachineConfigPoolNodeDegraded,
+					Type:   mcfgv1.MachineConfigPoolNodeDegraded,
 					Status: corev1.ConditionTrue,
 				},
 				{
-					Type:   mcv1.MachineConfigPoolRenderDegraded,
+					Type:   mcfgv1.MachineConfigPoolRenderDegraded,
 					Status: corev1.ConditionTrue,
 				},
 				{
-					Type:   mcv1.MachineConfigPoolUpdated,
+					Type:   mcfgv1.MachineConfigPoolUpdated,
 					Status: corev1.ConditionFalse,
 				},
 				{
-					Type:   mcv1.MachineConfigPoolUpdating,
+					Type:   mcfgv1.MachineConfigPoolUpdating,
 					Status: corev1.ConditionTrue,
 				},
 			},
diff --git a/pkg/operator/controllers/autosizednodes/autosizednodes_controller.go b/pkg/operator/controllers/autosizednodes/autosizednodes_controller.go
index d420a2e76c2..7a029bc50a3 100644
--- a/pkg/operator/controllers/autosizednodes/autosizednodes_controller.go
+++ b/pkg/operator/controllers/autosizednodes/autosizednodes_controller.go
@@ -8,7 +8,7 @@ import (
 	"fmt"
 
 	"github.com/Azure/go-autorest/autorest/to"
-	mcv1 "github.com/openshift/machine-config-operator/pkg/apis/machineconfiguration.openshift.io/v1"
+	mcfgv1 "github.com/openshift/api/machineconfiguration/v1"
 	"github.com/sirupsen/logrus"
 	kerrors "k8s.io/apimachinery/pkg/api/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -61,7 +61,7 @@ func (r *Reconciler) Reconcile(ctx context.Context, request ctrl.Request) (ctrl.
 
 	if !aro.Spec.OperatorFlags.GetSimpleBoolean(operator.AutosizedNodesEnabled) {
 		// defaults to deleting the config
-		config := mcv1.KubeletConfig{
+		config := mcfgv1.KubeletConfig{
 			ObjectMeta: metav1.ObjectMeta{
 				Name: configName,
 			},
@@ -75,7 +75,7 @@ func (r *Reconciler) Reconcile(ctx context.Context, request ctrl.Request) (ctrl.
 
 	defaultConfig := makeConfig()
 
-	var config mcv1.KubeletConfig
+	var config mcfgv1.KubeletConfig
 	err = r.client.Get(ctx, key, &config)
 	if kerrors.IsNotFound(err) {
 		// If config doesn't exist, create a new one
@@ -105,17 +105,17 @@ func (r *Reconciler) SetupWithManager(mgr ctrl.Manager) error {
 	// Any changes will trigger reconcile, but only for that config.
 	return ctrl.NewControllerManagedBy(mgr).
 		For(&arov1alpha1.Cluster{}, builder.WithPredicates(predicate.And(predicates.AROCluster, predicate.GenerationChangedPredicate{}))).
-		Owns(&mcv1.KubeletConfig{}).
+		Owns(&mcfgv1.KubeletConfig{}).
 		Named(ControllerName).
 		Complete(r)
 }
 
-func makeConfig() mcv1.KubeletConfig {
-	return mcv1.KubeletConfig{
+func makeConfig() mcfgv1.KubeletConfig {
+	return mcfgv1.KubeletConfig{
 		ObjectMeta: metav1.ObjectMeta{
 			Name: configName,
 		},
-		Spec: mcv1.KubeletConfigSpec{
+		Spec: mcfgv1.KubeletConfigSpec{
 			AutoSizingReserved: to.BoolPtr(true),
 			MachineConfigPoolSelector: &metav1.LabelSelector{
 				MatchExpressions: []metav1.LabelSelectorRequirement{
diff --git a/pkg/operator/controllers/autosizednodes/autosizednodes_controller_test.go b/pkg/operator/controllers/autosizednodes/autosizednodes_controller_test.go
index 916e2738469..84bdd33832f 100644
--- a/pkg/operator/controllers/autosizednodes/autosizednodes_controller_test.go
+++ b/pkg/operator/controllers/autosizednodes/autosizednodes_controller_test.go
@@ -11,7 +11,7 @@ import (
 
 	"github.com/Azure/go-autorest/autorest/to"
 	"github.com/google/go-cmp/cmp"
-	mcv1 "github.com/openshift/machine-config-operator/pkg/apis/machineconfiguration.openshift.io/v1"
+	mcfgv1 "github.com/openshift/api/machineconfiguration/v1"
 	"github.com/sirupsen/logrus"
 	kerrors "k8s.io/apimachinery/pkg/api/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -43,20 +43,20 @@ func TestAutosizednodesReconciler(t *testing.T) {
 		}
 	}
 
-	emptyConfig := mcv1.KubeletConfig{}
+	emptyConfig := mcfgv1.KubeletConfig{}
 	config := makeConfig()
 
 	tests := []struct {
 		name       string
 		wantErrMsg string
 		client     client.Client
-		wantConfig *mcv1.KubeletConfig
+		wantConfig *mcfgv1.KubeletConfig
 	}{
 		{
 			name:       "is not needed",
 			client:     fake.NewClientBuilder().WithRuntimeObjects(aro(false)).Build(),
 			wantConfig: &emptyConfig,
-			wantErrMsg: kerrors.NewNotFound(mcv1.Resource("kubeletconfigs"), "dynamic-node").Error(),
+			wantErrMsg: kerrors.NewNotFound(mcfgv1.Resource("kubeletconfigs"), "dynamic-node").Error(),
 		},
 		{
 			name:       "is needed and not present already",
@@ -72,17 +72,17 @@ func TestAutosizednodesReconciler(t *testing.T) {
 			name:       "is not needed and is present",
 			client:     fake.NewClientBuilder().WithRuntimeObjects(aro(false), &config).Build(),
 			wantConfig: &emptyConfig,
-			wantErrMsg: kerrors.NewNotFound(mcv1.Resource("kubeletconfigs"), "dynamic-node").Error(),
+			wantErrMsg: kerrors.NewNotFound(mcfgv1.Resource("kubeletconfigs"), "dynamic-node").Error(),
 		},
 		{
 			name: "is needed and config got modified",
 			client: fake.NewClientBuilder().WithRuntimeObjects(
 				aro(true),
-				&mcv1.KubeletConfig{
+				&mcfgv1.KubeletConfig{
 					ObjectMeta: metav1.ObjectMeta{
 						Name: configName,
 					},
-					Spec: mcv1.KubeletConfigSpec{
+					Spec: mcfgv1.KubeletConfigSpec{
 						AutoSizingReserved: to.BoolPtr(false),
 						MachineConfigPoolSelector: &metav1.LabelSelector{
 							MatchExpressions: []metav1.LabelSelectorRequirement{
@@ -113,7 +113,7 @@ func TestAutosizednodesReconciler(t *testing.T) {
 			key := types.NamespacedName{
 				Name: configName,
 			}
-			var c mcv1.KubeletConfig
+			var c mcfgv1.KubeletConfig
 
 			err = r.client.Get(ctx, key, &c)
 			utilerror.AssertErrorMessage(t, err, test.wantErrMsg)
diff --git a/pkg/operator/controllers/dnsmasq/cluster_controller.go b/pkg/operator/controllers/dnsmasq/cluster_controller.go
index 9d6167fc447..8492289ca2b 100644
--- a/pkg/operator/controllers/dnsmasq/cluster_controller.go
+++ b/pkg/operator/controllers/dnsmasq/cluster_controller.go
@@ -8,7 +8,7 @@ import (
 	"fmt"
 
 	configv1 "github.com/openshift/api/config/v1"
-	mcv1 "github.com/openshift/machine-config-operator/pkg/apis/machineconfiguration.openshift.io/v1"
+	mcfgv1 "github.com/openshift/api/machineconfiguration/v1"
 	"github.com/sirupsen/logrus"
 	kerrors "k8s.io/apimachinery/pkg/api/errors"
 	kruntime "k8s.io/apimachinery/pkg/runtime"
@@ -74,7 +74,7 @@ func (r *ClusterReconciler) Reconcile(ctx context.Context, request ctrl.Request)
 	}
 
 	r.Log.Debug("running")
-	mcps := &mcv1.MachineConfigPoolList{}
+	mcps := &mcfgv1.MachineConfigPoolList{}
 	err = r.Client.List(ctx, mcps)
 	if err != nil {
 		r.Log.Error(err)
@@ -110,7 +110,7 @@ func (r *ClusterReconciler) SetupWithManager(mgr ctrl.Manager) error {
 		Complete(r)
 }
 
-func reconcileMachineConfigs(ctx context.Context, instance *arov1alpha1.Cluster, ch clienthelper.Interface, c client.Client, allowReconcile bool, restartDnsmasq bool, mcps ...mcv1.MachineConfigPool) error {
+func reconcileMachineConfigs(ctx context.Context, instance *arov1alpha1.Cluster, ch clienthelper.Interface, c client.Client, allowReconcile bool, restartDnsmasq bool, mcps ...mcfgv1.MachineConfigPool) error {
 	var resources []kruntime.Object
 	for _, mcp := range mcps {
 		resource, err := dnsmasqMachineConfig(instance.Spec.Domain, instance.Spec.APIIntIP, instance.Spec.IngressIP, mcp.Name, instance.Spec.GatewayDomains, instance.Spec.GatewayPrivateEndpointIP, restartDnsmasq)
diff --git a/pkg/operator/controllers/dnsmasq/cluster_controller_test.go b/pkg/operator/controllers/dnsmasq/cluster_controller_test.go
index f7cb499dc13..a6fab7d3352 100644
--- a/pkg/operator/controllers/dnsmasq/cluster_controller_test.go
+++ b/pkg/operator/controllers/dnsmasq/cluster_controller_test.go
@@ -9,8 +9,8 @@ import (
 	"time"
 
 	configv1 "github.com/openshift/api/config/v1"
+	mcfgv1 "github.com/openshift/api/machineconfiguration/v1"
 	operatorv1 "github.com/openshift/api/operator/v1"
-	mcv1 "github.com/openshift/machine-config-operator/pkg/apis/machineconfiguration.openshift.io/v1"
 	"github.com/sirupsen/logrus"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	ctrl "sigs.k8s.io/controller-runtime"
@@ -115,10 +115,10 @@ func TestClusterReconciler(t *testing.T) {
 						},
 					},
 				},
-				&mcv1.MachineConfigPool{
+				&mcfgv1.MachineConfigPool{
 					ObjectMeta: metav1.ObjectMeta{Name: "master"},
-					Status:     mcv1.MachineConfigPoolStatus{},
-					Spec:       mcv1.MachineConfigPoolSpec{},
+					Status:     mcfgv1.MachineConfigPoolStatus{},
+					Spec:       mcfgv1.MachineConfigPoolSpec{},
 				},
 			},
 			wantCreated: map[string]int{
@@ -143,10 +143,10 @@ func TestClusterReconciler(t *testing.T) {
 						},
 					},
 				},
-				&mcv1.MachineConfigPool{
+				&mcfgv1.MachineConfigPool{
 					ObjectMeta: metav1.ObjectMeta{Name: "master"},
-					Status:     mcv1.MachineConfigPoolStatus{},
-					Spec:       mcv1.MachineConfigPoolSpec{},
+					Status:     mcfgv1.MachineConfigPoolStatus{},
+					Spec:       mcfgv1.MachineConfigPoolSpec{},
 				},
 			},
 			wantCreated: map[string]int{},
@@ -176,10 +176,10 @@ func TestClusterReconciler(t *testing.T) {
 						},
 					},
 				},
-				&mcv1.MachineConfigPool{
+				&mcfgv1.MachineConfigPool{
 					ObjectMeta: metav1.ObjectMeta{Name: "master"},
-					Status:     mcv1.MachineConfigPoolStatus{},
-					Spec:       mcv1.MachineConfigPoolSpec{},
+					Status:     mcfgv1.MachineConfigPoolStatus{},
+					Spec:       mcfgv1.MachineConfigPoolSpec{},
 				},
 				&configv1.ClusterVersion{
 					ObjectMeta: metav1.ObjectMeta{
@@ -217,14 +217,14 @@ func TestClusterReconciler(t *testing.T) {
 						},
 					},
 				},
-				&mcv1.MachineConfigPool{
+				&mcfgv1.MachineConfigPool{
 					ObjectMeta: metav1.ObjectMeta{Name: "master"},
-					Status:     mcv1.MachineConfigPoolStatus{},
-					Spec:       mcv1.MachineConfigPoolSpec{},
+					Status:     mcfgv1.MachineConfigPoolStatus{},
+					Spec:       mcfgv1.MachineConfigPoolSpec{},
 				},
-				&mcv1.MachineConfig{
+				&mcfgv1.MachineConfig{
 					ObjectMeta: metav1.ObjectMeta{Name: "99-master-aro-dns"},
-					Spec:       mcv1.MachineConfigSpec{},
+					Spec:       mcfgv1.MachineConfigSpec{},
 				},
 				&configv1.ClusterVersion{
 					ObjectMeta: metav1.ObjectMeta{
@@ -260,14 +260,14 @@ func TestClusterReconciler(t *testing.T) {
 						},
 					},
 				},
-				&mcv1.MachineConfigPool{
+				&mcfgv1.MachineConfigPool{
 					ObjectMeta: metav1.ObjectMeta{Name: "master"},
-					Status:     mcv1.MachineConfigPoolStatus{},
-					Spec:       mcv1.MachineConfigPoolSpec{},
+					Status:     mcfgv1.MachineConfigPoolStatus{},
+					Spec:       mcfgv1.MachineConfigPoolSpec{},
 				},
-				&mcv1.MachineConfig{
+				&mcfgv1.MachineConfig{
 					ObjectMeta: metav1.ObjectMeta{Name: "99-master-aro-dns"},
-					Spec:       mcv1.MachineConfigSpec{},
+					Spec:       mcfgv1.MachineConfigSpec{},
 				},
 				&configv1.ClusterVersion{
 					ObjectMeta: metav1.ObjectMeta{
@@ -306,10 +306,10 @@ func TestClusterReconciler(t *testing.T) {
 						},
 					},
 				},
-				&mcv1.MachineConfigPool{
+				&mcfgv1.MachineConfigPool{
 					ObjectMeta: metav1.ObjectMeta{Name: "master"},
-					Status:     mcv1.MachineConfigPoolStatus{},
-					Spec:       mcv1.MachineConfigPoolSpec{},
+					Status:     mcfgv1.MachineConfigPoolStatus{},
+					Spec:       mcfgv1.MachineConfigPoolSpec{},
 				},
 				&configv1.ClusterVersion{
 					ObjectMeta: metav1.ObjectMeta{
diff --git a/pkg/operator/controllers/dnsmasq/dnsmasq.go b/pkg/operator/controllers/dnsmasq/dnsmasq.go
index 0dd82453f03..ccc9d8112a3 100644
--- a/pkg/operator/controllers/dnsmasq/dnsmasq.go
+++ b/pkg/operator/controllers/dnsmasq/dnsmasq.go
@@ -13,7 +13,7 @@ import (
 	"github.com/Azure/go-autorest/autorest/to"
 	"github.com/coreos/go-semver/semver"
 	ign3types "github.com/coreos/ignition/v2/config/v3_2/types"
-	mcv1 "github.com/openshift/machine-config-operator/pkg/apis/machineconfiguration.openshift.io/v1"
+	mcfgv1 "github.com/openshift/api/machineconfiguration/v1"
 	"github.com/vincent-petithory/dataurl"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime"
@@ -156,7 +156,7 @@ func ignition3Config(clusterDomain, apiIntIP, ingressIP string, gatewayDomains [
 	return ign, nil
 }
 
-func dnsmasqMachineConfig(clusterDomain, apiIntIP, ingressIP, role string, gatewayDomains []string, gatewayPrivateEndpointIP string, restartDnsmasq bool) (*mcv1.MachineConfig, error) {
+func dnsmasqMachineConfig(clusterDomain, apiIntIP, ingressIP, role string, gatewayDomains []string, gatewayPrivateEndpointIP string, restartDnsmasq bool) (*mcfgv1.MachineConfig, error) {
 	ignConfig, err := ignition3Config(clusterDomain, apiIntIP, ingressIP, gatewayDomains, gatewayPrivateEndpointIP, restartDnsmasq)
 	if err != nil {
 		return nil, err
@@ -180,9 +180,9 @@ func dnsmasqMachineConfig(clusterDomain, apiIntIP, ingressIP, role string, gatew
 		return nil, err
 	}
 
-	return &mcv1.MachineConfig{
+	return &mcfgv1.MachineConfig{
 		TypeMeta: metav1.TypeMeta{
-			APIVersion: mcv1.SchemeGroupVersion.String(),
+			APIVersion: mcfgv1.SchemeGroupVersion.String(),
 			Kind:       "MachineConfig",
 		},
 		ObjectMeta: metav1.ObjectMeta{
@@ -191,7 +191,7 @@ func dnsmasqMachineConfig(clusterDomain, apiIntIP, ingressIP, role string, gatew
 				"machineconfiguration.openshift.io/role": role,
 			},
 		},
-		Spec: mcv1.MachineConfigSpec{
+		Spec: mcfgv1.MachineConfigSpec{
 			Config: rawExt,
 		},
 	}, nil
diff --git a/pkg/operator/controllers/dnsmasq/machineconfig_controller.go b/pkg/operator/controllers/dnsmasq/machineconfig_controller.go
index b045bbeede9..414a0ff3ed4 100644
--- a/pkg/operator/controllers/dnsmasq/machineconfig_controller.go
+++ b/pkg/operator/controllers/dnsmasq/machineconfig_controller.go
@@ -7,7 +7,7 @@ import (
 	"context"
 	"regexp"
 
-	mcv1 "github.com/openshift/machine-config-operator/pkg/apis/machineconfiguration.openshift.io/v1"
+	mcfgv1 "github.com/openshift/api/machineconfiguration/v1"
 	"github.com/sirupsen/logrus"
 	kerrors "k8s.io/apimachinery/pkg/api/errors"
 	"k8s.io/apimachinery/pkg/types"
@@ -74,7 +74,7 @@ func (r *MachineConfigReconciler) Reconcile(ctx context.Context, request ctrl.Re
 	}
 	role := m[1]
 
-	mcp := &mcv1.MachineConfigPool{}
+	mcp := &mcfgv1.MachineConfigPool{}
 	err = r.Client.Get(ctx, types.NamespacedName{Name: role}, mcp)
 	if kerrors.IsNotFound(err) {
 		r.ClearDegraded(ctx)
@@ -103,7 +103,7 @@ func (r *MachineConfigReconciler) Reconcile(ctx context.Context, request ctrl.Re
 // SetupWithManager setup our mananger
 func (r *MachineConfigReconciler) SetupWithManager(mgr ctrl.Manager) error {
 	return ctrl.NewControllerManagedBy(mgr).
-		For(&mcv1.MachineConfig{}).
+		For(&mcfgv1.MachineConfig{}).
 		Named(MachineConfigControllerName).
 		Complete(r)
 }
diff --git a/pkg/operator/controllers/dnsmasq/machineconfig_controller_test.go b/pkg/operator/controllers/dnsmasq/machineconfig_controller_test.go
index 266957c2b0a..59867fdff90 100644
--- a/pkg/operator/controllers/dnsmasq/machineconfig_controller_test.go
+++ b/pkg/operator/controllers/dnsmasq/machineconfig_controller_test.go
@@ -9,8 +9,8 @@ import (
 	"time"
 
 	configv1 "github.com/openshift/api/config/v1"
+	mcfgv1 "github.com/openshift/api/machineconfiguration/v1"
 	operatorv1 "github.com/openshift/api/operator/v1"
-	mcv1 "github.com/openshift/machine-config-operator/pkg/apis/machineconfiguration.openshift.io/v1"
 	"github.com/sirupsen/logrus"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/types"
@@ -79,10 +79,10 @@ func TestMachineConfigReconciler(t *testing.T) {
 						},
 					},
 				},
-				&mcv1.MachineConfigPool{
+				&mcfgv1.MachineConfigPool{
 					ObjectMeta: metav1.ObjectMeta{Name: "master"},
-					Status:     mcv1.MachineConfigPoolStatus{},
-					Spec:       mcv1.MachineConfigPoolSpec{},
+					Status:     mcfgv1.MachineConfigPoolStatus{},
+					Spec:       mcfgv1.MachineConfigPoolSpec{},
 				},
 			},
 			request:    ctrl.Request{},
@@ -171,10 +171,10 @@ func TestMachineConfigReconcilerNotUpgrading(t *testing.T) {
 						},
 					},
 				},
-				&mcv1.MachineConfigPool{
+				&mcfgv1.MachineConfigPool{
 					ObjectMeta: metav1.ObjectMeta{Name: "custom"},
-					Status:     mcv1.MachineConfigPoolStatus{},
-					Spec:       mcv1.MachineConfigPoolSpec{},
+					Status:     mcfgv1.MachineConfigPoolStatus{},
+					Spec:       mcfgv1.MachineConfigPoolSpec{},
 				},
 			},
 			wantCreated: map[string]int{
@@ -204,14 +204,14 @@ func TestMachineConfigReconcilerNotUpgrading(t *testing.T) {
 						},
 					},
 				},
-				&mcv1.MachineConfigPool{
+				&mcfgv1.MachineConfigPool{
 					ObjectMeta: metav1.ObjectMeta{Name: "custom"},
-					Status:     mcv1.MachineConfigPoolStatus{},
-					Spec:       mcv1.MachineConfigPoolSpec{},
+					Status:     mcfgv1.MachineConfigPoolStatus{},
+					Spec:       mcfgv1.MachineConfigPoolSpec{},
 				},
-				&mcv1.MachineConfig{
+				&mcfgv1.MachineConfig{
 					ObjectMeta: metav1.ObjectMeta{Name: "99-custom-aro-dns"},
-					Spec:       mcv1.MachineConfigSpec{},
+					Spec:       mcfgv1.MachineConfigSpec{},
 				},
 			},
 			wantCreated: map[string]int{},
@@ -240,14 +240,14 @@ func TestMachineConfigReconcilerNotUpgrading(t *testing.T) {
 						},
 					},
 				},
-				&mcv1.MachineConfigPool{
+				&mcfgv1.MachineConfigPool{
 					ObjectMeta: metav1.ObjectMeta{Name: "custom"},
-					Status:     mcv1.MachineConfigPoolStatus{},
-					Spec:       mcv1.MachineConfigPoolSpec{},
+					Status:     mcfgv1.MachineConfigPoolStatus{},
+					Spec:       mcfgv1.MachineConfigPoolSpec{},
 				},
-				&mcv1.MachineConfig{
+				&mcfgv1.MachineConfig{
 					ObjectMeta: metav1.ObjectMeta{Name: "99-custom-aro-dns"},
-					Spec:       mcv1.MachineConfigSpec{},
+					Spec:       mcfgv1.MachineConfigSpec{},
 				},
 			},
 			wantCreated: map[string]int{},
@@ -386,10 +386,10 @@ func TestMachineConfigReconcilerClusterUpgrading(t *testing.T) {
 						},
 					},
 				},
-				&mcv1.MachineConfigPool{
+				&mcfgv1.MachineConfigPool{
 					ObjectMeta: metav1.ObjectMeta{Name: "custom"},
-					Status:     mcv1.MachineConfigPoolStatus{},
-					Spec:       mcv1.MachineConfigPoolSpec{},
+					Status:     mcfgv1.MachineConfigPoolStatus{},
+					Spec:       mcfgv1.MachineConfigPoolSpec{},
 				},
 			},
 			wantCreated: map[string]int{
@@ -419,14 +419,14 @@ func TestMachineConfigReconcilerClusterUpgrading(t *testing.T) {
 						},
 					},
 				},
-				&mcv1.MachineConfigPool{
+				&mcfgv1.MachineConfigPool{
 					ObjectMeta: metav1.ObjectMeta{Name: "custom"},
-					Status:     mcv1.MachineConfigPoolStatus{},
-					Spec:       mcv1.MachineConfigPoolSpec{},
+					Status:     mcfgv1.MachineConfigPoolStatus{},
+					Spec:       mcfgv1.MachineConfigPoolSpec{},
 				},
-				&mcv1.MachineConfig{
+				&mcfgv1.MachineConfig{
 					ObjectMeta: metav1.ObjectMeta{Name: "99-custom-aro-dns"},
-					Spec:       mcv1.MachineConfigSpec{},
+					Spec:       mcfgv1.MachineConfigSpec{},
 				},
 			},
 			wantCreated: map[string]int{},
@@ -456,13 +456,13 @@ func TestMachineConfigReconcilerClusterUpgrading(t *testing.T) {
 						},
 					},
 				},
-				&mcv1.MachineConfigPool{
+				&mcfgv1.MachineConfigPool{
 					ObjectMeta: metav1.ObjectMeta{
 						Name:              "custom",
 						DeletionTimestamp: &transitionTime,
 					},
-					Status: mcv1.MachineConfigPoolStatus{},
-					Spec:   mcv1.MachineConfigPoolSpec{},
+					Status: mcfgv1.MachineConfigPoolStatus{},
+					Spec:   mcfgv1.MachineConfigPoolSpec{},
 				},
 			},
 			request: ctrl.Request{
diff --git a/pkg/operator/controllers/dnsmasq/machineconfigpool_controller.go b/pkg/operator/controllers/dnsmasq/machineconfigpool_controller.go
index 1f9932f1d5e..dc32479bbcd 100644
--- a/pkg/operator/controllers/dnsmasq/machineconfigpool_controller.go
+++ b/pkg/operator/controllers/dnsmasq/machineconfigpool_controller.go
@@ -6,7 +6,7 @@ package dnsmasq
 import (
 	"context"
 
-	mcv1 "github.com/openshift/machine-config-operator/pkg/apis/machineconfiguration.openshift.io/v1"
+	mcfgv1 "github.com/openshift/api/machineconfiguration/v1"
 	"github.com/sirupsen/logrus"
 	kerrors "k8s.io/apimachinery/pkg/api/errors"
 	"k8s.io/apimachinery/pkg/types"
@@ -66,7 +66,7 @@ func (r *MachineConfigPoolReconciler) Reconcile(ctx context.Context, request ctr
 	}
 
 	r.Log.Debug("running")
-	mcp := &mcv1.MachineConfigPool{}
+	mcp := &mcfgv1.MachineConfigPool{}
 	err = r.Client.Get(ctx, types.NamespacedName{Name: request.Name}, mcp)
 	if kerrors.IsNotFound(err) {
 		r.ClearDegraded(ctx)
@@ -95,7 +95,7 @@ func (r *MachineConfigPoolReconciler) Reconcile(ctx context.Context, request ctr
 // SetupWithManager setup our mananger
 func (r *MachineConfigPoolReconciler) SetupWithManager(mgr ctrl.Manager) error {
 	return ctrl.NewControllerManagedBy(mgr).
-		For(&mcv1.MachineConfigPool{}).
+		For(&mcfgv1.MachineConfigPool{}).
 		Named(MachineConfigPoolControllerName).
 		Complete(r)
 }
diff --git a/pkg/operator/controllers/dnsmasq/machineconfigpool_controller_test.go b/pkg/operator/controllers/dnsmasq/machineconfigpool_controller_test.go
index 8c84dc1214d..3ecf7d62bd8 100644
--- a/pkg/operator/controllers/dnsmasq/machineconfigpool_controller_test.go
+++ b/pkg/operator/controllers/dnsmasq/machineconfigpool_controller_test.go
@@ -9,8 +9,8 @@ import (
 	"time"
 
 	configv1 "github.com/openshift/api/config/v1"
+	mcfgv1 "github.com/openshift/api/machineconfiguration/v1"
 	operatorv1 "github.com/openshift/api/operator/v1"
-	mcv1 "github.com/openshift/machine-config-operator/pkg/apis/machineconfiguration.openshift.io/v1"
 	"github.com/sirupsen/logrus"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/types"
@@ -78,13 +78,13 @@ func TestMachineConfigPoolReconciler(t *testing.T) {
 						},
 					},
 				},
-				&mcv1.MachineConfigPool{
+				&mcfgv1.MachineConfigPool{
 					ObjectMeta: metav1.ObjectMeta{
 						Name:       "custom",
 						Finalizers: []string{MachineConfigPoolControllerName},
 					},
-					Status: mcv1.MachineConfigPoolStatus{},
-					Spec:   mcv1.MachineConfigPoolSpec{},
+					Status: mcfgv1.MachineConfigPoolStatus{},
+					Spec:   mcfgv1.MachineConfigPoolSpec{},
 				},
 			},
 			request: ctrl.Request{
@@ -214,14 +214,14 @@ func TestMachineConfigPoolReconcilerNotUpgrading(t *testing.T) {
 						},
 					},
 				},
-				&mcv1.MachineConfigPool{
+				&mcfgv1.MachineConfigPool{
 					ObjectMeta: metav1.ObjectMeta{
 						Name:              "custom",
 						Finalizers:        []string{MachineConfigPoolControllerName},
 						DeletionTimestamp: &transitionTime,
 					},
-					Status: mcv1.MachineConfigPoolStatus{},
-					Spec:   mcv1.MachineConfigPoolSpec{},
+					Status: mcfgv1.MachineConfigPoolStatus{},
+					Spec:   mcfgv1.MachineConfigPoolSpec{},
 				},
 			},
 			wantCreated: map[string]int{},
@@ -249,13 +249,13 @@ func TestMachineConfigPoolReconcilerNotUpgrading(t *testing.T) {
 						},
 					},
 				},
-				&mcv1.MachineConfigPool{
+				&mcfgv1.MachineConfigPool{
 					ObjectMeta: metav1.ObjectMeta{
 						Name:       "custom",
 						Finalizers: []string{MachineConfigPoolControllerName},
 					},
-					Status: mcv1.MachineConfigPoolStatus{},
-					Spec:   mcv1.MachineConfigPoolSpec{},
+					Status: mcfgv1.MachineConfigPoolStatus{},
+					Spec:   mcfgv1.MachineConfigPoolSpec{},
 				},
 			},
 			wantCreated: map[string]int{
@@ -285,17 +285,17 @@ func TestMachineConfigPoolReconcilerNotUpgrading(t *testing.T) {
 						},
 					},
 				},
-				&mcv1.MachineConfigPool{
+				&mcfgv1.MachineConfigPool{
 					ObjectMeta: metav1.ObjectMeta{
 						Name:       "custom",
 						Finalizers: []string{MachineConfigPoolControllerName},
 					},
-					Status: mcv1.MachineConfigPoolStatus{},
-					Spec:   mcv1.MachineConfigPoolSpec{},
+					Status: mcfgv1.MachineConfigPoolStatus{},
+					Spec:   mcfgv1.MachineConfigPoolSpec{},
 				},
-				&mcv1.MachineConfig{
+				&mcfgv1.MachineConfig{
 					ObjectMeta: metav1.ObjectMeta{Name: "99-custom-aro-dns"},
-					Spec:       mcv1.MachineConfigSpec{},
+					Spec:       mcfgv1.MachineConfigSpec{},
 				},
 			},
 			wantCreated: map[string]int{},
@@ -324,17 +324,17 @@ func TestMachineConfigPoolReconcilerNotUpgrading(t *testing.T) {
 						},
 					},
 				},
-				&mcv1.MachineConfigPool{
+				&mcfgv1.MachineConfigPool{
 					ObjectMeta: metav1.ObjectMeta{
 						Name:       "custom",
 						Finalizers: []string{MachineConfigPoolControllerName},
 					},
-					Status: mcv1.MachineConfigPoolStatus{},
-					Spec:   mcv1.MachineConfigPoolSpec{},
+					Status: mcfgv1.MachineConfigPoolStatus{},
+					Spec:   mcfgv1.MachineConfigPoolSpec{},
 				},
-				&mcv1.MachineConfig{
+				&mcfgv1.MachineConfig{
 					ObjectMeta: metav1.ObjectMeta{Name: "99-custom-aro-dns"},
-					Spec:       mcv1.MachineConfigSpec{},
+					Spec:       mcfgv1.MachineConfigSpec{},
 				},
 			},
 			wantCreated: map[string]int{},
@@ -437,13 +437,13 @@ func TestMachineConfigPoolReconcilerClusterUpgrading(t *testing.T) {
 						},
 					},
 				},
-				&mcv1.MachineConfigPool{
+				&mcfgv1.MachineConfigPool{
 					ObjectMeta: metav1.ObjectMeta{
 						Name:       "custom",
 						Finalizers: []string{MachineConfigPoolControllerName},
 					},
-					Status: mcv1.MachineConfigPoolStatus{},
-					Spec:   mcv1.MachineConfigPoolSpec{},
+					Status: mcfgv1.MachineConfigPoolStatus{},
+					Spec:   mcfgv1.MachineConfigPoolSpec{},
 				},
 			},
 			wantCreated: map[string]int{
@@ -473,17 +473,17 @@ func TestMachineConfigPoolReconcilerClusterUpgrading(t *testing.T) {
 						},
 					},
 				},
-				&mcv1.MachineConfigPool{
+				&mcfgv1.MachineConfigPool{
 					ObjectMeta: metav1.ObjectMeta{
 						Name:       "custom",
 						Finalizers: []string{MachineConfigPoolControllerName},
 					},
-					Status: mcv1.MachineConfigPoolStatus{},
-					Spec:   mcv1.MachineConfigPoolSpec{},
+					Status: mcfgv1.MachineConfigPoolStatus{},
+					Spec:   mcfgv1.MachineConfigPoolSpec{},
 				},
-				&mcv1.MachineConfig{
+				&mcfgv1.MachineConfig{
 					ObjectMeta: metav1.ObjectMeta{Name: "99-custom-aro-dns"},
-					Spec:       mcv1.MachineConfigSpec{},
+					Spec:       mcfgv1.MachineConfigSpec{},
 				},
 			},
 			wantCreated: map[string]int{},
diff --git a/pkg/operator/controllers/etchosts/cluster_controller.go b/pkg/operator/controllers/etchosts/cluster_controller.go
index 76c900b2308..f8a00224d2a 100644
--- a/pkg/operator/controllers/etchosts/cluster_controller.go
+++ b/pkg/operator/controllers/etchosts/cluster_controller.go
@@ -6,7 +6,7 @@ package etchosts
 import (
 	"context"
 
-	mcv1 "github.com/openshift/machine-config-operator/pkg/apis/machineconfiguration.openshift.io/v1"
+	mcfgv1 "github.com/openshift/api/machineconfiguration/v1"
 	"github.com/sirupsen/logrus"
 	kerrors "k8s.io/apimachinery/pkg/api/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -31,7 +31,7 @@ const (
 )
 
 var (
-	etchostsMasterMCMetadata = &mcv1.MachineConfig{
+	etchostsMasterMCMetadata = &mcfgv1.MachineConfig{
 		ObjectMeta: metav1.ObjectMeta{
 			Name: "99-master-aro-etc-hosts-gateway-domains",
 		},
@@ -39,7 +39,7 @@ var (
 			Kind: "MachineConfig",
 		},
 	}
-	etchostsWorkerMCMetadata = &mcv1.MachineConfig{
+	etchostsWorkerMCMetadata = &mcfgv1.MachineConfig{
 		ObjectMeta: metav1.ObjectMeta{
 			Name: "99-worker-aro-etc-hosts-gateway-domains",
 		},
@@ -118,8 +118,8 @@ func (r *EtcHostsClusterReconciler) Reconcile(ctx context.Context, request ctrl.
 	// EtchostsManaged = true, create machine configs if missing
 	r.Log.Debug("running")
 	// If 99-master-aro-etc-hosts-gateway-domains doesn't exist, create it
-	mcp := &mcv1.MachineConfigPool{}
-	mc := &mcv1.MachineConfig{}
+	mcp := &mcfgv1.MachineConfigPool{}
+	mc := &mcfgv1.MachineConfig{}
 
 	err = r.Client.Get(ctx, types.NamespacedName{Name: "master"}, mcp)
 	if kerrors.IsNotFound(err) {
@@ -197,10 +197,10 @@ func (r *EtcHostsClusterReconciler) SetupWithManager(mgr ctrl.Manager) error {
 
 	etcHostsBuilder := ctrl.NewControllerManagedBy(mgr).
 		For(&arov1alpha1.Cluster{}, builder.WithPredicates(predicate.And(predicates.AROCluster, predicate.GenerationChangedPredicate{}))).
-		Watches(&source.Kind{Type: &mcv1.MachineConfigPool{}},
+		Watches(&source.Kind{Type: &mcfgv1.MachineConfigPool{}},
 			&handler.EnqueueRequestForObject{},
 			builder.WithPredicates(predicate.GenerationChangedPredicate{})).
-		Watches(&source.Kind{Type: &mcv1.MachineConfig{}},
+		Watches(&source.Kind{Type: &mcfgv1.MachineConfig{}},
 			&handler.EnqueueRequestForObject{},
 			builder.WithPredicates(predicate.GenerationChangedPredicate{}))
 
@@ -210,7 +210,7 @@ func (r *EtcHostsClusterReconciler) SetupWithManager(mgr ctrl.Manager) error {
 		Complete(r)
 }
 
-func (r *EtcHostsClusterReconciler) removeMachineConfig(ctx context.Context, mc *mcv1.MachineConfig) error {
+func (r *EtcHostsClusterReconciler) removeMachineConfig(ctx context.Context, mc *mcfgv1.MachineConfig) error {
 	r.Log.Debugf("removing machine config %s", mc.Name)
 	err := r.Client.Delete(ctx, mc)
 	return err
diff --git a/pkg/operator/controllers/etchosts/cluster_controller_test.go b/pkg/operator/controllers/etchosts/cluster_controller_test.go
index 897e8de80f8..2c0a0e78720 100644
--- a/pkg/operator/controllers/etchosts/cluster_controller_test.go
+++ b/pkg/operator/controllers/etchosts/cluster_controller_test.go
@@ -9,7 +9,7 @@ import (
 	"testing"
 
 	configv1 "github.com/openshift/api/config/v1"
-	mcv1 "github.com/openshift/machine-config-operator/pkg/apis/machineconfiguration.openshift.io/v1"
+	mcfgv1 "github.com/openshift/api/machineconfiguration/v1"
 	"github.com/sirupsen/logrus"
 	logtest "github.com/sirupsen/logrus/hooks/test"
 	"github.com/stretchr/testify/assert"
@@ -106,15 +106,15 @@ var (
 			GatewayPrivateEndpointIP: "20.20.20.20",
 		},
 	}
-	machinePoolMaster = &mcv1.MachineConfigPool{
+	machinePoolMaster = &mcfgv1.MachineConfigPool{
 		ObjectMeta: metav1.ObjectMeta{Name: "master"},
-		Status:     mcv1.MachineConfigPoolStatus{},
-		Spec:       mcv1.MachineConfigPoolSpec{},
+		Status:     mcfgv1.MachineConfigPoolStatus{},
+		Spec:       mcfgv1.MachineConfigPoolSpec{},
 	}
-	machinePoolWorker = &mcv1.MachineConfigPool{
+	machinePoolWorker = &mcfgv1.MachineConfigPool{
 		ObjectMeta: metav1.ObjectMeta{Name: "worker"},
-		Status:     mcv1.MachineConfigPoolStatus{},
-		Spec:       mcv1.MachineConfigPoolSpec{},
+		Status:     mcfgv1.MachineConfigPoolStatus{},
+		Spec:       mcfgv1.MachineConfigPoolSpec{},
 	}
 	clusterVersionNotUpdating = &configv1.ClusterVersion{
 		ObjectMeta: metav1.ObjectMeta{
diff --git a/pkg/operator/controllers/etchosts/etchosts.go b/pkg/operator/controllers/etchosts/etchosts.go
index f10fff847b0..35b4cf2bed6 100644
--- a/pkg/operator/controllers/etchosts/etchosts.go
+++ b/pkg/operator/controllers/etchosts/etchosts.go
@@ -11,7 +11,7 @@ import (
 
 	"github.com/Azure/go-autorest/autorest/to"
 	ign3types "github.com/coreos/ignition/v2/config/v3_2/types"
-	mcv1 "github.com/openshift/machine-config-operator/pkg/apis/machineconfiguration.openshift.io/v1"
+	mcfgv1 "github.com/openshift/api/machineconfiguration/v1"
 	"github.com/pkg/errors"
 	"github.com/vincent-petithory/dataurl"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -206,7 +206,7 @@ func EtcHostsIgnitionConfig(clusterDomain string, apiIntIP string, gatewayDomain
 	return ign, nil
 }
 
-func EtcHostsMachineConfig(clusterDomain string, apiIntIP string, gatewayDomains []string, gatewayPrivateEndpointIP string, role string) (*mcv1.MachineConfig, error) {
+func EtcHostsMachineConfig(clusterDomain string, apiIntIP string, gatewayDomains []string, gatewayPrivateEndpointIP string, role string) (*mcfgv1.MachineConfig, error) {
 	ignConfig, err := EtcHostsIgnitionConfig(clusterDomain, apiIntIP, gatewayDomains, gatewayPrivateEndpointIP)
 	if err != nil {
 		return nil, err
@@ -230,9 +230,9 @@ func EtcHostsMachineConfig(clusterDomain string, apiIntIP string, gatewayDomains
 		return nil, err
 	}
 
-	return &mcv1.MachineConfig{
+	return &mcfgv1.MachineConfig{
 		TypeMeta: metav1.TypeMeta{
-			APIVersion: mcv1.SchemeGroupVersion.String(),
+			APIVersion: mcfgv1.SchemeGroupVersion.String(),
 			Kind:       "MachineConfig",
 		},
 		ObjectMeta: metav1.ObjectMeta{
@@ -241,7 +241,7 @@ func EtcHostsMachineConfig(clusterDomain string, apiIntIP string, gatewayDomains
 				"machineconfiguration.openshift.io/role": role,
 			},
 		},
-		Spec: mcv1.MachineConfigSpec{
+		Spec: mcfgv1.MachineConfigSpec{
 			Config: rawExt,
 		},
 	}, nil
diff --git a/pkg/operator/controllers/etchosts/machineconfig_controller.go b/pkg/operator/controllers/etchosts/machineconfig_controller.go
index c1a60e04307..72288cf98fa 100644
--- a/pkg/operator/controllers/etchosts/machineconfig_controller.go
+++ b/pkg/operator/controllers/etchosts/machineconfig_controller.go
@@ -7,7 +7,7 @@ import (
 	"context"
 	"regexp"
 
-	mcv1 "github.com/openshift/machine-config-operator/pkg/apis/machineconfiguration.openshift.io/v1"
+	mcfgv1 "github.com/openshift/api/machineconfiguration/v1"
 	"github.com/sirupsen/logrus"
 	kerrors "k8s.io/apimachinery/pkg/api/errors"
 	kruntime "k8s.io/apimachinery/pkg/runtime"
@@ -103,7 +103,7 @@ func (r *EtcHostsMachineConfigReconciler) Reconcile(ctx context.Context, request
 
 	// EtchostsManaged = true, reconcile machine configs
 	r.Log.Debug("running")
-	mcp := &mcv1.MachineConfigPool{}
+	mcp := &mcfgv1.MachineConfigPool{}
 	// Make sure we are reconciling against etchosts machine config
 	m := etcHostsRegex.FindStringSubmatch(request.Name)
 	if m == nil {
@@ -142,8 +142,8 @@ func (r *EtcHostsMachineConfigReconciler) SetupWithManager(mgr ctrl.Manager) err
 	r.Log.Info("starting etchosts-machine-config controller")
 
 	etcHostsBuilder := ctrl.NewControllerManagedBy(mgr).
-		For(&mcv1.MachineConfig{}).
-		Watches(&source.Kind{Type: &mcv1.MachineConfigPool{}},
+		For(&mcfgv1.MachineConfig{}).
+		Watches(&source.Kind{Type: &mcfgv1.MachineConfigPool{}},
 			&handler.EnqueueRequestForObject{},
 			builder.WithPredicates(predicate.GenerationChangedPredicate{})).
 		Watches(&source.Kind{Type: &arov1alpha1.Cluster{}},
@@ -156,7 +156,7 @@ func (r *EtcHostsMachineConfigReconciler) SetupWithManager(mgr ctrl.Manager) err
 		Complete(r)
 }
 
-func reconcileMachineConfigs(ctx context.Context, instance *arov1alpha1.Cluster, role string, dh dynamichelper.Interface, allowReconcile bool, mcps ...mcv1.MachineConfigPool) error {
+func reconcileMachineConfigs(ctx context.Context, instance *arov1alpha1.Cluster, role string, dh dynamichelper.Interface, allowReconcile bool, mcps ...mcfgv1.MachineConfigPool) error {
 	var resources []kruntime.Object
 	for _, mcp := range mcps {
 		resource, err := EtcHostsMachineConfig(instance.Spec.Domain, instance.Spec.APIIntIP, instance.Spec.GatewayDomains, instance.Spec.GatewayPrivateEndpointIP, role)
@@ -187,7 +187,7 @@ func reconcileMachineConfigs(ctx context.Context, instance *arov1alpha1.Cluster,
 	return nil
 }
 
-func (r *EtcHostsMachineConfigReconciler) removeMachineConfig(ctx context.Context, mc *mcv1.MachineConfig) error {
+func (r *EtcHostsMachineConfigReconciler) removeMachineConfig(ctx context.Context, mc *mcfgv1.MachineConfig) error {
 	r.Log.Debugf("removing machine config %s", mc.Name)
 	err := r.Client.Delete(ctx, mc)
 	return err
diff --git a/pkg/operator/controllers/workaround/systemreserved.go b/pkg/operator/controllers/workaround/systemreserved.go
index 08fcecfe2e7..faefa6c3f45 100644
--- a/pkg/operator/controllers/workaround/systemreserved.go
+++ b/pkg/operator/controllers/workaround/systemreserved.go
@@ -7,7 +7,7 @@ import (
 	"context"
 	"encoding/json"
 
-	mcv1 "github.com/openshift/machine-config-operator/pkg/apis/machineconfiguration.openshift.io/v1"
+	mcfgv1 "github.com/openshift/api/machineconfiguration/v1"
 	"github.com/sirupsen/logrus"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	kruntime "k8s.io/apimachinery/pkg/runtime"
@@ -58,7 +58,7 @@ func (sr *systemreserved) Ensure(ctx context.Context) error {
 
 	// Step 1. Add label to worker MachineConfigPool.
 	// Get the worker MachineConfigPool, modify it to add a label aro.openshift.io/limits: "", and apply the modified config.
-	mcp := &mcv1.MachineConfigPool{}
+	mcp := &mcfgv1.MachineConfigPool{}
 	err := sr.client.Get(ctx, types.NamespacedName{Name: workerMachineConfigPoolName}, mcp)
 	if err != nil {
 		return err
@@ -77,7 +77,7 @@ func (sr *systemreserved) Ensure(ctx context.Context) error {
 	}
 
 	//   Step 2. Create KubeletConfig CRD with appropriate limits.
-	kc := &mcv1.KubeletConfig{
+	kc := &mcfgv1.KubeletConfig{
 		ObjectMeta: metav1.ObjectMeta{
 			Name: kubeletConfigName,
 		},
@@ -103,7 +103,7 @@ func (sr *systemreserved) Ensure(ctx context.Context) error {
 			return err
 		}
 
-		kc.Spec = mcv1.KubeletConfigSpec{
+		kc.Spec = mcfgv1.KubeletConfigSpec{
 			MachineConfigPoolSelector: &metav1.LabelSelector{
 				MatchLabels: map[string]string{labelName: labelValue},
 			},
@@ -120,7 +120,7 @@ func (sr *systemreserved) Ensure(ctx context.Context) error {
 
 func (sr *systemreserved) Remove(ctx context.Context) error {
 	sr.log.Debug("remove systemreserved")
-	mcp := &mcv1.MachineConfigPool{}
+	mcp := &mcfgv1.MachineConfigPool{}
 	err := sr.client.Get(ctx, types.NamespacedName{Name: workerMachineConfigPoolName}, mcp)
 	if err != nil {
 		return err
@@ -135,7 +135,7 @@ func (sr *systemreserved) Remove(ctx context.Context) error {
 		}
 	}
 
-	kc := &mcv1.KubeletConfig{
+	kc := &mcfgv1.KubeletConfig{
 		ObjectMeta: metav1.ObjectMeta{
 			Name: kubeletConfigName,
 		},
diff --git a/pkg/operator/controllers/workaround/systemreserved_test.go b/pkg/operator/controllers/workaround/systemreserved_test.go
index 4f2a52953ff..1590c9e5deb 100644
--- a/pkg/operator/controllers/workaround/systemreserved_test.go
+++ b/pkg/operator/controllers/workaround/systemreserved_test.go
@@ -8,7 +8,7 @@ import (
 	"reflect"
 	"testing"
 
-	mcv1 "github.com/openshift/machine-config-operator/pkg/apis/machineconfiguration.openshift.io/v1"
+	mcfgv1 "github.com/openshift/api/machineconfiguration/v1"
 	"go.uber.org/mock/gomock"
 	kerrors "k8s.io/apimachinery/pkg/api/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -22,8 +22,8 @@ import (
 )
 
 func TestSystemreservedEnsure(t *testing.T) {
-	kubeletConfig := func(resourceVersion string) *mcv1.KubeletConfig {
-		return &mcv1.KubeletConfig{
+	kubeletConfig := func(resourceVersion string) *mcfgv1.KubeletConfig {
+		return &mcfgv1.KubeletConfig{
 			TypeMeta: metav1.TypeMeta{
 				Kind:       "KubeletConfig",
 				APIVersion: "machineconfiguration.openshift.io/v1",
@@ -35,7 +35,7 @@ func TestSystemreservedEnsure(t *testing.T) {
 				},
 				ResourceVersion: resourceVersion,
 			},
-			Spec: mcv1.KubeletConfigSpec{
+			Spec: mcfgv1.KubeletConfigSpec{
 				MachineConfigPoolSelector: &metav1.LabelSelector{
 					MatchLabels: map[string]string{
 						"aro.openshift.io/limits": "",
@@ -50,13 +50,13 @@ func TestSystemreservedEnsure(t *testing.T) {
 
 	tests := []struct {
 		name              string
-		mcp               *mcv1.MachineConfigPool
-		kc                *mcv1.KubeletConfig
-		wantKubeletConfig *mcv1.KubeletConfig
+		mcp               *mcfgv1.MachineConfigPool
+		kc                *mcfgv1.KubeletConfig
+		wantKubeletConfig *mcfgv1.KubeletConfig
 	}{
 		{
 			name: "first time create KubeletConfig",
-			mcp: &mcv1.MachineConfigPool{
+			mcp: &mcfgv1.MachineConfigPool{
 				ObjectMeta: metav1.ObjectMeta{
 					Name: "worker",
 				},
@@ -65,7 +65,7 @@ func TestSystemreservedEnsure(t *testing.T) {
 		},
 		{
 			name: "label already exists on MCP, but no KubeletConfig",
-			mcp: &mcv1.MachineConfigPool{
+			mcp: &mcfgv1.MachineConfigPool{
 				ObjectMeta: metav1.ObjectMeta{
 					Name:   "worker",
 					Labels: map[string]string{labelName: labelValue},
@@ -75,12 +75,12 @@ func TestSystemreservedEnsure(t *testing.T) {
 		},
 		{
 			name: "no label on MCP, but KubeletConfig exists",
-			mcp: &mcv1.MachineConfigPool{
+			mcp: &mcfgv1.MachineConfigPool{
 				ObjectMeta: metav1.ObjectMeta{
 					Name: "worker",
 				},
 			},
-			kc: &mcv1.KubeletConfig{
+			kc: &mcfgv1.KubeletConfig{
 				ObjectMeta: metav1.ObjectMeta{
 					Name:            kubeletConfigName,
 					ResourceVersion: "1",
@@ -90,13 +90,13 @@ func TestSystemreservedEnsure(t *testing.T) {
 		},
 		{
 			name: "label and KubeletConfig already exist",
-			mcp: &mcv1.MachineConfigPool{
+			mcp: &mcfgv1.MachineConfigPool{
 				ObjectMeta: metav1.ObjectMeta{
 					Name:   "worker",
 					Labels: map[string]string{labelName: labelValue},
 				},
 			},
-			kc: &mcv1.KubeletConfig{
+			kc: &mcfgv1.KubeletConfig{
 				ObjectMeta: metav1.ObjectMeta{
 					Name:            kubeletConfigName,
 					ResourceVersion: "1",
@@ -131,7 +131,7 @@ func TestSystemreservedEnsure(t *testing.T) {
 				t.Error(err)
 			}
 
-			result := &mcv1.MachineConfigPool{}
+			result := &mcfgv1.MachineConfigPool{}
 			err = clientFake.Get(ctx, types.NamespacedName{Name: workerMachineConfigPoolName}, result)
 			if err != nil {
 				t.Fatal(err)
@@ -141,7 +141,7 @@ func TestSystemreservedEnsure(t *testing.T) {
 				t.Error(result.Labels)
 			}
 
-			kc := &mcv1.KubeletConfig{}
+			kc := &mcfgv1.KubeletConfig{}
 			err = clientFake.Get(ctx, types.NamespacedName{Name: kubeletConfigName}, kc)
 			if err != nil {
 				t.Fatal(err)
@@ -156,12 +156,12 @@ func TestSystemreservedEnsure(t *testing.T) {
 func TestSystemreservedRemove(t *testing.T) {
 	tests := []struct {
 		name string
-		mcp  *mcv1.MachineConfigPool
-		kc   *mcv1.KubeletConfig
+		mcp  *mcfgv1.MachineConfigPool
+		kc   *mcfgv1.KubeletConfig
 	}{
 		{
 			name: "label is not set, not KubeletConfig",
-			mcp: &mcv1.MachineConfigPool{
+			mcp: &mcfgv1.MachineConfigPool{
 				ObjectMeta: metav1.ObjectMeta{
 					Name: "worker",
 				},
@@ -169,12 +169,12 @@ func TestSystemreservedRemove(t *testing.T) {
 		},
 		{
 			name: "label is not set, KubeletConfig exists",
-			mcp: &mcv1.MachineConfigPool{
+			mcp: &mcfgv1.MachineConfigPool{
 				ObjectMeta: metav1.ObjectMeta{
 					Name: "worker",
 				},
 			},
-			kc: &mcv1.KubeletConfig{
+			kc: &mcfgv1.KubeletConfig{
 				ObjectMeta: metav1.ObjectMeta{
 					Name:            kubeletConfigName,
 					ResourceVersion: "1",
@@ -183,7 +183,7 @@ func TestSystemreservedRemove(t *testing.T) {
 		},
 		{
 			name: "label is set, but KubeletConfig does not exist",
-			mcp: &mcv1.MachineConfigPool{
+			mcp: &mcfgv1.MachineConfigPool{
 				ObjectMeta: metav1.ObjectMeta{
 					Name:   "worker",
 					Labels: map[string]string{labelName: labelValue},
@@ -192,13 +192,13 @@ func TestSystemreservedRemove(t *testing.T) {
 		},
 		{
 			name: "both label and KubeletConfig set exist",
-			mcp: &mcv1.MachineConfigPool{
+			mcp: &mcfgv1.MachineConfigPool{
 				ObjectMeta: metav1.ObjectMeta{
 					Name:   "worker",
 					Labels: map[string]string{labelName: labelValue},
 				},
 			},
-			kc: &mcv1.KubeletConfig{
+			kc: &mcfgv1.KubeletConfig{
 				ObjectMeta: metav1.ObjectMeta{
 					Name:            kubeletConfigName,
 					ResourceVersion: "1",
@@ -230,7 +230,7 @@ func TestSystemreservedRemove(t *testing.T) {
 				t.Error(err)
 			}
 
-			result := &mcv1.MachineConfigPool{}
+			result := &mcfgv1.MachineConfigPool{}
 			err = clientFake.Get(ctx, types.NamespacedName{Name: workerMachineConfigPoolName}, result)
 			if err != nil {
 				t.Fatal(err)
@@ -240,7 +240,7 @@ func TestSystemreservedRemove(t *testing.T) {
 				t.Error(result.Labels)
 			}
 
-			kc := &mcv1.KubeletConfig{}
+			kc := &mcfgv1.KubeletConfig{}
 			err = clientFake.Get(ctx, types.NamespacedName{Name: kubeletConfigName}, kc)
 			if !kerrors.IsNotFound(err) {
 				t.Error(err)
diff --git a/pkg/util/clienthelper/clienthelper.go b/pkg/util/clienthelper/clienthelper.go
index 2d3e4e04364..43b81be558c 100644
--- a/pkg/util/clienthelper/clienthelper.go
+++ b/pkg/util/clienthelper/clienthelper.go
@@ -12,8 +12,8 @@ import (
 
 	"github.com/go-test/deep"
 	machinev1beta1 "github.com/openshift/api/machine/v1beta1"
+	mcfgv1 "github.com/openshift/api/machineconfiguration/v1"
 	hivev1 "github.com/openshift/hive/apis/hive/v1"
-	mcv1 "github.com/openshift/machine-config-operator/pkg/apis/machineconfiguration.openshift.io/v1"
 	"github.com/sirupsen/logrus"
 	appsv1 "k8s.io/api/apps/v1"
 	corev1 "k8s.io/api/core/v1"
@@ -209,8 +209,8 @@ func merge(old, new client.Object) (client.Object, bool, string, error) {
 
 		new.Status = old.Status
 
-	case *mcv1.KubeletConfig:
-		old, new := old.(*mcv1.KubeletConfig), new.(*mcv1.KubeletConfig)
+	case *mcfgv1.KubeletConfig:
+		old, new := old.(*mcfgv1.KubeletConfig), new.(*mcfgv1.KubeletConfig)
 		new.Status = old.Status
 
 	case *extensionsv1.CustomResourceDefinition:
diff --git a/pkg/util/clienthelper/clienthelper_test.go b/pkg/util/clienthelper/clienthelper_test.go
index b15a5866c7c..a78d41c9232 100644
--- a/pkg/util/clienthelper/clienthelper_test.go
+++ b/pkg/util/clienthelper/clienthelper_test.go
@@ -13,7 +13,7 @@ import (
 	"github.com/Azure/go-autorest/autorest/to"
 	"github.com/go-test/deep"
 	machinev1beta1 "github.com/openshift/api/machine/v1beta1"
-	mcv1 "github.com/openshift/machine-config-operator/pkg/apis/machineconfiguration.openshift.io/v1"
+	mcfgv1 "github.com/openshift/api/machineconfiguration/v1"
 	"github.com/sirupsen/logrus"
 	admissionregistrationv1 "k8s.io/api/admissionregistration/v1"
 	appsv1 "k8s.io/api/apps/v1"
@@ -483,9 +483,9 @@ func TestMerge(t *testing.T) {
 		},
 		{
 			name: "KubeletConfig no changes",
-			old: &mcv1.KubeletConfig{
-				Status: mcv1.KubeletConfigStatus{
-					Conditions: []mcv1.KubeletConfigCondition{
+			old: &mcfgv1.KubeletConfig{
+				Status: mcfgv1.KubeletConfigStatus{
+					Conditions: []mcfgv1.KubeletConfigCondition{
 						{
 							Message: "Success",
 							Status:  "True",
@@ -494,10 +494,10 @@ func TestMerge(t *testing.T) {
 					},
 				},
 			},
-			new: &mcv1.KubeletConfig{},
-			want: &mcv1.KubeletConfig{
-				Status: mcv1.KubeletConfigStatus{
-					Conditions: []mcv1.KubeletConfigCondition{
+			new: &mcfgv1.KubeletConfig{},
+			want: &mcfgv1.KubeletConfig{
+				Status: mcfgv1.KubeletConfigStatus{
+					Conditions: []mcfgv1.KubeletConfigCondition{
 						{
 							Message: "Success",
 							Status:  "True",
@@ -1070,13 +1070,13 @@ func TestMergeApply(t *testing.T) {
 		},
 		{
 			name: "KubeletConfig no changes",
-			old: &mcv1.KubeletConfig{
+			old: &mcfgv1.KubeletConfig{
 				ObjectMeta: metav1.ObjectMeta{
 					Name:      "testobj",
 					Namespace: "testnamespace",
 				},
-				Status: mcv1.KubeletConfigStatus{
-					Conditions: []mcv1.KubeletConfigCondition{
+				Status: mcfgv1.KubeletConfigStatus{
+					Conditions: []mcfgv1.KubeletConfigCondition{
 						{
 							Message: "Success",
 							Status:  "True",
@@ -1085,19 +1085,19 @@ func TestMergeApply(t *testing.T) {
 					},
 				},
 			},
-			new: &mcv1.KubeletConfig{
+			new: &mcfgv1.KubeletConfig{
 				ObjectMeta: metav1.ObjectMeta{
 					Name:      "testobj",
 					Namespace: "testnamespace",
 				},
 			},
-			want: &mcv1.KubeletConfig{
+			want: &mcfgv1.KubeletConfig{
 				ObjectMeta: metav1.ObjectMeta{
 					Name:      "testobj",
 					Namespace: "testnamespace",
 				},
-				Status: mcv1.KubeletConfigStatus{
-					Conditions: []mcv1.KubeletConfigCondition{
+				Status: mcfgv1.KubeletConfigStatus{
+					Conditions: []mcfgv1.KubeletConfigCondition{
 						{
 							Message: "Success",
 							Status:  "True",
diff --git a/pkg/util/dynamichelper/dynamichelper.go b/pkg/util/dynamichelper/dynamichelper.go
index 85026e060ba..ff30f9ff110 100644
--- a/pkg/util/dynamichelper/dynamichelper.go
+++ b/pkg/util/dynamichelper/dynamichelper.go
@@ -10,8 +10,8 @@ import (
 	"strings"
 
 	machinev1beta1 "github.com/openshift/api/machine/v1beta1"
+	mcfgv1 "github.com/openshift/api/machineconfiguration/v1"
 	hivev1 "github.com/openshift/hive/apis/hive/v1"
-	mcv1 "github.com/openshift/machine-config-operator/pkg/apis/machineconfiguration.openshift.io/v1"
 	"github.com/sirupsen/logrus"
 	appsv1 "k8s.io/api/apps/v1"
 	corev1 "k8s.io/api/core/v1"
@@ -245,8 +245,8 @@ func merge(old, new kruntime.Object) (kruntime.Object, bool, string, error) {
 
 		new.Status = old.Status
 
-	case *mcv1.KubeletConfig:
-		old, new := old.(*mcv1.KubeletConfig), new.(*mcv1.KubeletConfig)
+	case *mcfgv1.KubeletConfig:
+		old, new := old.(*mcfgv1.KubeletConfig), new.(*mcfgv1.KubeletConfig)
 		new.Status = old.Status
 
 	case *extensionsv1beta1.CustomResourceDefinition:
diff --git a/pkg/util/dynamichelper/dynamichelper_test.go b/pkg/util/dynamichelper/dynamichelper_test.go
index 0c62e04b832..f5f91ac3a59 100644
--- a/pkg/util/dynamichelper/dynamichelper_test.go
+++ b/pkg/util/dynamichelper/dynamichelper_test.go
@@ -12,7 +12,7 @@ import (
 
 	"github.com/Azure/go-autorest/autorest/to"
 	machinev1beta1 "github.com/openshift/api/machine/v1beta1"
-	mcv1 "github.com/openshift/machine-config-operator/pkg/apis/machineconfiguration.openshift.io/v1"
+	mcfgv1 "github.com/openshift/api/machineconfiguration/v1"
 	"github.com/sirupsen/logrus"
 	admissionregistrationv1 "k8s.io/api/admissionregistration/v1"
 	appsv1 "k8s.io/api/apps/v1"
@@ -496,9 +496,9 @@ func TestMerge(t *testing.T) {
 		},
 		{
 			name: "KubeletConfig no changes",
-			old: &mcv1.KubeletConfig{
-				Status: mcv1.KubeletConfigStatus{
-					Conditions: []mcv1.KubeletConfigCondition{
+			old: &mcfgv1.KubeletConfig{
+				Status: mcfgv1.KubeletConfigStatus{
+					Conditions: []mcfgv1.KubeletConfigCondition{
 						{
 							Message: "Success",
 							Status:  "True",
@@ -507,10 +507,10 @@ func TestMerge(t *testing.T) {
 					},
 				},
 			},
-			new: &mcv1.KubeletConfig{},
-			want: &mcv1.KubeletConfig{
-				Status: mcv1.KubeletConfigStatus{
-					Conditions: []mcv1.KubeletConfigCondition{
+			new: &mcfgv1.KubeletConfig{},
+			want: &mcfgv1.KubeletConfig{
+				Status: mcfgv1.KubeletConfigStatus{
+					Conditions: []mcfgv1.KubeletConfigCondition{
 						{
 							Message: "Success",
 							Status:  "True",
diff --git a/pkg/util/net/net_test.go b/pkg/util/net/net_test.go
index b33f2250441..47960d9e4f9 100644
--- a/pkg/util/net/net_test.go
+++ b/pkg/util/net/net_test.go
@@ -11,9 +11,9 @@ import (
 	mgmtprivatedns "github.com/Azure/azure-sdk-for-go/services/privatedns/mgmt/2018-09-01/privatedns"
 	"github.com/Azure/go-autorest/autorest/to"
 	configv1 "github.com/openshift/api/config/v1"
+	mcfgv1 "github.com/openshift/api/machineconfiguration/v1"
 	configclient "github.com/openshift/client-go/config/clientset/versioned"
 	configfake "github.com/openshift/client-go/config/clientset/versioned/fake"
-	mcv1 "github.com/openshift/machine-config-operator/pkg/apis/machineconfiguration.openshift.io/v1"
 	mcoclient "github.com/openshift/machine-config-operator/pkg/generated/clientset/versioned"
 	mcofake "github.com/openshift/machine-config-operator/pkg/generated/clientset/versioned/fake"
 	"go.uber.org/mock/gomock"
@@ -205,12 +205,12 @@ func TestRemovePrivateDNSZone(t *testing.T) {
 		},
 	}
 
-	mcp := &mcv1.MachineConfigPool{
+	mcp := &mcfgv1.MachineConfigPool{
 		ObjectMeta: metav1.ObjectMeta{
 			Name: "master",
 		},
-		Status: mcv1.MachineConfigPoolStatus{
-			Configuration: mcv1.MachineConfigPoolStatusConfiguration{
+		Status: mcfgv1.MachineConfigPoolStatus{
+			Configuration: mcfgv1.MachineConfigPoolStatusConfiguration{
 				Source: []corev1.ObjectReference{{Name: "99-master-aro-dns"}},
 			},
 			MachineCount: 1,
@@ -244,7 +244,7 @@ func TestRemovePrivateDNSZone(t *testing.T) {
 			mocks: func(privateZones *mock_privatedns.MockPrivateZonesClient, virtualNetworkLinks *mock_privatedns.MockVirtualNetworkLinksClient) {
 				privateZones.EXPECT().ListByResourceGroup(ctx, "testGroup", nil).Return([]mgmtprivatedns.PrivateZone{{ID: to.StringPtr(id)}}, nil)
 			},
-			mcocli:    mcofake.NewSimpleClientset(&mcv1.MachineConfigPool{}),
+			mcocli:    mcofake.NewSimpleClientset(&mcfgv1.MachineConfigPool{}),
 			configcli: configfake.NewSimpleClientset(),
 			kubernetescli: fake.NewSimpleClientset(
 				&corev1.Node{},
@@ -288,12 +288,12 @@ func TestRemovePrivateDNSZone(t *testing.T) {
 				&corev1.Node{},
 			),
 			mcocli: mcofake.NewSimpleClientset(
-				&mcv1.MachineConfigPool{
+				&mcfgv1.MachineConfigPool{
 					ObjectMeta: metav1.ObjectMeta{
 						Name: "master",
 					},
-					Status: mcv1.MachineConfigPoolStatus{
-						Configuration: mcv1.MachineConfigPoolStatusConfiguration{
+					Status: mcfgv1.MachineConfigPoolStatus{
+						Configuration: mcfgv1.MachineConfigPoolStatusConfiguration{
 							Source: []corev1.ObjectReference{
 								{
 									Name: "99-master-aro-dns",
diff --git a/pkg/util/ready/ready.go b/pkg/util/ready/ready.go
index 67e7d841df2..ebdcd220111 100644
--- a/pkg/util/ready/ready.go
+++ b/pkg/util/ready/ready.go
@@ -8,7 +8,7 @@ import (
 	"fmt"
 	"net"
 
-	mcv1 "github.com/openshift/machine-config-operator/pkg/apis/machineconfiguration.openshift.io/v1"
+	mcfgv1 "github.com/openshift/api/machineconfiguration/v1"
 	mcoclientv1 "github.com/openshift/machine-config-operator/pkg/generated/clientset/versioned/typed/machineconfiguration.openshift.io/v1"
 	appsv1 "k8s.io/api/apps/v1"
 	corev1 "k8s.io/api/core/v1"
@@ -173,7 +173,7 @@ func StatefulSetIsReady(s *appsv1.StatefulSet) bool {
 
 // MachineConfigPoolIsReady returns true if a MachineConfigPool is considered
 // ready
-func MachineConfigPoolIsReady(s *mcv1.MachineConfigPool) bool {
+func MachineConfigPoolIsReady(s *mcfgv1.MachineConfigPool) bool {
 	return s.Status.MachineCount == s.Status.UpdatedMachineCount &&
 		s.Status.MachineCount == s.Status.ReadyMachineCount &&
 		s.Generation == s.Status.ObservedGeneration
@@ -196,7 +196,7 @@ func CheckMachineConfigPoolIsReady(ctx context.Context, cli mcoclientv1.MachineC
 }
 
 type MCPLister interface {
-	List(ctx context.Context, opts metav1.ListOptions) (*mcv1.MachineConfigPoolList, error)
+	List(ctx context.Context, opts metav1.ListOptions) (*mcfgv1.MachineConfigPoolList, error)
 }
 
 type NodeLister interface {
@@ -239,7 +239,7 @@ func SameNumberOfNodesAndMachines(ctx context.Context, mcpLister MCPLister, node
 
 // TotalMachinesInTheMCPs returns the total number of machines in the machineConfigPools
 // and an error, if any.
-func TotalMachinesInTheMCPs(machineConfigPools []mcv1.MachineConfigPool) (int, error) {
+func TotalMachinesInTheMCPs(machineConfigPools []mcfgv1.MachineConfigPool) (int, error) {
 	totalMachines := 0
 	for _, mcp := range machineConfigPools {
 		if !MCPContainsARODNSConfig(mcp) {
@@ -255,7 +255,7 @@ func TotalMachinesInTheMCPs(machineConfigPools []mcv1.MachineConfigPool) (int, e
 	return totalMachines, nil
 }
 
-func MCPContainsARODNSConfig(mcp mcv1.MachineConfigPool) bool {
+func MCPContainsARODNSConfig(mcp mcfgv1.MachineConfigPool) bool {
 	for _, source := range mcp.Status.Configuration.Source {
 		mcpPrefix := "99-"
 		mcpSuffix := "-aro-dns"
diff --git a/pkg/util/ready/ready_test.go b/pkg/util/ready/ready_test.go
index e28a6a5a5c3..1bebde46c2a 100644
--- a/pkg/util/ready/ready_test.go
+++ b/pkg/util/ready/ready_test.go
@@ -8,7 +8,7 @@ import (
 	"errors"
 	"testing"
 
-	mcv1 "github.com/openshift/machine-config-operator/pkg/apis/machineconfiguration.openshift.io/v1"
+	mcfgv1 "github.com/openshift/api/machineconfiguration/v1"
 	mcofake "github.com/openshift/machine-config-operator/pkg/generated/clientset/versioned/fake"
 	appsv1 "k8s.io/api/apps/v1"
 	corev1 "k8s.io/api/core/v1"
@@ -338,18 +338,18 @@ func TestStatefulSetIsReady(t *testing.T) {
 func TestMachineConfigPoolIsReady(t *testing.T) {
 	for _, tt := range []struct {
 		name string
-		mcp  *mcv1.MachineConfigPool
+		mcp  *mcfgv1.MachineConfigPool
 		want bool
 	}{
 		{
 			name: "machineconfigpool-with-no-count",
-			mcp:  &mcv1.MachineConfigPool{},
+			mcp:  &mcfgv1.MachineConfigPool{},
 			want: true,
 		},
 		{
 			name: "machineconfigpool-ready",
-			mcp: &mcv1.MachineConfigPool{
-				Status: mcv1.MachineConfigPoolStatus{
+			mcp: &mcfgv1.MachineConfigPool{
+				Status: mcfgv1.MachineConfigPoolStatus{
 					MachineCount:        int32(6),
 					UpdatedMachineCount: int32(6),
 					ReadyMachineCount:   int32(6),
@@ -359,8 +359,8 @@ func TestMachineConfigPoolIsReady(t *testing.T) {
 		},
 		{
 			name: "machineconfigpool-not-ready",
-			mcp: &mcv1.MachineConfigPool{
-				Status: mcv1.MachineConfigPoolStatus{
+			mcp: &mcfgv1.MachineConfigPool{
+				Status: mcfgv1.MachineConfigPoolStatus{
 					MachineCount:        int32(6),
 					UpdatedMachineCount: int32(3),
 					ReadyMachineCount:   int32(5),
@@ -570,7 +570,7 @@ func TestCheckDeploymentIsReadyError(t *testing.T) {
 func TestCheckMachineConfigPoolIsReady(t *testing.T) {
 	ctx := context.Background()
 
-	machineconfigpool := &mcv1.MachineConfigPool{
+	machineconfigpool := &mcfgv1.MachineConfigPool{
 		ObjectMeta: metav1.ObjectMeta{
 			Name: "machineconfigpool-not-found",
 		},
@@ -589,7 +589,7 @@ func TestCheckMachineConfigPoolIsReady(t *testing.T) {
 
 func TestCheckMachineConfigPoolIsReadyNotFound(t *testing.T) {
 	ctx := context.Background()
-	machineconfigpool := &mcv1.MachineConfigPool{
+	machineconfigpool := &mcfgv1.MachineConfigPool{
 		ObjectMeta: metav1.ObjectMeta{
 			Name: "machineconfigpool-not-found",
 		},
@@ -607,7 +607,7 @@ func TestCheckMachineConfigPoolIsReadyError(t *testing.T) {
 
 	clientset := mcofake.NewSimpleClientset()
 	clientset.Fake.PrependReactor("get", "machineconfigpools", func(action ktesting.Action) (bool, kruntime.Object, error) {
-		return true, &mcv1.MachineConfigPool{}, errors.New("error getting machineconfigpool")
+		return true, &mcfgv1.MachineConfigPool{}, errors.New("error getting machineconfigpool")
 	})
 	_, err := CheckMachineConfigPoolIsReady(ctx, clientset.MachineconfigurationV1().MachineConfigPools(), "")()
 
@@ -659,7 +659,7 @@ func TestTotalMachinesInTheMCPs(t *testing.T) {
 
 	type testCase struct {
 		name               string
-		machineConfigPools []mcv1.MachineConfigPool
+		machineConfigPools []mcfgv1.MachineConfigPool
 		want               int
 		wantErr            string
 	}
@@ -667,14 +667,14 @@ func TestTotalMachinesInTheMCPs(t *testing.T) {
 		{
 			name: "totalMachinesInTheMCPs returns ARO DNS config not found error",
 			want: 0,
-			machineConfigPools: []mcv1.MachineConfigPool{
+			machineConfigPools: []mcfgv1.MachineConfigPool{
 				{
 					ObjectMeta: metav1.ObjectMeta{
 						Name: "mcp_name",
 					},
-					Status: mcv1.MachineConfigPoolStatus{
+					Status: mcfgv1.MachineConfigPoolStatus{
 						ObservedGeneration: 0,
-						Configuration: mcv1.MachineConfigPoolStatusConfiguration{
+						Configuration: mcfgv1.MachineConfigPoolStatusConfiguration{
 							Source: []corev1.ObjectReference{{Name: "non matching name"}},
 						},
 					},
@@ -686,18 +686,18 @@ func TestTotalMachinesInTheMCPs(t *testing.T) {
 			name:    "totalMachinesInTheMCPs returns MCP is not ready error",
 			want:    0,
 			wantErr: "MCP mcp_name not ready",
-			machineConfigPools: []mcv1.MachineConfigPool{
+			machineConfigPools: []mcfgv1.MachineConfigPool{
 				{
 					ObjectMeta: metav1.ObjectMeta{
 						Name:       "mcp_name",
 						Generation: 1,
 					},
-					Status: mcv1.MachineConfigPoolStatus{
+					Status: mcfgv1.MachineConfigPoolStatus{
 						MachineCount:        1,
 						UpdatedMachineCount: 1,
 						ReadyMachineCount:   0,
 						ObservedGeneration:  1,
-						Configuration: mcv1.MachineConfigPoolStatusConfiguration{
+						Configuration: mcfgv1.MachineConfigPoolStatusConfiguration{
 							Source: []corev1.ObjectReference{{Name: mcpPrefix + "mcp_name" + mcpSuffix}},
 						},
 					},
@@ -707,18 +707,18 @@ func TestTotalMachinesInTheMCPs(t *testing.T) {
 		{
 			name: "totalMachinesInTheMCPs returns 1",
 			want: 1,
-			machineConfigPools: []mcv1.MachineConfigPool{
+			machineConfigPools: []mcfgv1.MachineConfigPool{
 				{
 					ObjectMeta: metav1.ObjectMeta{
 						Name:       "mcp_name",
 						Generation: 1,
 					},
-					Status: mcv1.MachineConfigPoolStatus{
+					Status: mcfgv1.MachineConfigPoolStatus{
 						MachineCount:        1,
 						UpdatedMachineCount: 1,
 						ReadyMachineCount:   1,
 						ObservedGeneration:  1,
-						Configuration: mcv1.MachineConfigPoolStatusConfiguration{
+						Configuration: mcfgv1.MachineConfigPoolStatusConfiguration{
 							Source: []corev1.ObjectReference{
 								{
 									Name: mcpPrefix + "mcp_name" + mcpSuffix,
@@ -755,20 +755,20 @@ func TestMcpContainsARODNSConfig(t *testing.T) {
 
 	type testCase struct {
 		name string
-		mcp  mcv1.MachineConfigPool
+		mcp  mcfgv1.MachineConfigPool
 		want bool
 	}
 
 	testcases := []testCase{
 		{
 			name: "Mcp contains ARO DNS config",
-			mcp: mcv1.MachineConfigPool{
+			mcp: mcfgv1.MachineConfigPool{
 				ObjectMeta: metav1.ObjectMeta{
 					Name: "mcp_name",
 				},
-				Status: mcv1.MachineConfigPoolStatus{
+				Status: mcfgv1.MachineConfigPoolStatus{
 					ObservedGeneration: 0,
-					Configuration: mcv1.MachineConfigPoolStatusConfiguration{
+					Configuration: mcfgv1.MachineConfigPoolStatusConfiguration{
 						Source: []corev1.ObjectReference{
 							{
 								Name: mcpPrefix + "mcp_name" + mcpSuffix,
@@ -781,13 +781,13 @@ func TestMcpContainsARODNSConfig(t *testing.T) {
 		},
 		{
 			name: "Mcp does not contain ARO DNS config due to wrong source name",
-			mcp: mcv1.MachineConfigPool{
+			mcp: mcfgv1.MachineConfigPool{
 				ObjectMeta: metav1.ObjectMeta{
 					Name: "mcp_name",
 				},
-				Status: mcv1.MachineConfigPoolStatus{
+				Status: mcfgv1.MachineConfigPoolStatus{
 					ObservedGeneration: 0,
-					Configuration: mcv1.MachineConfigPoolStatusConfiguration{
+					Configuration: mcfgv1.MachineConfigPoolStatusConfiguration{
 						Source: []corev1.ObjectReference{
 							{
 								Name: "non matching name",
@@ -800,7 +800,7 @@ func TestMcpContainsARODNSConfig(t *testing.T) {
 		},
 		{
 			name: "Mcp does not contain ARO DNS config due to empty status",
-			mcp: mcv1.MachineConfigPool{
+			mcp: mcfgv1.MachineConfigPool{
 				ObjectMeta: metav1.ObjectMeta{
 					Name: "mcp_name",
 				},
@@ -820,11 +820,11 @@ func TestMcpContainsARODNSConfig(t *testing.T) {
 }
 
 type fakeMcpLister struct {
-	expected    *mcv1.MachineConfigPoolList
+	expected    *mcfgv1.MachineConfigPoolList
 	expectedErr error
 }
 
-func (m *fakeMcpLister) List(ctx context.Context, opts metav1.ListOptions) (*mcv1.MachineConfigPoolList, error) {
+func (m *fakeMcpLister) List(ctx context.Context, opts metav1.ListOptions) (*mcfgv1.MachineConfigPoolList, error) {
 	return m.expected, m.expectedErr
 }
 
@@ -871,18 +871,18 @@ func TestSameNumberOfNodesAndMachines(t *testing.T) {
 	})
 	t.Run("should propagate error from TotalMachinesInTheMCPs()", func(t *testing.T) {
 		expectedErr := "ARO DNS config not found in MCP mcp_name"
-		badMachineConfigPools := []mcv1.MachineConfigPool{
+		badMachineConfigPools := []mcfgv1.MachineConfigPool{
 			{
 				ObjectMeta: metav1.ObjectMeta{Name: "mcp_name"},
-				Status: mcv1.MachineConfigPoolStatus{
+				Status: mcfgv1.MachineConfigPoolStatus{
 					ObservedGeneration: 0,
-					Configuration: mcv1.MachineConfigPoolStatusConfiguration{
+					Configuration: mcfgv1.MachineConfigPoolStatusConfiguration{
 						Source: []corev1.ObjectReference{{Name: "non matching name"}},
 					},
 				},
 			},
 		}
-		machineConfigPoolList := &mcv1.MachineConfigPoolList{Items: badMachineConfigPools}
+		machineConfigPoolList := &mcfgv1.MachineConfigPoolList{Items: badMachineConfigPools}
 		mcpLister := &fakeMcpLister{expected: machineConfigPoolList}
 		nodeLister := &fakeNodeLister{}
 
@@ -896,24 +896,24 @@ func TestSameNumberOfNodesAndMachines(t *testing.T) {
 	t.Run("should propagate error from nodeLister", func(t *testing.T) {
 		expectedErr := "some_error"
 
-		machineConfigPools := []mcv1.MachineConfigPool{
+		machineConfigPools := []mcfgv1.MachineConfigPool{
 			{
 				ObjectMeta: metav1.ObjectMeta{
 					Name:       "mcp_name",
 					Generation: 1,
 				},
-				Status: mcv1.MachineConfigPoolStatus{
+				Status: mcfgv1.MachineConfigPoolStatus{
 					MachineCount:        1,
 					UpdatedMachineCount: 1,
 					ReadyMachineCount:   1,
 					ObservedGeneration:  1,
-					Configuration: mcv1.MachineConfigPoolStatusConfiguration{
+					Configuration: mcfgv1.MachineConfigPoolStatusConfiguration{
 						Source: []corev1.ObjectReference{{Name: "99-" + "mcp_name" + "-aro-dns"}},
 					},
 				},
 			},
 		}
-		machineConfigPoolList := &mcv1.MachineConfigPoolList{Items: machineConfigPools}
+		machineConfigPoolList := &mcfgv1.MachineConfigPoolList{Items: machineConfigPools}
 		mcpLister := &fakeMcpLister{expected: machineConfigPoolList}
 		nodeLister := &fakeNodeLister{expectedErr: errors.New(expectedErr)}
 
@@ -926,24 +926,24 @@ func TestSameNumberOfNodesAndMachines(t *testing.T) {
 
 	t.Run("should return true and no error", func(t *testing.T) {
 		expectedErr := ""
-		machineConfigPools := []mcv1.MachineConfigPool{
+		machineConfigPools := []mcfgv1.MachineConfigPool{
 			{
 				ObjectMeta: metav1.ObjectMeta{
 					Name:       "mcp_name",
 					Generation: 1,
 				},
-				Status: mcv1.MachineConfigPoolStatus{
+				Status: mcfgv1.MachineConfigPoolStatus{
 					MachineCount:        1,
 					UpdatedMachineCount: 1,
 					ReadyMachineCount:   1,
 					ObservedGeneration:  1,
-					Configuration: mcv1.MachineConfigPoolStatusConfiguration{
+					Configuration: mcfgv1.MachineConfigPoolStatusConfiguration{
 						Source: []corev1.ObjectReference{{Name: "99-" + "mcp_name" + "-aro-dns"}},
 					},
 				},
 			},
 		}
-		machineConfigPoolList := &mcv1.MachineConfigPoolList{Items: machineConfigPools}
+		machineConfigPoolList := &mcfgv1.MachineConfigPoolList{Items: machineConfigPools}
 		mcpLister := &fakeMcpLister{expected: machineConfigPoolList}
 
 		nodes := &corev1.NodeList{Items: []corev1.Node{{}}}
@@ -958,24 +958,24 @@ func TestSameNumberOfNodesAndMachines(t *testing.T) {
 
 	t.Run("should return false and error due to different number of total machines and nodes", func(t *testing.T) {
 		expectedErr := "cluster has 3 nodes but 1 under MCPs, not removing private DNS zone"
-		machineConfigPools := []mcv1.MachineConfigPool{
+		machineConfigPools := []mcfgv1.MachineConfigPool{
 			{
 				ObjectMeta: metav1.ObjectMeta{
 					Name:       "mcp_name",
 					Generation: 1,
 				},
-				Status: mcv1.MachineConfigPoolStatus{
+				Status: mcfgv1.MachineConfigPoolStatus{
 					MachineCount:        1,
 					UpdatedMachineCount: 1,
 					ReadyMachineCount:   1,
 					ObservedGeneration:  1,
-					Configuration: mcv1.MachineConfigPoolStatusConfiguration{
+					Configuration: mcfgv1.MachineConfigPoolStatusConfiguration{
 						Source: []corev1.ObjectReference{{Name: "99-" + "mcp_name" + "-aro-dns"}},
 					},
 				},
 			},
 		}
-		machineConfigPoolList := &mcv1.MachineConfigPoolList{Items: machineConfigPools}
+		machineConfigPoolList := &mcfgv1.MachineConfigPoolList{Items: machineConfigPools}
 		mcpLister := &fakeMcpLister{expected: machineConfigPoolList}
 
 		nodes := &corev1.NodeList{Items: []corev1.Node{{}, {}, {}}}
diff --git a/pkg/util/scheme/scheme.go b/pkg/util/scheme/scheme.go
index e2353034399..d7b450fbf86 100644
--- a/pkg/util/scheme/scheme.go
+++ b/pkg/util/scheme/scheme.go
@@ -10,11 +10,11 @@ import (
 	imageregistryv1 "github.com/openshift/api/imageregistry/v1"
 	machinev1 "github.com/openshift/api/machine/v1"
 	machinev1beta1 "github.com/openshift/api/machine/v1beta1"
+	mcfgv1 "github.com/openshift/api/machineconfiguration/v1"
 	operatorv1 "github.com/openshift/api/operator/v1"
 	securityv1 "github.com/openshift/api/security/v1"
 	cloudcredentialv1 "github.com/openshift/cloud-credential-operator/pkg/apis/cloudcredential/v1"
 	hivev1 "github.com/openshift/hive/apis/hive/v1"
-	mcv1 "github.com/openshift/machine-config-operator/pkg/apis/machineconfiguration.openshift.io/v1"
 	monitoringv1 "github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring/v1"
 	appsv1 "k8s.io/api/apps/v1"
 	corev1 "k8s.io/api/core/v1"
@@ -37,7 +37,7 @@ func init() {
 	utilruntime.Must(aropreviewv1alpha1.AddToScheme(scheme.Scheme))
 	utilruntime.Must(machinev1.AddToScheme(scheme.Scheme))
 	utilruntime.Must(machinev1beta1.AddToScheme(scheme.Scheme))
-	utilruntime.Must(mcv1.AddToScheme(scheme.Scheme))
+	utilruntime.Must(mcfgv1.AddToScheme(scheme.Scheme))
 	utilruntime.Must(configv1.AddToScheme(scheme.Scheme))
 	utilruntime.Must(corev1.AddToScheme(scheme.Scheme))
 	utilruntime.Must(corev1defaults.RegisterDefaults(scheme.Scheme))
diff --git a/test/e2e/operator.go b/test/e2e/operator.go
index 097ac9d149d..a8f54c38f1f 100644
--- a/test/e2e/operator.go
+++ b/test/e2e/operator.go
@@ -20,8 +20,8 @@ import (
 	configv1 "github.com/openshift/api/config/v1"
 	machinev1 "github.com/openshift/api/machine/v1"
 	machinev1beta1 "github.com/openshift/api/machine/v1beta1"
+	mcfgv1 "github.com/openshift/api/machineconfiguration/v1"
 	cov1Helpers "github.com/openshift/library-go/pkg/config/clusteroperator/v1helpers"
-	mcv1 "github.com/openshift/machine-config-operator/pkg/apis/machineconfiguration.openshift.io/v1"
 	"github.com/ugorji/go/codec"
 	corev1 "k8s.io/api/core/v1"
 	kerrors "k8s.io/apimachinery/pkg/api/errors"
@@ -615,7 +615,7 @@ var _ = Describe("ARO Operator - dnsmasq", func() {
 	mcpName := "test-aro-custom-mcp"
 	mcName := fmt.Sprintf("99-%s-aro-dns", mcpName)
 
-	customMcp := mcv1.MachineConfigPool{
+	customMcp := mcfgv1.MachineConfigPool{
 		TypeMeta: metav1.TypeMeta{
 			APIVersion: "machineconfiguration.openshift.io/v1",
 			Kind:       "MachineConfigPool",
@@ -623,7 +623,7 @@ var _ = Describe("ARO Operator - dnsmasq", func() {
 		ObjectMeta: metav1.ObjectMeta{
 			Name: mcpName,
 		},
-		Spec: mcv1.MachineConfigPoolSpec{},
+		Spec: mcfgv1.MachineConfigPoolSpec{},
 	}
 
 	getMachineConfigNames := func(g Gomega, ctx context.Context) []string {