diff --git a/.golangci.yml b/.golangci.yml
index 3db93f1a1d..f14aea5676 100644
--- a/.golangci.yml
+++ b/.golangci.yml
@@ -59,7 +59,7 @@ linters-settings:
   ifshort:
     # Maximum length of variable declaration measured in number of characters, after which linter won't suggest using short syntax.
     max-decl-chars: 50
-  goimports:
+  gci:
     local-prefixes: sigs.k8s.io/cluster-api-provider-openstack
   importas:
     no-unaliased: true
@@ -78,10 +78,39 @@ linters-settings:
       # Controller Runtime
       - pkg: sigs.k8s.io/controller-runtime
         alias: ctrl
+      # CAPO
+      - pkg: sigs.k8s.io/cluster-api-provider-openstack/api/v1alpha3
+        alias: infrav1alpha3
+      - pkg: sigs.k8s.io/cluster-api-provider-openstack/api/v1alpha4
+        alias: infrav1alpha4
+      - pkg: sigs.k8s.io/cluster-api-provider-openstack/api/v1beta1
+        alias: infrav1
+      # CAPI
+      - pkg: sigs.k8s.io/cluster-api/api/v1alpha3
+        alias: clusterv1alpha3
+      - pkg: sigs.k8s.io/cluster-api/api/v1alpha4
+        alias: clusterv1alpha4
+      - pkg: sigs.k8s.io/cluster-api/api/v1beta1
+        alias: clusterv1
+      # CABPK
+      - pkg: sigs.k8s.io/cluster-api/bootstrap/kubeadm/api/v1alpha3
+        alias: bootstrapv1alpha3
+      - pkg: sigs.k8s.io/cluster-api/bootstrap/kubeadm/api/v1alpha4
+        alias: bootstrapv1alpha4
+      - pkg: sigs.k8s.io/cluster-api/bootstrap/kubeadm/api/v1beta1
+        alias: bootstrapv1
+      # KCP
+      - pkg: sigs.k8s.io/cluster-api/controlplane/kubeadm/api/v1alpha3
+        alias: controlplanev1alpha3
+      - pkg: sigs.k8s.io/cluster-api/controlplane/kubeadm/api/v1alpha4
+        alias: controlplanev1alpha4
+      - pkg: sigs.k8s.io/cluster-api/controlplane/kubeadm/api/v1beta1
+        alias: controlplanev1
+
   staticcheck:
-    go: "1.16"
+    go: "1.17"
   stylecheck:
-    go: "1.16"
+    go: "1.17"
   nestif:
     # minimal complexity of if statements to report, 5 by default
     # TODO(sbuerin) fix remaining findings and set to 5 after:
@@ -112,6 +141,15 @@ issues:
     - revive
     path: test/e2e/shared/defaults.go
     text: "exported: exported const .* should have comment \\(or a comment on this block\\) or be unexported"
+  - linters:
+    - revive
+    text: "var-naming: don't use underscores in Go names;"
+    path: .*(api|types)\/.*\/.*conversion.*\.go$
+  - linters:
+    - stylecheck
+    text: "ST1003: should not use underscores in Go names;"
+    path: .*(api|types)\/.*\/.*conversion.*\.go$
+
 run:
   timeout: 10m
   build-tags:
@@ -119,5 +157,4 @@ run:
 
   skip-files:
     - "zz_generated.*\\.go$"
-    - ".*conversion.*\\.go$"
   allow-parallel-runners: true
diff --git a/api/v1alpha3/conversion.go b/api/v1alpha3/conversion.go
index 32d80d2477..b93fe3ab3b 100644
--- a/api/v1alpha3/conversion.go
+++ b/api/v1alpha3/conversion.go
@@ -21,19 +21,19 @@ import (
 	conversion "k8s.io/apimachinery/pkg/conversion"
 	ctrlconversion "sigs.k8s.io/controller-runtime/pkg/conversion"
 
-	"sigs.k8s.io/cluster-api-provider-openstack/api/v1beta1"
+	infrav1 "sigs.k8s.io/cluster-api-provider-openstack/api/v1beta1"
 )
 
 var _ ctrlconversion.Convertible = &OpenStackCluster{}
 
 func (r *OpenStackCluster) ConvertTo(dstRaw ctrlconversion.Hub) error {
-	dst := dstRaw.(*v1beta1.OpenStackCluster)
+	dst := dstRaw.(*infrav1.OpenStackCluster)
 
 	return Convert_v1alpha3_OpenStackCluster_To_v1beta1_OpenStackCluster(r, dst, nil)
 }
 
 func (r *OpenStackCluster) ConvertFrom(srcRaw ctrlconversion.Hub) error {
-	src := srcRaw.(*v1beta1.OpenStackCluster)
+	src := srcRaw.(*infrav1.OpenStackCluster)
 
 	return Convert_v1beta1_OpenStackCluster_To_v1alpha3_OpenStackCluster(src, r, nil)
 }
