diff --git a/PROJECT b/PROJECT
index 60949141ae..4f1ff6865c 100644
--- a/PROJECT
+++ b/PROJECT
@@ -1,3 +1,3 @@
 version: "1"
-domain: cluster.sigs.k8s.io
+domain: cluster.x-k8s.io
 repo: sigs.k8s.io/cluster-api-provider-aws
diff --git a/cmd/manager/main.go b/cmd/manager/main.go
index f02fabacaf..9ee7f6ab75 100644
--- a/cmd/manager/main.go
+++ b/cmd/manager/main.go
@@ -71,8 +71,8 @@ func main() {
 	// Get a config to talk to the api-server.
 	cfg := config.GetConfigOrDie()
 	mgr, err := manager.New(cfg, manager.Options{
-		SyncPeriod: &syncPeriod,
-		Namespace:  *watchNamespace,
+		SyncPeriod:         &syncPeriod,
+		Namespace:          *watchNamespace,
 		MetricsBindAddress: *metricsAddress,
 	})
 	if err != nil {
diff --git a/config/crds/infrastructure.cluster.sigs.k8s.io_awsclusterproviderspecs.yaml b/config/crds/infrastructure.cluster.x-k8s.io_awsclusterproviderspecs.yaml
similarity index 99%
rename from config/crds/infrastructure.cluster.sigs.k8s.io_awsclusterproviderspecs.yaml
rename to config/crds/infrastructure.cluster.x-k8s.io_awsclusterproviderspecs.yaml
index 9cab8da68f..23dee9b820 100644
--- a/config/crds/infrastructure.cluster.sigs.k8s.io_awsclusterproviderspecs.yaml
+++ b/config/crds/infrastructure.cluster.x-k8s.io_awsclusterproviderspecs.yaml
@@ -4,9 +4,9 @@ apiVersion: apiextensions.k8s.io/v1beta1
 kind: CustomResourceDefinition
 metadata:
   creationTimestamp: null
-  name: awsclusterproviderspecs.infrastructure.cluster.sigs.k8s.io
+  name: awsclusterproviderspecs.infrastructure.cluster.x-k8s.io
 spec:
-  group: infrastructure.cluster.sigs.k8s.io
+  group: infrastructure.cluster.x-k8s.io
   names:
     kind: AWSClusterProviderSpec
     plural: awsclusterproviderspecs
diff --git a/config/crds/infrastructure.cluster.sigs.k8s.io_awsclusterproviderstatuses.yaml b/config/crds/infrastructure.cluster.x-k8s.io_awsclusterproviderstatuses.yaml
similarity index 99%
rename from config/crds/infrastructure.cluster.sigs.k8s.io_awsclusterproviderstatuses.yaml
rename to config/crds/infrastructure.cluster.x-k8s.io_awsclusterproviderstatuses.yaml
index 1bfa18faa2..51a3b88093 100644
--- a/config/crds/infrastructure.cluster.sigs.k8s.io_awsclusterproviderstatuses.yaml
+++ b/config/crds/infrastructure.cluster.x-k8s.io_awsclusterproviderstatuses.yaml
@@ -4,9 +4,9 @@ apiVersion: apiextensions.k8s.io/v1beta1
 kind: CustomResourceDefinition
 metadata:
   creationTimestamp: null
-  name: awsclusterproviderstatuses.infrastructure.cluster.sigs.k8s.io
+  name: awsclusterproviderstatuses.infrastructure.cluster.x-k8s.io
 spec:
-  group: infrastructure.cluster.sigs.k8s.io
+  group: infrastructure.cluster.x-k8s.io
   names:
     kind: AWSClusterProviderStatus
     plural: awsclusterproviderstatuses
diff --git a/config/crds/infrastructure.cluster.sigs.k8s.io_awsmachines.yaml b/config/crds/infrastructure.cluster.x-k8s.io_awsmachines.yaml
similarity index 99%
rename from config/crds/infrastructure.cluster.sigs.k8s.io_awsmachines.yaml
rename to config/crds/infrastructure.cluster.x-k8s.io_awsmachines.yaml
index 2714b9920a..a757b9ea8f 100644
--- a/config/crds/infrastructure.cluster.sigs.k8s.io_awsmachines.yaml
+++ b/config/crds/infrastructure.cluster.x-k8s.io_awsmachines.yaml
@@ -4,9 +4,9 @@ apiVersion: apiextensions.k8s.io/v1beta1
 kind: CustomResourceDefinition
 metadata:
   creationTimestamp: null
-  name: awsmachines.infrastructure.cluster.sigs.k8s.io
+  name: awsmachines.infrastructure.cluster.x-k8s.io
 spec:
-  group: infrastructure.cluster.sigs.k8s.io
+  group: infrastructure.cluster.x-k8s.io
   names:
     kind: AWSMachine
     plural: awsmachines
diff --git a/config/crds/infrastructure.cluster.sigs.k8s.io_awsmachinetemplates.yaml b/config/crds/infrastructure.cluster.x-k8s.io_awsmachinetemplates.yaml
similarity index 99%
rename from config/crds/infrastructure.cluster.sigs.k8s.io_awsmachinetemplates.yaml
rename to config/crds/infrastructure.cluster.x-k8s.io_awsmachinetemplates.yaml
index 8da87596ac..7859794d80 100644
--- a/config/crds/infrastructure.cluster.sigs.k8s.io_awsmachinetemplates.yaml
+++ b/config/crds/infrastructure.cluster.x-k8s.io_awsmachinetemplates.yaml
@@ -4,9 +4,9 @@ apiVersion: apiextensions.k8s.io/v1beta1
 kind: CustomResourceDefinition
 metadata:
   creationTimestamp: null
-  name: awsmachinetemplates.infrastructure.cluster.sigs.k8s.io
+  name: awsmachinetemplates.infrastructure.cluster.x-k8s.io
 spec:
-  group: infrastructure.cluster.sigs.k8s.io
+  group: infrastructure.cluster.x-k8s.io
   names:
     kind: AWSMachineTemplate
     plural: awsmachinetemplates
diff --git a/config/crds/kustomization.yaml b/config/crds/kustomization.yaml
index b97f486c86..c6cf75061d 100644
--- a/config/crds/kustomization.yaml
+++ b/config/crds/kustomization.yaml
@@ -4,9 +4,10 @@
 # YAML string, with resources separated by document
 # markers ("---").
 resources:
-  - infrastructure.cluster.sigs.k8s.io_awsmachines.yaml
-  - infrastructure.cluster.sigs.k8s.io_awsclusterproviderspecs.yaml
-  - infrastructure.cluster.sigs.k8s.io_awsclusterproviderstatuses.yaml
+  - infrastructure.cluster.x-k8s.io_awsmachines.yaml
+  - infrastructure.cluster.x-k8s.io_awsmachinetemplates.yaml
+  - infrastructure.cluster.x-k8s.io_awsclusterproviderspecs.yaml
+  - infrastructure.cluster.x-k8s.io_awsclusterproviderstatuses.yaml
   - awsprovider_v1alpha1_awsclusterproviderspec.yaml
   - awsprovider_v1alpha1_awsclusterproviderstatus.yaml
   - awsprovider_v1alpha1_awsmachineproviderspec.yaml
diff --git a/config/rbac/role.yaml b/config/rbac/role.yaml
index 0748a377d1..41cb640e1b 100644
--- a/config/rbac/role.yaml
+++ b/config/rbac/role.yaml
@@ -7,10 +7,10 @@ metadata:
   name: manager-role
 rules:
 - apiGroups:
-  - awsprovider.k8s.io
+  - infrastructure.cluster.x-k8s.io
   resources:
-  - awsclusterproviderconfigs
-  - awsclusterproviderstatuses
+  - awsmachines
+  - awsmachines/status
   verbs:
   - create
   - delete
@@ -20,54 +20,54 @@ rules:
   - update
   - watch
 - apiGroups:
-  - cluster.sigs.k8s.io
+  - ""
   resources:
-  - clusters
-  - clusters/status
-  - machines
-  - machines/status
+  - secrets
   verbs:
   - create
-  - delete
   - get
   - list
-  - patch
-  - update
   - watch
 - apiGroups:
-  - infrastructure.cluster.sigs.k8s.io
+  - ""
   resources:
-  - awsmachines
-  - awsmachines/status
+  - configmaps
   verbs:
   - create
   - delete
   - get
-  - list
-  - patch
-  - update
-  - watch
 - apiGroups:
   - ""
   resources:
-  - secrets
+  - events
   verbs:
   - create
+  - delete
   - get
   - list
+  - patch
+  - update
   - watch
 - apiGroups:
-  - ""
+  - awsprovider.k8s.io
   resources:
-  - configmaps
+  - awsclusterproviderconfigs
+  - awsclusterproviderstatuses
   verbs:
   - create
   - delete
   - get
+  - list
+  - patch
+  - update
+  - watch
 - apiGroups:
-  - ""
+  - cluster.x-k8s.io
   resources:
-  - events
+  - clusters
+  - clusters/status
+  - machines
+  - machines/status
   verbs:
   - create
   - delete
diff --git a/config/samples/infrastructure_v1alpha2_awsmachine.yaml b/config/samples/infrastructure_v1alpha2_awsmachine.yaml
index 659f63976d..3a21ae0b1d 100644
--- a/config/samples/infrastructure_v1alpha2_awsmachine.yaml
+++ b/config/samples/infrastructure_v1alpha2_awsmachine.yaml
@@ -1,4 +1,4 @@
-apiVersion: infrastructure.cluster.sigs.k8s.io/v1alpha2
+apiVersion: infrastructure.cluster.x-k8s.io/v1alpha2
 kind: AWSMachine
 metadata:
   labels:
diff --git a/config/samples/infrastructure_v1alpha2_awsmachinetemplate.yaml b/config/samples/infrastructure_v1alpha2_awsmachinetemplate.yaml
index 654b17fdd5..667a1b9028 100644
--- a/config/samples/infrastructure_v1alpha2_awsmachinetemplate.yaml
+++ b/config/samples/infrastructure_v1alpha2_awsmachinetemplate.yaml
@@ -1,4 +1,4 @@
-apiVersion: infrastructure.cluster.sigs.k8s.io/v1alpha2
+apiVersion: infrastructure.cluster.x-k8s.io/v1alpha2
 kind: AWSMachineTemplate
 metadata:
   labels:
diff --git a/config/samples/infrastructure_v1alpha2_machine.yaml b/config/samples/infrastructure_v1alpha2_machine.yaml
index 96a1ebd4bb..be9aacd813 100644
--- a/config/samples/infrastructure_v1alpha2_machine.yaml
+++ b/config/samples/infrastructure_v1alpha2_machine.yaml
@@ -1,4 +1,4 @@
-apiVersion: infrastructure.cluster.sigs.k8s.io/v1alpha2
+apiVersion: infrastructure.cluster.x-k8s.io/v1alpha2
 kind: Machine
 metadata:
   labels:
diff --git a/pkg/apis/awsprovider/v1alpha1/types.go b/pkg/apis/awsprovider/v1alpha1/types.go
index a34cbb3a9c..073f1f7001 100644
--- a/pkg/apis/awsprovider/v1alpha1/types.go
+++ b/pkg/apis/awsprovider/v1alpha1/types.go
@@ -26,8 +26,8 @@ import (
 )
 
 const (
-	AnnotationClusterInfrastructureReady = "aws.cluster.sigs.k8s.io/infrastructure-ready"
-	AnnotationControlPlaneReady          = "aws.cluster.sigs.k8s.io/control-plane-ready"
+	AnnotationClusterInfrastructureReady = "aws.cluster.x-k8s.io/infrastructure-ready"
+	AnnotationControlPlaneReady          = "aws.cluster.x-k8s.io/control-plane-ready"
 	ValueReady                           = "true"
 )
 
diff --git a/pkg/apis/infrastructure/v1alpha2/doc.go b/pkg/apis/infrastructure/v1alpha2/doc.go
index bf49ce275d..d287efa53d 100644
--- a/pkg/apis/infrastructure/v1alpha2/doc.go
+++ b/pkg/apis/infrastructure/v1alpha2/doc.go
@@ -19,5 +19,5 @@ limitations under the License.
 // +k8s:deepcopy-gen=package,register
 // +k8s:conversion-gen=sigs.k8s.io/cluster-api-provider-aws/pkg/apis/infrastructure
 // +k8s:defaulter-gen=TypeMeta
-// +groupName=infrastructure.cluster.sigs.k8s.io
+// +groupName=infrastructure.cluster.x-k8s.io
 package v1alpha2
diff --git a/pkg/apis/infrastructure/v1alpha2/register.go b/pkg/apis/infrastructure/v1alpha2/register.go
index 66eaa8df48..4e5a5b3e3e 100644
--- a/pkg/apis/infrastructure/v1alpha2/register.go
+++ b/pkg/apis/infrastructure/v1alpha2/register.go
@@ -19,7 +19,7 @@ limitations under the License.
 // +k8s:deepcopy-gen=package,register
 // +k8s:conversion-gen=sigs.k8s.io/cluster-api-provider-aws/pkg/apis/infrastructure
 // +k8s:defaulter-gen=TypeMeta
-// +groupName=infrastructure.cluster.sigs.k8s.io
+// +groupName=infrastructure.cluster.x-k8s.io
 package v1alpha2
 
 import (
@@ -33,7 +33,7 @@ import (
 
 var (
 	// SchemeGroupVersion is group version used to register these objects
-	SchemeGroupVersion = schema.GroupVersion{Group: "infrastructure.cluster.sigs.k8s.io", Version: "v1alpha2"}
+	SchemeGroupVersion = schema.GroupVersion{Group: "infrastructure.cluster.x-k8s.io", Version: "v1alpha2"}
 
 	// SchemeBuilder is used to add go types to the GroupVersionKind scheme
 	SchemeBuilder = &scheme.Builder{GroupVersion: SchemeGroupVersion}
diff --git a/pkg/apis/infrastructure/v1alpha2/types.go b/pkg/apis/infrastructure/v1alpha2/types.go
index d7c17bf06a..190bafc662 100644
--- a/pkg/apis/infrastructure/v1alpha2/types.go
+++ b/pkg/apis/infrastructure/v1alpha2/types.go
@@ -23,8 +23,8 @@ import (
 )
 
 const (
-	AnnotationClusterInfrastructureReady = "aws.infrastructure.cluster.sigs.k8s.io/infrastructure-ready"
-	AnnotationControlPlaneReady          = "aws.infrastructure.cluster.sigs.k8s.io/control-plane-ready"
+	AnnotationClusterInfrastructureReady = "aws.infrastructure.cluster.x-k8s.io/infrastructure-ready"
+	AnnotationControlPlaneReady          = "aws.infrastructure.cluster.x-k8s.io/control-plane-ready"
 	ValueReady                           = "true"
 )
 
diff --git a/pkg/controller/controller.go b/pkg/controller/controller.go
index e0a5d1c5ac..7150fb0a70 100644
--- a/pkg/controller/controller.go
+++ b/pkg/controller/controller.go
@@ -24,8 +24,8 @@ import (
 // +kubebuilder:rbac:groups=core,resources=configmaps,verbs=create;get;delete
 // +kubebuilder:rbac:groups=core,resources=events,verbs=get;list;watch;create;update;patch;delete
 // +kubebuilder:rbac:groups=awsprovider.k8s.io,resources=awsclusterproviderconfigs;awsclusterproviderstatuses,verbs=get;list;watch;create;update;patch;delete
-// +kubebuilder:rbac:groups=cluster.sigs.k8s.io,resources=machines;machines/status;clusters;clusters/status,verbs=get;list;watch;create;update;patch;delete
-// +kubebuilder:rbac:groups=infrastructure.cluster.sigs.k8s.io,resources=awsmachines;awsmachines/status,verbs=get;list;watch;create;update;patch;delete
+// +kubebuilder:rbac:groups=cluster.x-k8s.io,resources=machines;machines/status;clusters;clusters/status,verbs=get;list;watch;create;update;patch;delete
+// +kubebuilder:rbac:groups=infrastructure.cluster.x-k8s.io,resources=awsmachines;awsmachines/status,verbs=get;list;watch;create;update;patch;delete
 
 // AddToManagerFuncs is a list of functions to add all Controllers to the Manager
 var AddToManagerFuncs []func(manager.Manager) error