@@ -41,13 +41,13 @@ func (r *OpenStackCluster) ConvertFrom(srcRaw ctrlconversion.Hub) error {
 var _ ctrlconversion.Convertible = &OpenStackClusterList{}
 
 func (r *OpenStackClusterList) ConvertTo(dstRaw ctrlconversion.Hub) error {
-	dst := dstRaw.(*v1beta1.OpenStackClusterList)
+	dst := dstRaw.(*infrav1.OpenStackClusterList)
 
 	return Convert_v1alpha3_OpenStackClusterList_To_v1beta1_OpenStackClusterList(r, dst, nil)
 }
 
 func (r *OpenStackClusterList) ConvertFrom(srcRaw ctrlconversion.Hub) error {
-	src := srcRaw.(*v1beta1.OpenStackClusterList)
+	src := srcRaw.(*infrav1.OpenStackClusterList)
 
 	return Convert_v1beta1_OpenStackClusterList_To_v1alpha3_OpenStackClusterList(src, r, nil)
 }
@@ -55,13 +55,13 @@ func (r *OpenStackClusterList) ConvertFrom(srcRaw ctrlconversion.Hub) error {
 var _ ctrlconversion.Convertible = &OpenStackMachine{}
 
 func (r *OpenStackMachine) ConvertTo(dstRaw ctrlconversion.Hub) error {
-	dst := dstRaw.(*v1beta1.OpenStackMachine)
+	dst := dstRaw.(*infrav1.OpenStackMachine)
 
 	return Convert_v1alpha3_OpenStackMachine_To_v1beta1_OpenStackMachine(r, dst, nil)
 }
 
 func (r *OpenStackMachine) ConvertFrom(srcRaw ctrlconversion.Hub) error {
-	src := srcRaw.(*v1beta1.OpenStackMachine)
+	src := srcRaw.(*infrav1.OpenStackMachine)
 
 	return Convert_v1beta1_OpenStackMachine_To_v1alpha3_OpenStackMachine(src, r, nil)
 }
@@ -69,13 +69,13 @@ func (r *OpenStackMachine) ConvertFrom(srcRaw ctrlconversion.Hub) error {
 var _ ctrlconversion.Convertible = &OpenStackMachineList{}
 
 func (r *OpenStackMachineList) ConvertTo(dstRaw ctrlconversion.Hub) error {
-	dst := dstRaw.(*v1beta1.OpenStackMachineList)
+	dst := dstRaw.(*infrav1.OpenStackMachineList)
 
 	return Convert_v1alpha3_OpenStackMachineList_To_v1beta1_OpenStackMachineList(r, dst, nil)
 }
 
 func (r *OpenStackMachineList) ConvertFrom(srcRaw ctrlconversion.Hub) error {
-	src := srcRaw.(*v1beta1.OpenStackMachineList)
+	src := srcRaw.(*infrav1.OpenStackMachineList)
 
 	return Convert_v1beta1_OpenStackMachineList_To_v1alpha3_OpenStackMachineList(src, r, nil)
 }
@@ -83,13 +83,13 @@ func (r *OpenStackMachineList) ConvertFrom(srcRaw ctrlconversion.Hub) error {
 var _ ctrlconversion.Convertible = &OpenStackMachineTemplate{}
 
 func (r *OpenStackMachineTemplate) ConvertTo(dstRaw ctrlconversion.Hub) error {
-	dst := dstRaw.(*v1beta1.OpenStackMachineTemplate)
+	dst := dstRaw.(*infrav1.OpenStackMachineTemplate)
 
 	return Convert_v1alpha3_OpenStackMachineTemplate_To_v1beta1_OpenStackMachineTemplate(r, dst, nil)
 }
 
 func (r *OpenStackMachineTemplate) ConvertFrom(srcRaw ctrlconversion.Hub) error {
-	src := srcRaw.(*v1beta1.OpenStackMachineTemplate)
+	src := srcRaw.(*infrav1.OpenStackMachineTemplate)
 
 	return Convert_v1beta1_OpenStackMachineTemplate_To_v1alpha3_OpenStackMachineTemplate(src, r, nil)
 }
@@ -97,22 +97,22 @@ func (r *OpenStackMachineTemplate) ConvertFrom(srcRaw ctrlconversion.Hub) error
 var _ ctrlconversion.Convertible = &OpenStackMachineTemplateList{}
 
 func (r *OpenStackMachineTemplateList) ConvertTo(dstRaw ctrlconversion.Hub) error {
-	dst := dstRaw.(*v1beta1.OpenStackMachineTemplateList)
+	dst := dstRaw.(*infrav1.OpenStackMachineTemplateList)
 
 	return Convert_v1alpha3_OpenStackMachineTemplateList_To_v1beta1_OpenStackMachineTemplateList(r, dst, nil)
 }
 
 func (r *OpenStackMachineTemplateList) ConvertFrom(srcRaw ctrlconversion.Hub) error {
-	src := srcRaw.(*v1beta1.OpenStackMachineTemplateList)
+	src := srcRaw.(*infrav1.OpenStackMachineTemplateList)
 
 	return Convert_v1beta1_OpenStackMachineTemplateList_To_v1alpha3_OpenStackMachineTemplateList(src, r, nil)
 }
 
 // Convert_v1alpha3_OpenStackClusterSpec_To_v1beta1_OpenStackClusterSpec has to be added by us because we dropped
 // the useOctavia parameter. We don't have to migrate this parameter to v1beta1 so there is nothing to do.
-func Convert_v1alpha3_OpenStackClusterSpec_To_v1beta1_OpenStackClusterSpec(in *OpenStackClusterSpec, out *v1beta1.OpenStackClusterSpec, s conversion.Scope) error {
+func Convert_v1alpha3_OpenStackClusterSpec_To_v1beta1_OpenStackClusterSpec(in *OpenStackClusterSpec, out *infrav1.OpenStackClusterSpec, s conversion.Scope) error {
 	if in.CloudsSecret != nil {
-		out.IdentityRef = &v1beta1.OpenStackIdentityReference{
+		out.IdentityRef = &infrav1.OpenStackIdentityReference{
 			Kind: "Secret",
 			Name: in.CloudsSecret.Name,
 		}
@@ -122,7 +122,7 @@ func Convert_v1alpha3_OpenStackClusterSpec_To_v1beta1_OpenStackClusterSpec(in *O
 
 // Convert_v1beta1_OpenStackClusterSpec_To_v1alpha3_OpenStackClusterSpec has to be added by us because we have to
 // convert the Type of CloudsSecret from SecretReference to string.
-func Convert_v1beta1_OpenStackClusterSpec_To_v1alpha3_OpenStackClusterSpec(in *v1beta1.OpenStackClusterSpec, out *OpenStackClusterSpec, s conversion.Scope) error {
+func Convert_v1beta1_OpenStackClusterSpec_To_v1alpha3_OpenStackClusterSpec(in *infrav1.OpenStackClusterSpec, out *OpenStackClusterSpec, s conversion.Scope) error {
 	if in.IdentityRef != nil {
 		out.CloudsSecret = &corev1.SecretReference{
 			Name: in.IdentityRef.Name,
@@ -144,9 +144,9 @@ func Convert_v1beta1_OpenStackClusterSpec_To_v1alpha3_OpenStackClusterSpec(in *v
 
 // Convert_v1alpha3_OpenStackMachineSpec_To_v1beta1_OpenStackMachineSpec is an autogenerated conversion function.
 // v1beta1 drops the field .UserDataSecret which is why we reuqire to define the function here.
-func Convert_v1alpha3_OpenStackMachineSpec_To_v1beta1_OpenStackMachineSpec(in *OpenStackMachineSpec, out *v1beta1.OpenStackMachineSpec, s conversion.Scope) error {
+func Convert_v1alpha3_OpenStackMachineSpec_To_v1beta1_OpenStackMachineSpec(in *OpenStackMachineSpec, out *infrav1.OpenStackMachineSpec, s conversion.Scope) error {
 	if in.CloudsSecret != nil {
-		out.IdentityRef = &v1beta1.OpenStackIdentityReference{
+		out.IdentityRef = &infrav1.OpenStackIdentityReference{
 			Name: in.CloudsSecret.Name,
 			Kind: "Secret",
 		}
@@ -156,14 +156,14 @@ func Convert_v1alpha3_OpenStackMachineSpec_To_v1beta1_OpenStackMachineSpec(in *O
 
 // Convert_v1beta1_Network_To_v1alpha3_Network has to be added by us for the new portOpts
 // parameter in v1beta1. There is no intention to support this parameter in v1alpha3, so the field is just dropped.
-func Convert_v1beta1_Network_To_v1alpha3_Network(in *v1beta1.Network, out *Network, s conversion.Scope) error {
+func Convert_v1beta1_Network_To_v1alpha3_Network(in *infrav1.Network, out *Network, s conversion.Scope) error {
 	return autoConvert_v1beta1_Network_To_v1alpha3_Network(in, out, s)
 }
 
 // Convert_v1beta1_OpenStackMachineSpec_To_v1alpha3_OpenStackMachineSpec has to be added by us for the new ports
 // parameter in v1beta1. There is no intention to support this parameter in v1alpha3, so the field is just dropped.
 // Further, we want to convert the Type of CloudsSecret from SecretReference to string.
-func Convert_v1beta1_OpenStackMachineSpec_To_v1alpha3_OpenStackMachineSpec(in *v1beta1.OpenStackMachineSpec, out *OpenStackMachineSpec, s conversion.Scope) error {
+func Convert_v1beta1_OpenStackMachineSpec_To_v1alpha3_OpenStackMachineSpec(in *infrav1.OpenStackMachineSpec, out *OpenStackMachineSpec, s conversion.Scope) error {
 	if in.IdentityRef != nil {
 		out.CloudsSecret = &corev1.SecretReference{
 			Name: in.IdentityRef.Name,
@@ -174,11 +174,11 @@ func Convert_v1beta1_OpenStackMachineSpec_To_v1alpha3_OpenStackMachineSpec(in *v
 
 // Convert_v1beta1_OpenStackClusterStatus_To_v1alpha3_OpenStackClusterStatus has to be added
 // in order to drop the FailureReason and FailureMessage fields that are not present in v1alpha3.
-func Convert_v1beta1_OpenStackClusterStatus_To_v1alpha3_OpenStackClusterStatus(in *v1beta1.OpenStackClusterStatus, out *OpenStackClusterStatus, s conversion.Scope) error {
+func Convert_v1beta1_OpenStackClusterStatus_To_v1alpha3_OpenStackClusterStatus(in *infrav1.OpenStackClusterStatus, out *OpenStackClusterStatus, s conversion.Scope) error {
 	return autoConvert_v1beta1_OpenStackClusterStatus_To_v1alpha3_OpenStackClusterStatus(in, out, s)
 }
 
-func Convert_Slice_v1beta1_Network_To_Slice_v1alpha3_Network(in *[]v1beta1.Network, out *[]Network, s conversion.Scope) error {
+func Convert_Slice_v1beta1_Network_To_Slice_v1alpha3_Network(in *[]infrav1.Network, out *[]Network, s conversion.Scope) error {
 	for i := range *in {
 		inNet := &(*in)[i]
 		outNet := new(Network)
@@ -190,10 +190,10 @@ func Convert_Slice_v1beta1_Network_To_Slice_v1alpha3_Network(in *[]v1beta1.Netwo
 	return nil
 }
 
-func Convert_Slice_v1alpha3_Network_To_Slice_v1beta1_Network(in *[]Network, out *[]v1beta1.Network, s conversion.Scope) error {
+func Convert_Slice_v1alpha3_Network_To_Slice_v1beta1_Network(in *[]Network, out *[]infrav1.Network, s conversion.Scope) error {
 	for i := range *in {
 		inNet := &(*in)[i]
-		outNet := new(v1beta1.Network)
+		outNet := new(infrav1.Network)
 		if err := autoConvert_v1alpha3_Network_To_v1beta1_Network(inNet, outNet, s); err != nil {
 			return err
 		}
@@ -202,7 +202,7 @@ func Convert_Slice_v1alpha3_Network_To_Slice_v1beta1_Network(in *[]Network, out
 	return nil
 }
 
-func Convert_v1alpha3_SubnetFilter_To_v1beta1_SubnetFilter(in *SubnetFilter, out *v1beta1.SubnetFilter, s conversion.Scope) error {
+func Convert_v1alpha3_SubnetFilter_To_v1beta1_SubnetFilter(in *SubnetFilter, out *infrav1.SubnetFilter, s conversion.Scope) error {
 	out.Name = in.Name
 	out.Description = in.Description
 	if in.ProjectID != "" {
@@ -223,12 +223,12 @@ func Convert_v1alpha3_SubnetFilter_To_v1beta1_SubnetFilter(in *SubnetFilter, out
 	return nil
 }
 
-func Convert_v1beta1_SubnetFilter_To_v1alpha3_SubnetFilter(in *v1beta1.SubnetFilter, out *SubnetFilter, s conversion.Scope) error {
+func Convert_v1beta1_SubnetFilter_To_v1alpha3_SubnetFilter(in *infrav1.SubnetFilter, out *SubnetFilter, s conversion.Scope) error {
 	out.TenantID = in.ProjectID
 	return autoConvert_v1beta1_SubnetFilter_To_v1alpha3_SubnetFilter(in, out, s)
 }
 
-func Convert_v1alpha3_Filter_To_v1beta1_NetworkFilter(in *Filter, out *v1beta1.NetworkFilter, s conversion.Scope) error {
+func Convert_v1alpha3_Filter_To_v1beta1_NetworkFilter(in *Filter, out *infrav1.NetworkFilter, s conversion.Scope) error {
 	out.Name = in.Name
 	out.Description = in.Description
 	if in.ProjectID != "" {
@@ -244,7 +244,7 @@ func Convert_v1alpha3_Filter_To_v1beta1_NetworkFilter(in *Filter, out *v1beta1.N
 	return nil
 }
 
-func Convert_v1beta1_NetworkFilter_To_v1alpha3_Filter(in *v1beta1.NetworkFilter, out *Filter, s conversion.Scope) error {
+func Convert_v1beta1_NetworkFilter_To_v1alpha3_Filter(in *infrav1.NetworkFilter, out *Filter, s conversion.Scope) error {
 	out.Name = in.Name
 	out.Description = in.Description
 	out.ProjectID = in.ProjectID
diff --git a/api/v1alpha3/conversion_test.go b/api/v1alpha3/conversion_test.go
index 00f0738f43..02223df079 100644
--- a/api/v1alpha3/conversion_test.go
+++ b/api/v1alpha3/conversion_test.go
@@ -21,19 +21,19 @@ import (
 
 	fuzz "github.com/google/gofuzz"
 	"github.com/onsi/gomega"
-
 	"k8s.io/apimachinery/pkg/api/apitesting/fuzzer"
 	runtime "k8s.io/apimachinery/pkg/runtime"
 	runtimeserializer "k8s.io/apimachinery/pkg/runtime/serializer"
-	v1beta1 "sigs.k8s.io/cluster-api-provider-openstack/api/v1beta1"
 	utilconversion "sigs.k8s.io/cluster-api/util/conversion"
+
+	infrav1 "sigs.k8s.io/cluster-api-provider-openstack/api/v1beta1"
 )
 
 func TestFuzzyConversion(t *testing.T) {
 	g := gomega.NewWithT(t)
 	scheme := runtime.NewScheme()
 	g.Expect(AddToScheme(scheme)).To(gomega.Succeed())
-	g.Expect(v1beta1.AddToScheme(scheme)).To(gomega.Succeed())
+	g.Expect(infrav1.AddToScheme(scheme)).To(gomega.Succeed())
 
 	fuzzerFuncs := func(_ runtimeserializer.CodecFactory) []interface{} {
 		return []interface{}{
@@ -90,30 +90,30 @@ func TestFuzzyConversion(t *testing.T) {
 			},
 
 			// Don't test hub-spoke-hub conversion of v1beta1 fields which are not in v1alpha3
-			func(v1beta1ClusterSpec *v1beta1.OpenStackClusterSpec, c fuzz.Continue) {
+			func(v1beta1ClusterSpec *infrav1.OpenStackClusterSpec, c fuzz.Continue) {
 				c.FuzzNoCustom(v1beta1ClusterSpec)
 
 				v1beta1ClusterSpec.APIServerFixedIP = ""
 				v1beta1ClusterSpec.AllowAllInClusterTraffic = false
 				v1beta1ClusterSpec.DisableAPIServerFloatingIP = false
 			},
-			func(v1beta1MachineSpec *v1beta1.OpenStackMachineSpec, c fuzz.Continue) {
+			func(v1beta1MachineSpec *infrav1.OpenStackMachineSpec, c fuzz.Continue) {
 				c.FuzzNoCustom(v1beta1MachineSpec)
 
 				v1beta1MachineSpec.Ports = nil
 			},
-			func(v1beta1Network *v1beta1.Network, c fuzz.Continue) {
+			func(v1beta1Network *infrav1.Network, c fuzz.Continue) {
 				c.FuzzNoCustom(v1beta1Network)
 
 				v1beta1Network.PortOpts = nil
 			},
-			func(v1beta1ClusterStatus *v1beta1.OpenStackClusterStatus, c fuzz.Continue) {
+			func(v1beta1ClusterStatus *infrav1.OpenStackClusterStatus, c fuzz.Continue) {
 				c.FuzzNoCustom(v1beta1ClusterStatus)
 
 				v1beta1ClusterStatus.FailureMessage = nil
 				v1beta1ClusterStatus.FailureReason = nil
 			},
-			func(v1beta1OpenStackIdentityRef *v1beta1.OpenStackIdentityReference, c fuzz.Continue) {
+			func(v1beta1OpenStackIdentityRef *infrav1.OpenStackIdentityReference, c fuzz.Continue) {
 				c.FuzzNoCustom(v1beta1OpenStackIdentityRef)
 
 				// IdentityRef was assumed to be a Secret in v1alpha3
@@ -124,21 +124,21 @@ func TestFuzzyConversion(t *testing.T) {
 
 	t.Run("for OpenStackCluster", utilconversion.FuzzTestFunc(utilconversion.FuzzTestFuncInput{
 		Scheme:      scheme,
-		Hub:         &v1beta1.OpenStackCluster{},
+		Hub:         &infrav1.OpenStackCluster{},
 		Spoke:       &OpenStackCluster{},
 		FuzzerFuncs: []fuzzer.FuzzerFuncs{fuzzerFuncs},
 	}))
 
 	t.Run("for OpenStackMachine", utilconversion.FuzzTestFunc(utilconversion.FuzzTestFuncInput{
 		Scheme:      scheme,
-		Hub:         &v1beta1.OpenStackMachine{},
+		Hub:         &infrav1.OpenStackMachine{},
 		Spoke:       &OpenStackMachine{},
 		FuzzerFuncs: []fuzzer.FuzzerFuncs{fuzzerFuncs},
 	}))
 
 	t.Run("for OpenStackMachineTemplate", utilconversion.FuzzTestFunc(utilconversion.FuzzTestFuncInput{
 		Scheme:      scheme,
-		Hub:         &v1beta1.OpenStackMachineTemplate{},
+		Hub:         &infrav1.OpenStackMachineTemplate{},
 		Spoke:       &OpenStackMachineTemplate{},
 		FuzzerFuncs: []fuzzer.FuzzerFuncs{fuzzerFuncs},
 	}))
diff --git a/api/v1alpha3/openstackcluster_conversion.go b/api/v1alpha3/openstackcluster_conversion.go
index b69aecdbd7..1d0731aa62 100644
--- a/api/v1alpha3/openstackcluster_conversion.go
+++ b/api/v1alpha3/openstackcluster_conversion.go
@@ -17,17 +17,17 @@ limitations under the License.
 package v1alpha3
 
 import (
-	apiconversion "k8s.io/apimachinery/pkg/conversion"
-	apiv1alpha3 "sigs.k8s.io/cluster-api/api/v1alpha3"
-	apiv1beta1 "sigs.k8s.io/cluster-api/api/v1beta1"
+	"k8s.io/apimachinery/pkg/conversion"
+	clusterv1alpha3 "sigs.k8s.io/cluster-api/api/v1alpha3"
+	clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1"
 )
 
 // Convert_v1alpha3_APIEndpoint_To_v1beta1_APIEndpoint is an autogenerated conversion function.
-func Convert_v1alpha3_APIEndpoint_To_v1beta1_APIEndpoint(in *apiv1alpha3.APIEndpoint, out *apiv1beta1.APIEndpoint, s apiconversion.Scope) error {
-	return apiv1alpha3.Convert_v1alpha3_APIEndpoint_To_v1beta1_APIEndpoint(in, out, s)
+func Convert_v1alpha3_APIEndpoint_To_v1beta1_APIEndpoint(in *clusterv1alpha3.APIEndpoint, out *clusterv1.APIEndpoint, s conversion.Scope) error {
+	return clusterv1alpha3.Convert_v1alpha3_APIEndpoint_To_v1beta1_APIEndpoint(in, out, s)
 }
 
 // Convert_v1beta1_APIEndpoint_To_v1alpha3_APIEndpoint is an autogenerated conversion function.
-func Convert_v1beta1_APIEndpoint_To_v1alpha3_APIEndpoint(in *apiv1beta1.APIEndpoint, out *apiv1alpha3.APIEndpoint, s apiconversion.Scope) error {
-	return apiv1alpha3.Convert_v1beta1_APIEndpoint_To_v1alpha3_APIEndpoint(in, out, s)
+func Convert_v1beta1_APIEndpoint_To_v1alpha3_APIEndpoint(in *clusterv1.APIEndpoint, out *clusterv1alpha3.APIEndpoint, s conversion.Scope) error {
+	return clusterv1alpha3.Convert_v1beta1_APIEndpoint_To_v1alpha3_APIEndpoint(in, out, s)
 }
diff --git a/api/v1alpha3/openstackcluster_types.go b/api/v1alpha3/openstackcluster_types.go
index 023e30c2a1..3f5bd88ee6 100644
--- a/api/v1alpha3/openstackcluster_types.go
+++ b/api/v1alpha3/openstackcluster_types.go
@@ -19,7 +19,7 @@ package v1alpha3
 import (
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	clusterv1 "sigs.k8s.io/cluster-api/api/v1alpha3"
+	clusterv1alpha3 "sigs.k8s.io/cluster-api/api/v1alpha3"
 )
 
 const (
@@ -102,7 +102,7 @@ type OpenStackClusterSpec struct {
 
 	// ControlPlaneEndpoint represents the endpoint used to communicate with the control plane.
 	// +optional
-	ControlPlaneEndpoint clusterv1.APIEndpoint `json:"controlPlaneEndpoint"`
+	ControlPlaneEndpoint clusterv1alpha3.APIEndpoint `json:"controlPlaneEndpoint"`
 
 	// ControlPlaneAvailabilityZones is the az to deploy control plane to
 	ControlPlaneAvailabilityZones []string `json:"controlPlaneAvailabilityZones,omitempty"`
@@ -124,7 +124,7 @@ type OpenStackClusterStatus struct {
 	ExternalNetwork *Network `json:"externalNetwork,omitempty"`
 
 	// FailureDomains represent OpenStack availability zones
-	FailureDomains clusterv1.FailureDomains `json:"failureDomains,omitempty"`
+	FailureDomains clusterv1alpha3.FailureDomains `json:"failureDomains,omitempty"`
 
 	// ControlPlaneSecurityGroups contains all the information about the OpenStack
 	// Security Group that needs to be applied to control plane nodes.
diff --git a/api/v1alpha4/conversion.go b/api/v1alpha4/conversion.go
index 13c81072ff..fa08affd87 100644
--- a/api/v1alpha4/conversion.go
+++ b/api/v1alpha4/conversion.go
@@ -17,25 +17,22 @@ limitations under the License.
 package v1alpha4
 
 import (
-	// corev1 "k8s.io/api/core/v1"
-	// conversion "k8s.io/apimachinery/pkg/conversion"
-
 	conversion "k8s.io/apimachinery/pkg/conversion"
 	ctrlconversion "sigs.k8s.io/controller-runtime/pkg/conversion"
 
-	"sigs.k8s.io/cluster-api-provider-openstack/api/v1beta1"
+	infrav1 "sigs.k8s.io/cluster-api-provider-openstack/api/v1beta1"
 )
 
 var _ ctrlconversion.Convertible = &OpenStackCluster{}
 
 func (r *OpenStackCluster) ConvertTo(dstRaw ctrlconversion.Hub) error {
-	dst := dstRaw.(*v1beta1.OpenStackCluster)
+	dst := dstRaw.(*infrav1.OpenStackCluster)
 
 	return Convert_v1alpha4_OpenStackCluster_To_v1beta1_OpenStackCluster(r, dst, nil)
 }
 
 func (r *OpenStackCluster) ConvertFrom(srcRaw ctrlconversion.Hub) error {
-	src := srcRaw.(*v1beta1.OpenStackCluster)
+	src := srcRaw.(*infrav1.OpenStackCluster)
 
 	return Convert_v1beta1_OpenStackCluster_To_v1alpha4_OpenStackCluster(src, r, nil)
 }
@@ -43,13 +40,13 @@ func (r *OpenStackCluster) ConvertFrom(srcRaw ctrlconversion.Hub) error {
 var _ ctrlconversion.Convertible = &OpenStackClusterList{}
 
 func (r *OpenStackClusterList) ConvertTo(dstRaw ctrlconversion.Hub) error {
-	dst := dstRaw.(*v1beta1.OpenStackClusterList)
+	dst := dstRaw.(*infrav1.OpenStackClusterList)
 
 	return Convert_v1alpha4_OpenStackClusterList_To_v1beta1_OpenStackClusterList(r, dst, nil)
 }
 
 func (r *OpenStackClusterList) ConvertFrom(srcRaw ctrlconversion.Hub) error {
-	src := srcRaw.(*v1beta1.OpenStackClusterList)
+	src := srcRaw.(*infrav1.OpenStackClusterList)
 
 	return Convert_v1beta1_OpenStackClusterList_To_v1alpha4_OpenStackClusterList(src, r, nil)
 }
@@ -57,13 +54,13 @@ func (r *OpenStackClusterList) ConvertFrom(srcRaw ctrlconversion.Hub) error {
 var _ ctrlconversion.Convertible = &OpenStackMachine{}
 
 func (r *OpenStackMachine) ConvertTo(dstRaw ctrlconversion.Hub) error {
-	dst := dstRaw.(*v1beta1.OpenStackMachine)
+	dst := dstRaw.(*infrav1.OpenStackMachine)
 
 	return Convert_v1alpha4_OpenStackMachine_To_v1beta1_OpenStackMachine(r, dst, nil)
 }
 
 func (r *OpenStackMachine) ConvertFrom(srcRaw ctrlconversion.Hub) error {
-	src := srcRaw.(*v1beta1.OpenStackMachine)
+	src := srcRaw.(*infrav1.OpenStackMachine)
 
 	return Convert_v1beta1_OpenStackMachine_To_v1alpha4_OpenStackMachine(src, r, nil)
 }
@@ -71,13 +68,13 @@ func (r *OpenStackMachine) ConvertFrom(srcRaw ctrlconversion.Hub) error {
 var _ ctrlconversion.Convertible = &OpenStackMachineList{}
 
 func (r *OpenStackMachineList) ConvertTo(dstRaw ctrlconversion.Hub) error {
-	dst := dstRaw.(*v1beta1.OpenStackMachineList)
+	dst := dstRaw.(*infrav1.OpenStackMachineList)
 
 	return Convert_v1alpha4_OpenStackMachineList_To_v1beta1_OpenStackMachineList(r, dst, nil)
 }
 
 func (r *OpenStackMachineList) ConvertFrom(srcRaw ctrlconversion.Hub) error {
-	src := srcRaw.(*v1beta1.OpenStackMachineList)
+	src := srcRaw.(*infrav1.OpenStackMachineList)
 
 	return Convert_v1beta1_OpenStackMachineList_To_v1alpha4_OpenStackMachineList(src, r, nil)
 }
@@ -85,13 +82,13 @@ func (r *OpenStackMachineList) ConvertFrom(srcRaw ctrlconversion.Hub) error {
 var _ ctrlconversion.Convertible = &OpenStackMachineTemplate{}
 
 func (r *OpenStackMachineTemplate) ConvertTo(dstRaw ctrlconversion.Hub) error {
-	dst := dstRaw.(*v1beta1.OpenStackMachineTemplate)
+	dst := dstRaw.(*infrav1.OpenStackMachineTemplate)
 
 	return Convert_v1alpha4_OpenStackMachineTemplate_To_v1beta1_OpenStackMachineTemplate(r, dst, nil)
 }
 
 func (r *OpenStackMachineTemplate) ConvertFrom(srcRaw ctrlconversion.Hub) error {
-	src := srcRaw.(*v1beta1.OpenStackMachineTemplate)
+	src := srcRaw.(*infrav1.OpenStackMachineTemplate)
 
 	return Convert_v1beta1_OpenStackMachineTemplate_To_v1alpha4_OpenStackMachineTemplate(src, r, nil)
 }
@@ -99,18 +96,18 @@ func (r *OpenStackMachineTemplate) ConvertFrom(srcRaw ctrlconversion.Hub) error
 var _ ctrlconversion.Convertible = &OpenStackMachineTemplateList{}
 
 func (r *OpenStackMachineTemplateList) ConvertTo(dstRaw ctrlconversion.Hub) error {
-	dst := dstRaw.(*v1beta1.OpenStackMachineTemplateList)
+	dst := dstRaw.(*infrav1.OpenStackMachineTemplateList)
 
 	return Convert_v1alpha4_OpenStackMachineTemplateList_To_v1beta1_OpenStackMachineTemplateList(r, dst, nil)
 }
 
 func (r *OpenStackMachineTemplateList) ConvertFrom(srcRaw ctrlconversion.Hub) error {
-	src := srcRaw.(*v1beta1.OpenStackMachineTemplateList)
+	src := srcRaw.(*infrav1.OpenStackMachineTemplateList)
 
 	return Convert_v1beta1_OpenStackMachineTemplateList_To_v1alpha4_OpenStackMachineTemplateList(src, r, nil)
 }
 
-func Convert_v1alpha4_SubnetFilter_To_v1beta1_SubnetFilter(in *SubnetFilter, out *v1beta1.SubnetFilter, s conversion.Scope) error {
+func Convert_v1alpha4_SubnetFilter_To_v1beta1_SubnetFilter(in *SubnetFilter, out *infrav1.SubnetFilter, s conversion.Scope) error {
 	out.Name = in.Name
 	out.Description = in.Description
 	if in.ProjectID != "" {
@@ -131,12 +128,12 @@ func Convert_v1alpha4_SubnetFilter_To_v1beta1_SubnetFilter(in *SubnetFilter, out
 	return nil
 }
 
-func Convert_v1beta1_SubnetFilter_To_v1alpha4_SubnetFilter(in *v1beta1.SubnetFilter, out *SubnetFilter, s conversion.Scope) error {
+func Convert_v1beta1_SubnetFilter_To_v1alpha4_SubnetFilter(in *infrav1.SubnetFilter, out *SubnetFilter, s conversion.Scope) error {
 	out.TenantID = in.ProjectID
 	return autoConvert_v1beta1_SubnetFilter_To_v1alpha4_SubnetFilter(in, out, s)
 }
 
-func Convert_v1alpha4_Filter_To_v1beta1_NetworkFilter(in *Filter, out *v1beta1.NetworkFilter, s conversion.Scope) error {
+func Convert_v1alpha4_Filter_To_v1beta1_NetworkFilter(in *Filter, out *infrav1.NetworkFilter, s conversion.Scope) error {
 	out.Name = in.Name
 	out.Description = in.Description
 	if in.ProjectID != "" {
@@ -152,7 +149,7 @@ func Convert_v1alpha4_Filter_To_v1beta1_NetworkFilter(in *Filter, out *v1beta1.N
 	return nil
 }
 
-func Convert_v1beta1_NetworkFilter_To_v1alpha4_Filter(in *v1beta1.NetworkFilter, out *Filter, s conversion.Scope) error {
+func Convert_v1beta1_NetworkFilter_To_v1alpha4_Filter(in *infrav1.NetworkFilter, out *Filter, s conversion.Scope) error {
 	out.Name = in.Name
 	out.Description = in.Description
 	out.ProjectID = in.ProjectID
@@ -165,18 +162,18 @@ func Convert_v1beta1_NetworkFilter_To_v1alpha4_Filter(in *v1beta1.NetworkFilter,
 	return nil
 }
 
-func Convert_v1alpha4_PortOpts_To_v1beta1_PortOpts(in *PortOpts, out *v1beta1.PortOpts, s conversion.Scope) error {
+func Convert_v1alpha4_PortOpts_To_v1beta1_PortOpts(in *PortOpts, out *infrav1.PortOpts, s conversion.Scope) error {
 	err := autoConvert_v1alpha4_PortOpts_To_v1beta1_PortOpts(in, out, s)
 	if err != nil {
 		return err
 	}
 	if in.NetworkID != "" {
-		out.Network = &v1beta1.NetworkFilter{ID: in.NetworkID}
+		out.Network = &infrav1.NetworkFilter{ID: in.NetworkID}
 	}
 	return nil
 }
 
-func Convert_v1beta1_PortOpts_To_v1alpha4_PortOpts(in *v1beta1.PortOpts, out *PortOpts, s conversion.Scope) error {
+func Convert_v1beta1_PortOpts_To_v1alpha4_PortOpts(in *infrav1.PortOpts, out *PortOpts, s conversion.Scope) error {
 	err := autoConvert_v1beta1_PortOpts_To_v1alpha4_PortOpts(in, out, s)
 	if err != nil {
 		return err
@@ -187,8 +184,8 @@ func Convert_v1beta1_PortOpts_To_v1alpha4_PortOpts(in *v1beta1.PortOpts, out *Po
 	return nil
 }
 
-func Convert_Slice_v1alpha4_Network_To_Slice_v1beta1_Network(in *[]Network, out *[]v1beta1.Network, s conversion.Scope) error {
-	*out = make([]v1beta1.Network, len(*in))
+func Convert_Slice_v1alpha4_Network_To_Slice_v1beta1_Network(in *[]Network, out *[]infrav1.Network, s conversion.Scope) error {
+	*out = make([]infrav1.Network, len(*in))
 	for i := range *in {
 		if err := Convert_v1alpha4_Network_To_v1beta1_Network(&(*in)[i], &(*out)[i], s); err != nil {
 			return err
@@ -198,7 +195,7 @@ func Convert_Slice_v1alpha4_Network_To_Slice_v1beta1_Network(in *[]Network, out
 	return nil
 }
 
-func Convert_Slice_v1beta1_Network_To_Slice_v1alpha4_Network(in *[]v1beta1.Network, out *[]Network, s conversion.Scope) error {
+func Convert_Slice_v1beta1_Network_To_Slice_v1alpha4_Network(in *[]infrav1.Network, out *[]Network, s conversion.Scope) error {
 	*out = make([]Network, len(*in))
 	for i := range *in {
 		if err := Convert_v1beta1_Network_To_v1alpha4_Network(&(*in)[i], &(*out)[i], s); err != nil {
@@ -208,18 +205,18 @@ func Convert_Slice_v1beta1_Network_To_Slice_v1alpha4_Network(in *[]v1beta1.Netwo
 	return nil
 }
 
-func Convert_v1alpha4_FixedIP_To_v1beta1_FixedIP(in *FixedIP, out *v1beta1.FixedIP, s conversion.Scope) error {
+func Convert_v1alpha4_FixedIP_To_v1beta1_FixedIP(in *FixedIP, out *infrav1.FixedIP, s conversion.Scope) error {
 	err := autoConvert_v1alpha4_FixedIP_To_v1beta1_FixedIP(in, out, s)
 	if err != nil {
 		return err
 	}
 	if in.SubnetID != "" {
-		out.Subnet = &v1beta1.SubnetFilter{ID: in.SubnetID}
+		out.Subnet = &infrav1.SubnetFilter{ID: in.SubnetID}
 	}
 	return nil
 }
 
-func Convert_v1beta1_FixedIP_To_v1alpha4_FixedIP(in *v1beta1.FixedIP, out *FixedIP, s conversion.Scope) error {
+func Convert_v1beta1_FixedIP_To_v1alpha4_FixedIP(in *infrav1.FixedIP, out *FixedIP, s conversion.Scope) error {
 	err := autoConvert_v1beta1_FixedIP_To_v1alpha4_FixedIP(in, out, s)
 	if err != nil {
 		return err
diff --git a/api/v1alpha4/conversion_test.go b/api/v1alpha4/conversion_test.go
index 25cf7ef5fc..bd83a801b0 100644
--- a/api/v1alpha4/conversion_test.go
+++ b/api/v1alpha4/conversion_test.go
@@ -21,20 +21,20 @@ import (
 
 	fuzz "github.com/google/gofuzz"
 	"github.com/onsi/gomega"
-
 	"k8s.io/apimachinery/pkg/api/apitesting/fuzzer"
 	runtime "k8s.io/apimachinery/pkg/runtime"
 	runtimeserializer "k8s.io/apimachinery/pkg/runtime/serializer"
-	v1beta1 "sigs.k8s.io/cluster-api-provider-openstack/api/v1beta1"
 	utilconversion "sigs.k8s.io/cluster-api/util/conversion"
 	ctrlconversion "sigs.k8s.io/controller-runtime/pkg/conversion"
+
+	infrav1 "sigs.k8s.io/cluster-api-provider-openstack/api/v1beta1"
 )
 
 func TestConvertTo(t *testing.T) {
 	g := gomega.NewWithT(t)
 	scheme := runtime.NewScheme()
 	g.Expect(AddToScheme(scheme)).To(gomega.Succeed())
-	g.Expect(v1beta1.AddToScheme(scheme)).To(gomega.Succeed())
+	g.Expect(infrav1.AddToScheme(scheme)).To(gomega.Succeed())
 
 	const subnetID = "986f5848-127f-4357-944e-5dd75472def8"
 
@@ -57,13 +57,13 @@ func TestConvertTo(t *testing.T) {
 					},
 				},
 			},
-			hub: &v1beta1.OpenStackMachine{},
-			want: &v1beta1.OpenStackMachine{
-				Spec: v1beta1.OpenStackMachineSpec{
-					Ports: []v1beta1.PortOpts{
+			hub: &infrav1.OpenStackMachine{},
+			want: &infrav1.OpenStackMachine{
+				Spec: infrav1.OpenStackMachineSpec{
+					Ports: []infrav1.PortOpts{
 						{
-							FixedIPs: []v1beta1.FixedIP{
-								{Subnet: &v1beta1.SubnetFilter{ID: subnetID}},
+							FixedIPs: []infrav1.FixedIP{
+								{Subnet: &infrav1.SubnetFilter{ID: subnetID}},
 							},
 						},
 					},
@@ -85,7 +85,7 @@ func TestConvertFrom(t *testing.T) {
 	g := gomega.NewWithT(t)
 	scheme := runtime.NewScheme()
 	g.Expect(AddToScheme(scheme)).To(gomega.Succeed())
-	g.Expect(v1beta1.AddToScheme(scheme)).To(gomega.Succeed())
+	g.Expect(infrav1.AddToScheme(scheme)).To(gomega.Succeed())
 
 	const subnetID = "986f5848-127f-4357-944e-5dd75472def8"
 
@@ -98,12 +98,12 @@ func TestConvertFrom(t *testing.T) {
 		{
 			name:  "FixedIP with SubnetFilter.ID",
 			spoke: &OpenStackMachine{},
-			hub: &v1beta1.OpenStackMachine{
-				Spec: v1beta1.OpenStackMachineSpec{
-					Ports: []v1beta1.PortOpts{
+			hub: &infrav1.OpenStackMachine{
+				Spec: infrav1.OpenStackMachineSpec{
+					Ports: []infrav1.PortOpts{
 						{
-							FixedIPs: []v1beta1.FixedIP{
-								{Subnet: &v1beta1.SubnetFilter{ID: subnetID}},
+							FixedIPs: []infrav1.FixedIP{
+								{Subnet: &infrav1.SubnetFilter{ID: subnetID}},
 							},
 						},
 					},
@@ -136,11 +136,11 @@ func TestFuzzyConversion(t *testing.T) {
 	g := gomega.NewWithT(t)
 	scheme := runtime.NewScheme()
 	g.Expect(AddToScheme(scheme)).To(gomega.Succeed())
-	g.Expect(v1beta1.AddToScheme(scheme)).To(gomega.Succeed())
+	g.Expect(infrav1.AddToScheme(scheme)).To(gomega.Succeed())
 
 	fuzzerFuncs := func(_ runtimeserializer.CodecFactory) []interface{} {
 		return []interface{}{
-			// Don't test spoke-hub-spoke conversion of v1alpha4 fields which are not in v1beta1
+			// Don't test spoke-hub-spoke conversion of v1alpha4 fields which are not in infrav1
 			func(v1alpha3SubnetFilter *SubnetFilter, c fuzz.Continue) {
 				c.FuzzNoCustom(v1alpha3SubnetFilter)
 				v1alpha3SubnetFilter.EnableDHCP = nil
@@ -151,7 +151,7 @@ func TestFuzzyConversion(t *testing.T) {
 				v1alpha3SubnetFilter.SortKey = ""
 				v1alpha3SubnetFilter.SortDir = ""
 
-				// TenantID and ProjectID are the same thing, so TenantID is removed in v1beta1
+				// TenantID and ProjectID are the same thing, so TenantID is removed in infrav1
 				// Test that we restore TenantID from ProjectID
 				v1alpha3SubnetFilter.TenantID = v1alpha3SubnetFilter.ProjectID
 			},
@@ -165,38 +165,38 @@ func TestFuzzyConversion(t *testing.T) {
 				v1alpha3Filter.SortKey = ""
 				v1alpha3Filter.SortDir = ""
 
-				// TenantID and ProjectID are the same thing, so TenantID is removed in v1beta1
+				// TenantID and ProjectID are the same thing, so TenantID is removed in infrav1
 				// Test that we restore TenantID from ProjectID
 				v1alpha3Filter.TenantID = v1alpha3Filter.ProjectID
 			},
 
-			// Don't test hub-spoke-hub conversion of v1beta1 fields which are not in v1alpha4
-			func(v1beta1PortOpts *v1beta1.PortOpts, c fuzz.Continue) {
+			// Don't test hub-spoke-hub conversion of infrav1 fields which are not in v1alpha4
+			func(v1beta1PortOpts *infrav1.PortOpts, c fuzz.Continue) {
 				c.FuzzNoCustom(v1beta1PortOpts)
 
 				// v1alpha4 PortOpts has only NetworkID, so only Network.ID filter can be translated
 				if v1beta1PortOpts.Network != nil {
-					v1beta1PortOpts.Network = &v1beta1.NetworkFilter{ID: v1beta1PortOpts.Network.ID}
+					v1beta1PortOpts.Network = &infrav1.NetworkFilter{ID: v1beta1PortOpts.Network.ID}
 
 					// We have no way to differentiate between a nil NetworkFilter and an
 					// empty NetworkFilter after conversion because they both translate into an
 					// empty string in v1alpha4
-					if *v1beta1PortOpts.Network == (v1beta1.NetworkFilter{}) {
+					if *v1beta1PortOpts.Network == (infrav1.NetworkFilter{}) {
 						v1beta1PortOpts.Network = nil
 					}
 				}
 			},
-			func(v1beta1FixedIP *v1beta1.FixedIP, c fuzz.Continue) {
+			func(v1beta1FixedIP *infrav1.FixedIP, c fuzz.Continue) {
 				c.FuzzNoCustom(v1beta1FixedIP)
 
 				// v1alpha4 only supports subnet specified by ID
 				if v1beta1FixedIP.Subnet != nil {
-					v1beta1FixedIP.Subnet = &v1beta1.SubnetFilter{ID: v1beta1FixedIP.Subnet.ID}
+					v1beta1FixedIP.Subnet = &infrav1.SubnetFilter{ID: v1beta1FixedIP.Subnet.ID}
 
 					// We have no way to differentiate between a nil SubnetFilter and an
 					// empty SubnetFilter after conversion because they both translate into an
 					// empty string in v1alpha4
-					if *v1beta1FixedIP.Subnet == (v1beta1.SubnetFilter{}) {
+					if *v1beta1FixedIP.Subnet == (infrav1.SubnetFilter{}) {
 						v1beta1FixedIP.Subnet = nil
 					}
 				}
@@ -206,21 +206,21 @@ func TestFuzzyConversion(t *testing.T) {
 
 	t.Run("for OpenStackCluster", utilconversion.FuzzTestFunc(utilconversion.FuzzTestFuncInput{
 		Scheme:      scheme,
-		Hub:         &v1beta1.OpenStackCluster{},
+		Hub:         &infrav1.OpenStackCluster{},
 		Spoke:       &OpenStackCluster{},
 		FuzzerFuncs: []fuzzer.FuzzerFuncs{fuzzerFuncs},
 	}))
 
 	t.Run("for OpenStackMachine", utilconversion.FuzzTestFunc(utilconversion.FuzzTestFuncInput{
 		Scheme:      scheme,
-		Hub:         &v1beta1.OpenStackMachine{},
+		Hub:         &infrav1.OpenStackMachine{},
 		Spoke:       &OpenStackMachine{},
 		FuzzerFuncs: []fuzzer.FuzzerFuncs{fuzzerFuncs},
 	}))
 
 	t.Run("for OpenStackMachineTemplate", utilconversion.FuzzTestFunc(utilconversion.FuzzTestFuncInput{
 		Scheme:      scheme,
-		Hub:         &v1beta1.OpenStackMachineTemplate{},
+		Hub:         &infrav1.OpenStackMachineTemplate{},
 		Spoke:       &OpenStackMachineTemplate{},
 		FuzzerFuncs: []fuzzer.FuzzerFuncs{fuzzerFuncs},
 	}))
diff --git a/api/v1alpha4/openstackcluster_conversion.go b/api/v1alpha4/openstackcluster_conversion.go
index 3689949acf..6d4ec3da2d 100644
--- a/api/v1alpha4/openstackcluster_conversion.go
+++ b/api/v1alpha4/openstackcluster_conversion.go
@@ -17,17 +17,17 @@ limitations under the License.
 package v1alpha4
 
 import (
-	apiconversion "k8s.io/apimachinery/pkg/conversion"
-	apiv1alpha4 "sigs.k8s.io/cluster-api/api/v1alpha4"
-	apiv1beta1 "sigs.k8s.io/cluster-api/api/v1beta1"
+	"k8s.io/apimachinery/pkg/conversion"
+	clusterv1alpha4 "sigs.k8s.io/cluster-api/api/v1alpha4"
+	clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1"
 )
 
 // Convert_v1alpha4_APIEndpoint_To_v1beta1_APIEndpoint is an autogenerated conversion function.
-func Convert_v1alpha4_APIEndpoint_To_v1beta1_APIEndpoint(in *apiv1alpha4.APIEndpoint, out *apiv1beta1.APIEndpoint, s apiconversion.Scope) error {
-	return apiv1alpha4.Convert_v1alpha4_APIEndpoint_To_v1beta1_APIEndpoint(in, out, s)
+func Convert_v1alpha4_APIEndpoint_To_v1beta1_APIEndpoint(in *clusterv1alpha4.APIEndpoint, out *clusterv1.APIEndpoint, s conversion.Scope) error {
+	return clusterv1alpha4.Convert_v1alpha4_APIEndpoint_To_v1beta1_APIEndpoint(in, out, s)
 }
 
 // Convert_v1beta1_APIEndpoint_To_v1alpha4_APIEndpoint is an autogenerated conversion function.
-func Convert_v1beta1_APIEndpoint_To_v1alpha4_APIEndpoint(in *apiv1beta1.APIEndpoint, out *apiv1alpha4.APIEndpoint, s apiconversion.Scope) error {
-	return apiv1alpha4.Convert_v1beta1_APIEndpoint_To_v1alpha4_APIEndpoint(in, out, s)
+func Convert_v1beta1_APIEndpoint_To_v1alpha4_APIEndpoint(in *clusterv1.APIEndpoint, out *clusterv1alpha4.APIEndpoint, s conversion.Scope) error {
+	return clusterv1alpha4.Convert_v1beta1_APIEndpoint_To_v1alpha4_APIEndpoint(in, out, s)
 }
diff --git a/test/e2e/shared/defaults.go b/test/e2e/shared/defaults.go
index cac05369ff..ae6e27ac6d 100644
--- a/test/e2e/shared/defaults.go
+++ b/test/e2e/shared/defaults.go
@@ -26,7 +26,7 @@ import (
 	clientgoscheme "k8s.io/client-go/kubernetes/scheme"
 	"sigs.k8s.io/cluster-api/test/framework"
 
-	"sigs.k8s.io/cluster-api-provider-openstack/api/v1beta1"
+	infrav1 "sigs.k8s.io/cluster-api-provider-openstack/api/v1beta1"
 )
 
 const (
@@ -52,7 +52,7 @@ const (
 func DefaultScheme() *runtime.Scheme {
 	sc := runtime.NewScheme()
 	framework.TryAddDefaultSchemes(sc)
-	_ = v1beta1.AddToScheme(sc)
+	_ = infrav1.AddToScheme(sc)
 	_ = clientgoscheme.AddToScheme(sc)
 	return sc
 }