diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index f4aea5ed7..6e4d0ad7b 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -26,7 +26,7 @@ repos:
     name: apis-sync
     entry: make apis.sync
     language: system
-    files: "^(hack/third-party/|common/pkg/external/|make/apis.mk$)"
+    files: "^(hack/third-party/|api/external/|make/apis.mk$)"
     pass_filenames: false
   - id: addons-sync
     name: addons-sync
@@ -106,7 +106,7 @@ repos:
     name: License headers - Go
     stages: [commit]
     files: "(.*\\.go|go.mod)$"
-    exclude: ^common/pkg/external/
+    exclude: ^api/external/
     args:
       - --license-filepath
       - hack/license-header.txt
diff --git a/common/pkg/external/sigs.k8s.io/cluster-api-addon-provider-helm/api/v1alpha1/condition_consts.go b/api/external/sigs.k8s.io/cluster-api-addon-provider-helm/api/v1alpha1/condition_consts.go
similarity index 100%
rename from common/pkg/external/sigs.k8s.io/cluster-api-addon-provider-helm/api/v1alpha1/condition_consts.go
rename to api/external/sigs.k8s.io/cluster-api-addon-provider-helm/api/v1alpha1/condition_consts.go
diff --git a/common/pkg/external/sigs.k8s.io/cluster-api-addon-provider-helm/api/v1alpha1/groupversion_info.go b/api/external/sigs.k8s.io/cluster-api-addon-provider-helm/api/v1alpha1/groupversion_info.go
similarity index 100%
rename from common/pkg/external/sigs.k8s.io/cluster-api-addon-provider-helm/api/v1alpha1/groupversion_info.go
rename to api/external/sigs.k8s.io/cluster-api-addon-provider-helm/api/v1alpha1/groupversion_info.go
diff --git a/common/pkg/external/sigs.k8s.io/cluster-api-addon-provider-helm/api/v1alpha1/helmchartproxy_types.go b/api/external/sigs.k8s.io/cluster-api-addon-provider-helm/api/v1alpha1/helmchartproxy_types.go
similarity index 100%
rename from common/pkg/external/sigs.k8s.io/cluster-api-addon-provider-helm/api/v1alpha1/helmchartproxy_types.go
rename to api/external/sigs.k8s.io/cluster-api-addon-provider-helm/api/v1alpha1/helmchartproxy_types.go
diff --git a/common/pkg/external/sigs.k8s.io/cluster-api-addon-provider-helm/api/v1alpha1/helmreleaseproxy_types.go b/api/external/sigs.k8s.io/cluster-api-addon-provider-helm/api/v1alpha1/helmreleaseproxy_types.go
similarity index 100%
rename from common/pkg/external/sigs.k8s.io/cluster-api-addon-provider-helm/api/v1alpha1/helmreleaseproxy_types.go
rename to api/external/sigs.k8s.io/cluster-api-addon-provider-helm/api/v1alpha1/helmreleaseproxy_types.go
diff --git a/common/pkg/external/sigs.k8s.io/cluster-api-addon-provider-helm/api/v1alpha1/zz_generated.deepcopy.go b/api/external/sigs.k8s.io/cluster-api-addon-provider-helm/api/v1alpha1/zz_generated.deepcopy.go
similarity index 99%
rename from common/pkg/external/sigs.k8s.io/cluster-api-addon-provider-helm/api/v1alpha1/zz_generated.deepcopy.go
rename to api/external/sigs.k8s.io/cluster-api-addon-provider-helm/api/v1alpha1/zz_generated.deepcopy.go
index 319e9bcb7..7c002b6c9 100644
--- a/common/pkg/external/sigs.k8s.io/cluster-api-addon-provider-helm/api/v1alpha1/zz_generated.deepcopy.go
+++ b/api/external/sigs.k8s.io/cluster-api-addon-provider-helm/api/v1alpha1/zz_generated.deepcopy.go
@@ -1,4 +1,5 @@
 //go:build !ignore_autogenerated
+// +build !ignore_autogenerated
 
 /*
 Copyright The Kubernetes Authors.
diff --git a/common/pkg/external/sigs.k8s.io/cluster-api-provider-aws/v2/api/v1beta2/awscluster_types.go b/api/external/sigs.k8s.io/cluster-api-provider-aws/v2/api/v1beta2/awscluster_types.go
similarity index 100%
rename from common/pkg/external/sigs.k8s.io/cluster-api-provider-aws/v2/api/v1beta2/awscluster_types.go
rename to api/external/sigs.k8s.io/cluster-api-provider-aws/v2/api/v1beta2/awscluster_types.go
diff --git a/common/pkg/external/sigs.k8s.io/cluster-api-provider-aws/v2/api/v1beta2/awsclustertemplate_types.go b/api/external/sigs.k8s.io/cluster-api-provider-aws/v2/api/v1beta2/awsclustertemplate_types.go
similarity index 100%
rename from common/pkg/external/sigs.k8s.io/cluster-api-provider-aws/v2/api/v1beta2/awsclustertemplate_types.go
rename to api/external/sigs.k8s.io/cluster-api-provider-aws/v2/api/v1beta2/awsclustertemplate_types.go
diff --git a/common/pkg/external/sigs.k8s.io/cluster-api-provider-aws/v2/api/v1beta2/awsidentity_types.go b/api/external/sigs.k8s.io/cluster-api-provider-aws/v2/api/v1beta2/awsidentity_types.go
similarity index 100%
rename from common/pkg/external/sigs.k8s.io/cluster-api-provider-aws/v2/api/v1beta2/awsidentity_types.go
rename to api/external/sigs.k8s.io/cluster-api-provider-aws/v2/api/v1beta2/awsidentity_types.go
diff --git a/common/pkg/external/sigs.k8s.io/cluster-api-provider-aws/v2/api/v1beta2/awsmachine_types.go b/api/external/sigs.k8s.io/cluster-api-provider-aws/v2/api/v1beta2/awsmachine_types.go
similarity index 100%
rename from common/pkg/external/sigs.k8s.io/cluster-api-provider-aws/v2/api/v1beta2/awsmachine_types.go
rename to api/external/sigs.k8s.io/cluster-api-provider-aws/v2/api/v1beta2/awsmachine_types.go
diff --git a/common/pkg/external/sigs.k8s.io/cluster-api-provider-aws/v2/api/v1beta2/awsmachinetemplate_types.go b/api/external/sigs.k8s.io/cluster-api-provider-aws/v2/api/v1beta2/awsmachinetemplate_types.go
similarity index 100%
rename from common/pkg/external/sigs.k8s.io/cluster-api-provider-aws/v2/api/v1beta2/awsmachinetemplate_types.go
rename to api/external/sigs.k8s.io/cluster-api-provider-aws/v2/api/v1beta2/awsmachinetemplate_types.go
diff --git a/common/pkg/external/sigs.k8s.io/cluster-api-provider-aws/v2/api/v1beta2/awsmanagedcluster_types.go b/api/external/sigs.k8s.io/cluster-api-provider-aws/v2/api/v1beta2/awsmanagedcluster_types.go
similarity index 100%
rename from common/pkg/external/sigs.k8s.io/cluster-api-provider-aws/v2/api/v1beta2/awsmanagedcluster_types.go
rename to api/external/sigs.k8s.io/cluster-api-provider-aws/v2/api/v1beta2/awsmanagedcluster_types.go
diff --git a/common/pkg/external/sigs.k8s.io/cluster-api-provider-aws/v2/api/v1beta2/bastion.go b/api/external/sigs.k8s.io/cluster-api-provider-aws/v2/api/v1beta2/bastion.go
similarity index 100%
rename from common/pkg/external/sigs.k8s.io/cluster-api-provider-aws/v2/api/v1beta2/bastion.go
rename to api/external/sigs.k8s.io/cluster-api-provider-aws/v2/api/v1beta2/bastion.go
diff --git a/common/pkg/external/sigs.k8s.io/cluster-api-provider-aws/v2/api/v1beta2/conditions_consts.go b/api/external/sigs.k8s.io/cluster-api-provider-aws/v2/api/v1beta2/conditions_consts.go
similarity index 100%
rename from common/pkg/external/sigs.k8s.io/cluster-api-provider-aws/v2/api/v1beta2/conditions_consts.go
rename to api/external/sigs.k8s.io/cluster-api-provider-aws/v2/api/v1beta2/conditions_consts.go
diff --git a/common/pkg/external/sigs.k8s.io/cluster-api-provider-aws/v2/api/v1beta2/conversion.go b/api/external/sigs.k8s.io/cluster-api-provider-aws/v2/api/v1beta2/conversion.go
similarity index 100%
rename from common/pkg/external/sigs.k8s.io/cluster-api-provider-aws/v2/api/v1beta2/conversion.go
rename to api/external/sigs.k8s.io/cluster-api-provider-aws/v2/api/v1beta2/conversion.go
diff --git a/common/pkg/external/sigs.k8s.io/cluster-api-provider-aws/v2/api/v1beta2/defaults.go b/api/external/sigs.k8s.io/cluster-api-provider-aws/v2/api/v1beta2/defaults.go
similarity index 100%
rename from common/pkg/external/sigs.k8s.io/cluster-api-provider-aws/v2/api/v1beta2/defaults.go
rename to api/external/sigs.k8s.io/cluster-api-provider-aws/v2/api/v1beta2/defaults.go
diff --git a/common/pkg/external/sigs.k8s.io/cluster-api-provider-aws/v2/api/v1beta2/doc.go b/api/external/sigs.k8s.io/cluster-api-provider-aws/v2/api/v1beta2/doc.go
similarity index 100%
rename from common/pkg/external/sigs.k8s.io/cluster-api-provider-aws/v2/api/v1beta2/doc.go
rename to api/external/sigs.k8s.io/cluster-api-provider-aws/v2/api/v1beta2/doc.go
diff --git a/common/pkg/external/sigs.k8s.io/cluster-api-provider-aws/v2/api/v1beta2/groupversion_info.go b/api/external/sigs.k8s.io/cluster-api-provider-aws/v2/api/v1beta2/groupversion_info.go
similarity index 100%
rename from common/pkg/external/sigs.k8s.io/cluster-api-provider-aws/v2/api/v1beta2/groupversion_info.go
rename to api/external/sigs.k8s.io/cluster-api-provider-aws/v2/api/v1beta2/groupversion_info.go
diff --git a/common/pkg/external/sigs.k8s.io/cluster-api-provider-aws/v2/api/v1beta2/network_types.go b/api/external/sigs.k8s.io/cluster-api-provider-aws/v2/api/v1beta2/network_types.go
similarity index 100%
rename from common/pkg/external/sigs.k8s.io/cluster-api-provider-aws/v2/api/v1beta2/network_types.go
rename to api/external/sigs.k8s.io/cluster-api-provider-aws/v2/api/v1beta2/network_types.go
diff --git a/common/pkg/external/sigs.k8s.io/cluster-api-provider-aws/v2/api/v1beta2/tags.go b/api/external/sigs.k8s.io/cluster-api-provider-aws/v2/api/v1beta2/tags.go
similarity index 100%
rename from common/pkg/external/sigs.k8s.io/cluster-api-provider-aws/v2/api/v1beta2/tags.go
rename to api/external/sigs.k8s.io/cluster-api-provider-aws/v2/api/v1beta2/tags.go
diff --git a/common/pkg/external/sigs.k8s.io/cluster-api-provider-aws/v2/api/v1beta2/types.go b/api/external/sigs.k8s.io/cluster-api-provider-aws/v2/api/v1beta2/types.go
similarity index 100%
rename from common/pkg/external/sigs.k8s.io/cluster-api-provider-aws/v2/api/v1beta2/types.go
rename to api/external/sigs.k8s.io/cluster-api-provider-aws/v2/api/v1beta2/types.go
diff --git a/common/pkg/external/sigs.k8s.io/cluster-api-provider-aws/v2/api/v1beta2/zz_generated.deepcopy.go b/api/external/sigs.k8s.io/cluster-api-provider-aws/v2/api/v1beta2/zz_generated.deepcopy.go
similarity index 99%
rename from common/pkg/external/sigs.k8s.io/cluster-api-provider-aws/v2/api/v1beta2/zz_generated.deepcopy.go
rename to api/external/sigs.k8s.io/cluster-api-provider-aws/v2/api/v1beta2/zz_generated.deepcopy.go
index af3acb6b6..40e92eb73 100644
--- a/common/pkg/external/sigs.k8s.io/cluster-api-provider-aws/v2/api/v1beta2/zz_generated.deepcopy.go
+++ b/api/external/sigs.k8s.io/cluster-api-provider-aws/v2/api/v1beta2/zz_generated.deepcopy.go
@@ -1,4 +1,5 @@
 //go:build !ignore_autogenerated
+// +build !ignore_autogenerated
 
 /*
 Copyright The Kubernetes Authors.
diff --git a/common/pkg/external/sigs.k8s.io/cluster-api-provider-aws/v2/api/v1beta2/zz_generated.defaults.go b/api/external/sigs.k8s.io/cluster-api-provider-aws/v2/api/v1beta2/zz_generated.defaults.go
similarity index 98%
rename from common/pkg/external/sigs.k8s.io/cluster-api-provider-aws/v2/api/v1beta2/zz_generated.defaults.go
rename to api/external/sigs.k8s.io/cluster-api-provider-aws/v2/api/v1beta2/zz_generated.defaults.go
index e6ad846f3..506e7e780 100644
--- a/common/pkg/external/sigs.k8s.io/cluster-api-provider-aws/v2/api/v1beta2/zz_generated.defaults.go
+++ b/api/external/sigs.k8s.io/cluster-api-provider-aws/v2/api/v1beta2/zz_generated.defaults.go
@@ -1,4 +1,5 @@
 //go:build !ignore_autogenerated
+// +build !ignore_autogenerated
 
 /*
 Copyright The Kubernetes Authors.
diff --git a/common/pkg/external/sigs.k8s.io/cluster-api/test/infrastructure/docker/api/v1beta1/condition_consts.go b/api/external/sigs.k8s.io/cluster-api/test/infrastructure/docker/api/v1beta1/condition_consts.go
similarity index 100%
rename from common/pkg/external/sigs.k8s.io/cluster-api/test/infrastructure/docker/api/v1beta1/condition_consts.go
rename to api/external/sigs.k8s.io/cluster-api/test/infrastructure/docker/api/v1beta1/condition_consts.go
diff --git a/common/pkg/external/sigs.k8s.io/cluster-api/test/infrastructure/docker/api/v1beta1/conversion.go b/api/external/sigs.k8s.io/cluster-api/test/infrastructure/docker/api/v1beta1/conversion.go
similarity index 100%
rename from common/pkg/external/sigs.k8s.io/cluster-api/test/infrastructure/docker/api/v1beta1/conversion.go
rename to api/external/sigs.k8s.io/cluster-api/test/infrastructure/docker/api/v1beta1/conversion.go
diff --git a/common/pkg/external/sigs.k8s.io/cluster-api/test/infrastructure/docker/api/v1beta1/doc.go b/api/external/sigs.k8s.io/cluster-api/test/infrastructure/docker/api/v1beta1/doc.go
similarity index 100%
rename from common/pkg/external/sigs.k8s.io/cluster-api/test/infrastructure/docker/api/v1beta1/doc.go
rename to api/external/sigs.k8s.io/cluster-api/test/infrastructure/docker/api/v1beta1/doc.go
diff --git a/common/pkg/external/sigs.k8s.io/cluster-api/test/infrastructure/docker/api/v1beta1/dockercluster_types.go b/api/external/sigs.k8s.io/cluster-api/test/infrastructure/docker/api/v1beta1/dockercluster_types.go
similarity index 100%
rename from common/pkg/external/sigs.k8s.io/cluster-api/test/infrastructure/docker/api/v1beta1/dockercluster_types.go
rename to api/external/sigs.k8s.io/cluster-api/test/infrastructure/docker/api/v1beta1/dockercluster_types.go
diff --git a/common/pkg/external/sigs.k8s.io/cluster-api/test/infrastructure/docker/api/v1beta1/dockerclustertemplate_types.go b/api/external/sigs.k8s.io/cluster-api/test/infrastructure/docker/api/v1beta1/dockerclustertemplate_types.go
similarity index 100%
rename from common/pkg/external/sigs.k8s.io/cluster-api/test/infrastructure/docker/api/v1beta1/dockerclustertemplate_types.go
rename to api/external/sigs.k8s.io/cluster-api/test/infrastructure/docker/api/v1beta1/dockerclustertemplate_types.go
diff --git a/common/pkg/external/sigs.k8s.io/cluster-api/test/infrastructure/docker/api/v1beta1/dockermachine_types.go b/api/external/sigs.k8s.io/cluster-api/test/infrastructure/docker/api/v1beta1/dockermachine_types.go
similarity index 100%
rename from common/pkg/external/sigs.k8s.io/cluster-api/test/infrastructure/docker/api/v1beta1/dockermachine_types.go
rename to api/external/sigs.k8s.io/cluster-api/test/infrastructure/docker/api/v1beta1/dockermachine_types.go
diff --git a/common/pkg/external/sigs.k8s.io/cluster-api/test/infrastructure/docker/api/v1beta1/dockermachinetemplate_types.go b/api/external/sigs.k8s.io/cluster-api/test/infrastructure/docker/api/v1beta1/dockermachinetemplate_types.go
similarity index 100%
rename from common/pkg/external/sigs.k8s.io/cluster-api/test/infrastructure/docker/api/v1beta1/dockermachinetemplate_types.go
rename to api/external/sigs.k8s.io/cluster-api/test/infrastructure/docker/api/v1beta1/dockermachinetemplate_types.go
diff --git a/common/pkg/external/sigs.k8s.io/cluster-api/test/infrastructure/docker/api/v1beta1/groupversion_info.go b/api/external/sigs.k8s.io/cluster-api/test/infrastructure/docker/api/v1beta1/groupversion_info.go
similarity index 100%
rename from common/pkg/external/sigs.k8s.io/cluster-api/test/infrastructure/docker/api/v1beta1/groupversion_info.go
rename to api/external/sigs.k8s.io/cluster-api/test/infrastructure/docker/api/v1beta1/groupversion_info.go
diff --git a/common/pkg/external/sigs.k8s.io/cluster-api/test/infrastructure/docker/api/v1beta1/zz_generated.deepcopy.go b/api/external/sigs.k8s.io/cluster-api/test/infrastructure/docker/api/v1beta1/zz_generated.deepcopy.go
similarity index 100%
rename from common/pkg/external/sigs.k8s.io/cluster-api/test/infrastructure/docker/api/v1beta1/zz_generated.deepcopy.go
rename to api/external/sigs.k8s.io/cluster-api/test/infrastructure/docker/api/v1beta1/zz_generated.deepcopy.go
diff --git a/api/go.mod b/api/go.mod
index e5ca2fa19..2bd40e481 100644
--- a/api/go.mod
+++ b/api/go.mod
@@ -5,10 +5,7 @@ module github.com/d2iq-labs/capi-runtime-extensions/api
 
 go 1.21
 
-replace github.com/d2iq-labs/capi-runtime-extensions/common => ../common
-
 require (
-	github.com/d2iq-labs/capi-runtime-extensions/common v0.0.0-00010101000000-000000000000
 	github.com/onsi/gomega v1.31.1
 	k8s.io/api v0.29.1
 	k8s.io/apiextensions-apiserver v0.29.1
diff --git a/api/v1alpha1/aws_clusterconfig_types.go b/api/v1alpha1/aws_clusterconfig_types.go
index 0012b90b3..28a224acd 100644
--- a/api/v1alpha1/aws_clusterconfig_types.go
+++ b/api/v1alpha1/aws_clusterconfig_types.go
@@ -6,8 +6,8 @@ package v1alpha1
 import (
 	clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1"
 
+	capav1 "github.com/d2iq-labs/capi-runtime-extensions/api/external/sigs.k8s.io/cluster-api-provider-aws/v2/api/v1beta2"
 	"github.com/d2iq-labs/capi-runtime-extensions/api/variables"
-	capav1 "github.com/d2iq-labs/capi-runtime-extensions/common/pkg/external/sigs.k8s.io/cluster-api-provider-aws/v2/api/v1beta2"
 )
 
 type AWSSpec struct {
diff --git a/api/v1alpha1/zz_generated.deepcopy.go b/api/v1alpha1/zz_generated.deepcopy.go
index 76d67d4bc..3944701a2 100644
--- a/api/v1alpha1/zz_generated.deepcopy.go
+++ b/api/v1alpha1/zz_generated.deepcopy.go
@@ -8,7 +8,7 @@
 package v1alpha1
 
 import (
-	"github.com/d2iq-labs/capi-runtime-extensions/common/pkg/external/sigs.k8s.io/cluster-api-provider-aws/v2/api/v1beta2"
+	"github.com/d2iq-labs/capi-runtime-extensions/api/external/sigs.k8s.io/cluster-api-provider-aws/v2/api/v1beta2"
 	"k8s.io/api/core/v1"
 	runtime "k8s.io/apimachinery/pkg/runtime"
 )
diff --git a/cmd/main.go b/cmd/main.go
index 354804930..a349e8602 100644
--- a/cmd/main.go
+++ b/cmd/main.go
@@ -24,8 +24,8 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/manager"
 	metricsserver "sigs.k8s.io/controller-runtime/pkg/metrics/server"
 
+	caaphv1 "github.com/d2iq-labs/capi-runtime-extensions/api/external/sigs.k8s.io/cluster-api-addon-provider-helm/api/v1alpha1"
 	"github.com/d2iq-labs/capi-runtime-extensions/common/pkg/capi/clustertopology/handlers"
-	caaphv1 "github.com/d2iq-labs/capi-runtime-extensions/common/pkg/external/sigs.k8s.io/cluster-api-addon-provider-helm/api/v1alpha1"
 	"github.com/d2iq-labs/capi-runtime-extensions/common/pkg/server"
 	awsclusterconfig "github.com/d2iq-labs/capi-runtime-extensions/pkg/handlers/aws/clusterconfig"
 	awsmutation "github.com/d2iq-labs/capi-runtime-extensions/pkg/handlers/aws/mutation"
diff --git a/common/go.mod b/common/go.mod
index 75b8d5007..71a4c4e9e 100644
--- a/common/go.mod
+++ b/common/go.mod
@@ -5,7 +5,10 @@ module github.com/d2iq-labs/capi-runtime-extensions/common
 
 go 1.21
 
+replace github.com/d2iq-labs/capi-runtime-extensions/api => ../api
+
 require (
+	github.com/d2iq-labs/capi-runtime-extensions/api v0.0.0-00010101000000-000000000000
 	github.com/evanphx/json-patch/v5 v5.9.0
 	github.com/go-logr/logr v1.4.1
 	github.com/onsi/gomega v1.31.1
diff --git a/common/pkg/capi/apis/schemes.go b/common/pkg/capi/apis/schemes.go
index 0d95fcae2..1c84e7472 100644
--- a/common/pkg/capi/apis/schemes.go
+++ b/common/pkg/capi/apis/schemes.go
@@ -10,8 +10,8 @@ import (
 	bootstrapv1 "sigs.k8s.io/cluster-api/bootstrap/kubeadm/api/v1beta1"
 	controlplanev1 "sigs.k8s.io/cluster-api/controlplane/kubeadm/api/v1beta1"
 
-	capav1 "github.com/d2iq-labs/capi-runtime-extensions/common/pkg/external/sigs.k8s.io/cluster-api-provider-aws/v2/api/v1beta2"
-	capdv1 "github.com/d2iq-labs/capi-runtime-extensions/common/pkg/external/sigs.k8s.io/cluster-api/test/infrastructure/docker/api/v1beta1"
+	capav1 "github.com/d2iq-labs/capi-runtime-extensions/api/external/sigs.k8s.io/cluster-api-provider-aws/v2/api/v1beta2"
+	capdv1 "github.com/d2iq-labs/capi-runtime-extensions/api/external/sigs.k8s.io/cluster-api/test/infrastructure/docker/api/v1beta1"
 )
 
 func NewScheme(registerFuncs ...func(*runtime.Scheme) error) *runtime.Scheme {
diff --git a/common/pkg/testutils/capitest/request/items.go b/common/pkg/testutils/capitest/request/items.go
index 5444bd4b8..e77213c8a 100644
--- a/common/pkg/testutils/capitest/request/items.go
+++ b/common/pkg/testutils/capitest/request/items.go
@@ -14,8 +14,8 @@ import (
 	controlplanev1 "sigs.k8s.io/cluster-api/controlplane/kubeadm/api/v1beta1"
 	runtimehooksv1 "sigs.k8s.io/cluster-api/exp/runtime/hooks/api/v1alpha1"
 
-	capav1 "github.com/d2iq-labs/capi-runtime-extensions/common/pkg/external/sigs.k8s.io/cluster-api-provider-aws/v2/api/v1beta2"
-	capdv1 "github.com/d2iq-labs/capi-runtime-extensions/common/pkg/external/sigs.k8s.io/cluster-api/test/infrastructure/docker/api/v1beta1"
+	capav1 "github.com/d2iq-labs/capi-runtime-extensions/api/external/sigs.k8s.io/cluster-api-provider-aws/v2/api/v1beta2"
+	capdv1 "github.com/d2iq-labs/capi-runtime-extensions/api/external/sigs.k8s.io/cluster-api/test/infrastructure/docker/api/v1beta1"
 	"github.com/d2iq-labs/capi-runtime-extensions/common/pkg/testutils/capitest/serializer"
 )
 
diff --git a/make/apis.mk b/make/apis.mk
index 63328fa57..d00624380 100644
--- a/make/apis.mk
+++ b/make/apis.mk
@@ -22,7 +22,7 @@ apis.sync: $(addprefix api.sync.,capa capd caaph) go-fix.common
 .PHONY: api.sync.%
 api.sync.%: ## Syncs an infrastructure provider's API
 api.sync.%: PROVIDER_MODULE_DIR=$(REPO_ROOT)/hack/third-party/$*
-api.sync.%: PROVIDER_API_DIR=common/pkg/external/$(PROVIDER_MODULE_$*)/$(PROVIDER_API_PATH_$*)/$(PROVIDER_API_VERSION_$*)/
+api.sync.%: PROVIDER_API_DIR=api/external/$(PROVIDER_MODULE_$*)/$(PROVIDER_API_PATH_$*)/$(PROVIDER_API_VERSION_$*)/
 api.sync.%: ; $(info $(M) syncing external API: $(PROVIDER_MODULE_$*)/$(PROVIDER_API_PATH_$*)/$(PROVIDER_API_VERSION_$*))
 	cd $(PROVIDER_MODULE_DIR) && go mod tidy
 	mkdir -p $(PROVIDER_API_DIR)
diff --git a/pkg/handlers/aws/mutation/ami/inject.go b/pkg/handlers/aws/mutation/ami/inject.go
index c1b52ed00..41b23fd8e 100644
--- a/pkg/handlers/aws/mutation/ami/inject.go
+++ b/pkg/handlers/aws/mutation/ami/inject.go
@@ -13,10 +13,10 @@ import (
 	ctrl "sigs.k8s.io/controller-runtime"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 
+	capav1 "github.com/d2iq-labs/capi-runtime-extensions/api/external/sigs.k8s.io/cluster-api-provider-aws/v2/api/v1beta2"
 	"github.com/d2iq-labs/capi-runtime-extensions/api/v1alpha1"
 	"github.com/d2iq-labs/capi-runtime-extensions/common/pkg/capi/clustertopology/patches"
 	"github.com/d2iq-labs/capi-runtime-extensions/common/pkg/capi/clustertopology/variables"
-	capav1 "github.com/d2iq-labs/capi-runtime-extensions/common/pkg/external/sigs.k8s.io/cluster-api-provider-aws/v2/api/v1beta2"
 )
 
 const (
diff --git a/pkg/handlers/aws/mutation/ami/inject_control_plane.go b/pkg/handlers/aws/mutation/ami/inject_control_plane.go
index 89361400a..1095f6716 100644
--- a/pkg/handlers/aws/mutation/ami/inject_control_plane.go
+++ b/pkg/handlers/aws/mutation/ami/inject_control_plane.go
@@ -4,9 +4,9 @@
 package ami
 
 import (
+	capav1 "github.com/d2iq-labs/capi-runtime-extensions/api/external/sigs.k8s.io/cluster-api-provider-aws/v2/api/v1beta2"
 	"github.com/d2iq-labs/capi-runtime-extensions/api/v1alpha1"
 	"github.com/d2iq-labs/capi-runtime-extensions/common/pkg/capi/clustertopology/patches/selectors"
-	capav1 "github.com/d2iq-labs/capi-runtime-extensions/common/pkg/external/sigs.k8s.io/cluster-api-provider-aws/v2/api/v1beta2"
 	"github.com/d2iq-labs/capi-runtime-extensions/pkg/handlers/generic/clusterconfig"
 )
 
diff --git a/pkg/handlers/aws/mutation/ami/inject_worker.go b/pkg/handlers/aws/mutation/ami/inject_worker.go
index c2fc9b6d2..c8c0fa265 100644
--- a/pkg/handlers/aws/mutation/ami/inject_worker.go
+++ b/pkg/handlers/aws/mutation/ami/inject_worker.go
@@ -3,9 +3,9 @@
 package ami
 
 import (
+	capav1 "github.com/d2iq-labs/capi-runtime-extensions/api/external/sigs.k8s.io/cluster-api-provider-aws/v2/api/v1beta2"
 	"github.com/d2iq-labs/capi-runtime-extensions/api/v1alpha1"
 	"github.com/d2iq-labs/capi-runtime-extensions/common/pkg/capi/clustertopology/patches/selectors"
-	capav1 "github.com/d2iq-labs/capi-runtime-extensions/common/pkg/external/sigs.k8s.io/cluster-api-provider-aws/v2/api/v1beta2"
 	"github.com/d2iq-labs/capi-runtime-extensions/pkg/handlers/generic/workerconfig"
 )
 
diff --git a/pkg/handlers/aws/mutation/cni/calico/inject.go b/pkg/handlers/aws/mutation/cni/calico/inject.go
index 45c68ce79..261c9b47a 100644
--- a/pkg/handlers/aws/mutation/cni/calico/inject.go
+++ b/pkg/handlers/aws/mutation/cni/calico/inject.go
@@ -14,11 +14,11 @@ import (
 	ctrl "sigs.k8s.io/controller-runtime"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 
+	capav1 "github.com/d2iq-labs/capi-runtime-extensions/api/external/sigs.k8s.io/cluster-api-provider-aws/v2/api/v1beta2"
 	"github.com/d2iq-labs/capi-runtime-extensions/api/v1alpha1"
 	"github.com/d2iq-labs/capi-runtime-extensions/common/pkg/capi/clustertopology/patches"
 	"github.com/d2iq-labs/capi-runtime-extensions/common/pkg/capi/clustertopology/patches/selectors"
 	"github.com/d2iq-labs/capi-runtime-extensions/common/pkg/capi/clustertopology/variables"
-	capav1 "github.com/d2iq-labs/capi-runtime-extensions/common/pkg/external/sigs.k8s.io/cluster-api-provider-aws/v2/api/v1beta2"
 	"github.com/d2iq-labs/capi-runtime-extensions/pkg/handlers/generic/clusterconfig"
 )
 
diff --git a/pkg/handlers/aws/mutation/cni/calico/tests/generate_patches.go b/pkg/handlers/aws/mutation/cni/calico/tests/generate_patches.go
index 1bdcd50cb..96afc9985 100644
--- a/pkg/handlers/aws/mutation/cni/calico/tests/generate_patches.go
+++ b/pkg/handlers/aws/mutation/cni/calico/tests/generate_patches.go
@@ -10,9 +10,9 @@ import (
 	"github.com/onsi/gomega/format"
 	runtimehooksv1 "sigs.k8s.io/cluster-api/exp/runtime/hooks/api/v1alpha1"
 
+	capav1 "github.com/d2iq-labs/capi-runtime-extensions/api/external/sigs.k8s.io/cluster-api-provider-aws/v2/api/v1beta2"
 	"github.com/d2iq-labs/capi-runtime-extensions/api/v1alpha1"
 	"github.com/d2iq-labs/capi-runtime-extensions/common/pkg/capi/clustertopology/handlers/mutation"
-	capav1 "github.com/d2iq-labs/capi-runtime-extensions/common/pkg/external/sigs.k8s.io/cluster-api-provider-aws/v2/api/v1beta2"
 	"github.com/d2iq-labs/capi-runtime-extensions/common/pkg/testutils/capitest"
 	"github.com/d2iq-labs/capi-runtime-extensions/common/pkg/testutils/capitest/request"
 )
diff --git a/pkg/handlers/aws/mutation/controlplaneloadbalancer/inject.go b/pkg/handlers/aws/mutation/controlplaneloadbalancer/inject.go
index 6df547fa3..fcec635ee 100644
--- a/pkg/handlers/aws/mutation/controlplaneloadbalancer/inject.go
+++ b/pkg/handlers/aws/mutation/controlplaneloadbalancer/inject.go
@@ -12,11 +12,11 @@ import (
 	ctrl "sigs.k8s.io/controller-runtime"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 
+	capav1 "github.com/d2iq-labs/capi-runtime-extensions/api/external/sigs.k8s.io/cluster-api-provider-aws/v2/api/v1beta2"
 	"github.com/d2iq-labs/capi-runtime-extensions/api/v1alpha1"
 	"github.com/d2iq-labs/capi-runtime-extensions/common/pkg/capi/clustertopology/patches"
 	"github.com/d2iq-labs/capi-runtime-extensions/common/pkg/capi/clustertopology/patches/selectors"
 	"github.com/d2iq-labs/capi-runtime-extensions/common/pkg/capi/clustertopology/variables"
-	capav1 "github.com/d2iq-labs/capi-runtime-extensions/common/pkg/external/sigs.k8s.io/cluster-api-provider-aws/v2/api/v1beta2"
 	"github.com/d2iq-labs/capi-runtime-extensions/pkg/handlers/generic/clusterconfig"
 )
 
diff --git a/pkg/handlers/aws/mutation/controlplaneloadbalancer/tests/generate_patches.go b/pkg/handlers/aws/mutation/controlplaneloadbalancer/tests/generate_patches.go
index 3b9c73ba4..a12913c14 100644
--- a/pkg/handlers/aws/mutation/controlplaneloadbalancer/tests/generate_patches.go
+++ b/pkg/handlers/aws/mutation/controlplaneloadbalancer/tests/generate_patches.go
@@ -9,9 +9,9 @@ import (
 	"github.com/onsi/gomega"
 	runtimehooksv1 "sigs.k8s.io/cluster-api/exp/runtime/hooks/api/v1alpha1"
 
+	capav1 "github.com/d2iq-labs/capi-runtime-extensions/api/external/sigs.k8s.io/cluster-api-provider-aws/v2/api/v1beta2"
 	"github.com/d2iq-labs/capi-runtime-extensions/api/v1alpha1"
 	"github.com/d2iq-labs/capi-runtime-extensions/common/pkg/capi/clustertopology/handlers/mutation"
-	capav1 "github.com/d2iq-labs/capi-runtime-extensions/common/pkg/external/sigs.k8s.io/cluster-api-provider-aws/v2/api/v1beta2"
 	"github.com/d2iq-labs/capi-runtime-extensions/common/pkg/testutils/capitest"
 	"github.com/d2iq-labs/capi-runtime-extensions/common/pkg/testutils/capitest/request"
 )
diff --git a/pkg/handlers/aws/mutation/controlplaneloadbalancer/variables_test.go b/pkg/handlers/aws/mutation/controlplaneloadbalancer/variables_test.go
index 5c0391d6e..1becee86b 100644
--- a/pkg/handlers/aws/mutation/controlplaneloadbalancer/variables_test.go
+++ b/pkg/handlers/aws/mutation/controlplaneloadbalancer/variables_test.go
@@ -8,8 +8,8 @@ import (
 
 	"k8s.io/utils/ptr"
 
+	capav1 "github.com/d2iq-labs/capi-runtime-extensions/api/external/sigs.k8s.io/cluster-api-provider-aws/v2/api/v1beta2"
 	"github.com/d2iq-labs/capi-runtime-extensions/api/v1alpha1"
-	capav1 "github.com/d2iq-labs/capi-runtime-extensions/common/pkg/external/sigs.k8s.io/cluster-api-provider-aws/v2/api/v1beta2"
 	"github.com/d2iq-labs/capi-runtime-extensions/common/pkg/testutils/capitest"
 	awsclusterconfig "github.com/d2iq-labs/capi-runtime-extensions/pkg/handlers/aws/clusterconfig"
 	"github.com/d2iq-labs/capi-runtime-extensions/pkg/handlers/generic/clusterconfig"
diff --git a/pkg/handlers/aws/mutation/iaminstanceprofile/inject_control_plane.go b/pkg/handlers/aws/mutation/iaminstanceprofile/inject_control_plane.go
index 625e7744b..fad506fb1 100644
--- a/pkg/handlers/aws/mutation/iaminstanceprofile/inject_control_plane.go
+++ b/pkg/handlers/aws/mutation/iaminstanceprofile/inject_control_plane.go
@@ -12,11 +12,11 @@ import (
 	ctrl "sigs.k8s.io/controller-runtime"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 
+	capav1 "github.com/d2iq-labs/capi-runtime-extensions/api/external/sigs.k8s.io/cluster-api-provider-aws/v2/api/v1beta2"
 	"github.com/d2iq-labs/capi-runtime-extensions/api/v1alpha1"
 	"github.com/d2iq-labs/capi-runtime-extensions/common/pkg/capi/clustertopology/patches"
 	"github.com/d2iq-labs/capi-runtime-extensions/common/pkg/capi/clustertopology/patches/selectors"
 	"github.com/d2iq-labs/capi-runtime-extensions/common/pkg/capi/clustertopology/variables"
-	capav1 "github.com/d2iq-labs/capi-runtime-extensions/common/pkg/external/sigs.k8s.io/cluster-api-provider-aws/v2/api/v1beta2"
 	"github.com/d2iq-labs/capi-runtime-extensions/pkg/handlers/generic/clusterconfig"
 )
 
diff --git a/pkg/handlers/aws/mutation/iaminstanceprofile/inject_worker.go b/pkg/handlers/aws/mutation/iaminstanceprofile/inject_worker.go
index 675974a70..0c7973d58 100644
--- a/pkg/handlers/aws/mutation/iaminstanceprofile/inject_worker.go
+++ b/pkg/handlers/aws/mutation/iaminstanceprofile/inject_worker.go
@@ -12,11 +12,11 @@ import (
 	ctrl "sigs.k8s.io/controller-runtime"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 
+	capav1 "github.com/d2iq-labs/capi-runtime-extensions/api/external/sigs.k8s.io/cluster-api-provider-aws/v2/api/v1beta2"
 	"github.com/d2iq-labs/capi-runtime-extensions/api/v1alpha1"
 	"github.com/d2iq-labs/capi-runtime-extensions/common/pkg/capi/clustertopology/patches"
 	"github.com/d2iq-labs/capi-runtime-extensions/common/pkg/capi/clustertopology/patches/selectors"
 	"github.com/d2iq-labs/capi-runtime-extensions/common/pkg/capi/clustertopology/variables"
-	capav1 "github.com/d2iq-labs/capi-runtime-extensions/common/pkg/external/sigs.k8s.io/cluster-api-provider-aws/v2/api/v1beta2"
 	"github.com/d2iq-labs/capi-runtime-extensions/pkg/handlers/generic/workerconfig"
 )
 
diff --git a/pkg/handlers/aws/mutation/instancetype/inject_control_plane.go b/pkg/handlers/aws/mutation/instancetype/inject_control_plane.go
index ee5423d8c..4f398c017 100644
--- a/pkg/handlers/aws/mutation/instancetype/inject_control_plane.go
+++ b/pkg/handlers/aws/mutation/instancetype/inject_control_plane.go
@@ -12,11 +12,11 @@ import (
 	ctrl "sigs.k8s.io/controller-runtime"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 
+	capav1 "github.com/d2iq-labs/capi-runtime-extensions/api/external/sigs.k8s.io/cluster-api-provider-aws/v2/api/v1beta2"
 	"github.com/d2iq-labs/capi-runtime-extensions/api/v1alpha1"
 	"github.com/d2iq-labs/capi-runtime-extensions/common/pkg/capi/clustertopology/patches"
 	"github.com/d2iq-labs/capi-runtime-extensions/common/pkg/capi/clustertopology/patches/selectors"
 	"github.com/d2iq-labs/capi-runtime-extensions/common/pkg/capi/clustertopology/variables"
-	capav1 "github.com/d2iq-labs/capi-runtime-extensions/common/pkg/external/sigs.k8s.io/cluster-api-provider-aws/v2/api/v1beta2"
 	"github.com/d2iq-labs/capi-runtime-extensions/pkg/handlers/generic/clusterconfig"
 )
 
diff --git a/pkg/handlers/aws/mutation/instancetype/inject_worker.go b/pkg/handlers/aws/mutation/instancetype/inject_worker.go
index 09dbe5ccd..96833c82a 100644
--- a/pkg/handlers/aws/mutation/instancetype/inject_worker.go
+++ b/pkg/handlers/aws/mutation/instancetype/inject_worker.go
@@ -12,11 +12,11 @@ import (
 	ctrl "sigs.k8s.io/controller-runtime"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 
+	capav1 "github.com/d2iq-labs/capi-runtime-extensions/api/external/sigs.k8s.io/cluster-api-provider-aws/v2/api/v1beta2"
 	"github.com/d2iq-labs/capi-runtime-extensions/api/v1alpha1"
 	"github.com/d2iq-labs/capi-runtime-extensions/common/pkg/capi/clustertopology/patches"
 	"github.com/d2iq-labs/capi-runtime-extensions/common/pkg/capi/clustertopology/patches/selectors"
 	"github.com/d2iq-labs/capi-runtime-extensions/common/pkg/capi/clustertopology/variables"
-	capav1 "github.com/d2iq-labs/capi-runtime-extensions/common/pkg/external/sigs.k8s.io/cluster-api-provider-aws/v2/api/v1beta2"
 	"github.com/d2iq-labs/capi-runtime-extensions/pkg/handlers/generic/workerconfig"
 )
 
diff --git a/pkg/handlers/aws/mutation/network/inject.go b/pkg/handlers/aws/mutation/network/inject.go
index 73ec5016b..55067b8d9 100644
--- a/pkg/handlers/aws/mutation/network/inject.go
+++ b/pkg/handlers/aws/mutation/network/inject.go
@@ -12,11 +12,11 @@ import (
 	ctrl "sigs.k8s.io/controller-runtime"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 
+	capav1 "github.com/d2iq-labs/capi-runtime-extensions/api/external/sigs.k8s.io/cluster-api-provider-aws/v2/api/v1beta2"
 	"github.com/d2iq-labs/capi-runtime-extensions/api/v1alpha1"
 	"github.com/d2iq-labs/capi-runtime-extensions/common/pkg/capi/clustertopology/patches"
 	"github.com/d2iq-labs/capi-runtime-extensions/common/pkg/capi/clustertopology/patches/selectors"
 	"github.com/d2iq-labs/capi-runtime-extensions/common/pkg/capi/clustertopology/variables"
-	capav1 "github.com/d2iq-labs/capi-runtime-extensions/common/pkg/external/sigs.k8s.io/cluster-api-provider-aws/v2/api/v1beta2"
 	"github.com/d2iq-labs/capi-runtime-extensions/pkg/handlers/generic/clusterconfig"
 )
 
diff --git a/pkg/handlers/aws/mutation/region/inject.go b/pkg/handlers/aws/mutation/region/inject.go
index ced6d07e8..0b6c9541b 100644
--- a/pkg/handlers/aws/mutation/region/inject.go
+++ b/pkg/handlers/aws/mutation/region/inject.go
@@ -12,11 +12,11 @@ import (
 	ctrl "sigs.k8s.io/controller-runtime"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 
+	capav1 "github.com/d2iq-labs/capi-runtime-extensions/api/external/sigs.k8s.io/cluster-api-provider-aws/v2/api/v1beta2"
 	"github.com/d2iq-labs/capi-runtime-extensions/api/v1alpha1"
 	"github.com/d2iq-labs/capi-runtime-extensions/common/pkg/capi/clustertopology/patches"
 	"github.com/d2iq-labs/capi-runtime-extensions/common/pkg/capi/clustertopology/patches/selectors"
 	"github.com/d2iq-labs/capi-runtime-extensions/common/pkg/capi/clustertopology/variables"
-	capav1 "github.com/d2iq-labs/capi-runtime-extensions/common/pkg/external/sigs.k8s.io/cluster-api-provider-aws/v2/api/v1beta2"
 	"github.com/d2iq-labs/capi-runtime-extensions/pkg/handlers/generic/clusterconfig"
 )
 
diff --git a/pkg/handlers/aws/mutation/securitygroups/inject.go b/pkg/handlers/aws/mutation/securitygroups/inject.go
index ca2cbf76d..61e3df019 100644
--- a/pkg/handlers/aws/mutation/securitygroups/inject.go
+++ b/pkg/handlers/aws/mutation/securitygroups/inject.go
@@ -13,10 +13,10 @@ import (
 	ctrl "sigs.k8s.io/controller-runtime"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 
+	capav1 "github.com/d2iq-labs/capi-runtime-extensions/api/external/sigs.k8s.io/cluster-api-provider-aws/v2/api/v1beta2"
 	"github.com/d2iq-labs/capi-runtime-extensions/api/v1alpha1"
 	"github.com/d2iq-labs/capi-runtime-extensions/common/pkg/capi/clustertopology/patches"
 	"github.com/d2iq-labs/capi-runtime-extensions/common/pkg/capi/clustertopology/variables"
-	capav1 "github.com/d2iq-labs/capi-runtime-extensions/common/pkg/external/sigs.k8s.io/cluster-api-provider-aws/v2/api/v1beta2"
 )
 
 const (
diff --git a/pkg/handlers/aws/mutation/securitygroups/inject_control_plane.go b/pkg/handlers/aws/mutation/securitygroups/inject_control_plane.go
index 8caa090ff..7edea9bb8 100644
--- a/pkg/handlers/aws/mutation/securitygroups/inject_control_plane.go
+++ b/pkg/handlers/aws/mutation/securitygroups/inject_control_plane.go
@@ -4,9 +4,9 @@
 package securitygroups
 
 import (
+	capav1 "github.com/d2iq-labs/capi-runtime-extensions/api/external/sigs.k8s.io/cluster-api-provider-aws/v2/api/v1beta2"
 	"github.com/d2iq-labs/capi-runtime-extensions/api/v1alpha1"
 	"github.com/d2iq-labs/capi-runtime-extensions/common/pkg/capi/clustertopology/patches/selectors"
-	capav1 "github.com/d2iq-labs/capi-runtime-extensions/common/pkg/external/sigs.k8s.io/cluster-api-provider-aws/v2/api/v1beta2"
 	"github.com/d2iq-labs/capi-runtime-extensions/pkg/handlers/generic/clusterconfig"
 )
 
diff --git a/pkg/handlers/aws/mutation/securitygroups/inject_worker.go b/pkg/handlers/aws/mutation/securitygroups/inject_worker.go
index 52a3b99c7..e4b07022f 100644
--- a/pkg/handlers/aws/mutation/securitygroups/inject_worker.go
+++ b/pkg/handlers/aws/mutation/securitygroups/inject_worker.go
@@ -3,9 +3,9 @@
 package securitygroups
 
 import (
+	capav1 "github.com/d2iq-labs/capi-runtime-extensions/api/external/sigs.k8s.io/cluster-api-provider-aws/v2/api/v1beta2"
 	"github.com/d2iq-labs/capi-runtime-extensions/api/v1alpha1"
 	"github.com/d2iq-labs/capi-runtime-extensions/common/pkg/capi/clustertopology/patches/selectors"
-	capav1 "github.com/d2iq-labs/capi-runtime-extensions/common/pkg/external/sigs.k8s.io/cluster-api-provider-aws/v2/api/v1beta2"
 	"github.com/d2iq-labs/capi-runtime-extensions/pkg/handlers/generic/workerconfig"
 )
 
diff --git a/pkg/handlers/docker/mutation/customimage/inject_control_plane.go b/pkg/handlers/docker/mutation/customimage/inject_control_plane.go
index 31da62c01..48cf40c7f 100644
--- a/pkg/handlers/docker/mutation/customimage/inject_control_plane.go
+++ b/pkg/handlers/docker/mutation/customimage/inject_control_plane.go
@@ -14,11 +14,11 @@ import (
 	ctrl "sigs.k8s.io/controller-runtime"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 
+	capdv1 "github.com/d2iq-labs/capi-runtime-extensions/api/external/sigs.k8s.io/cluster-api/test/infrastructure/docker/api/v1beta1"
 	"github.com/d2iq-labs/capi-runtime-extensions/api/v1alpha1"
 	"github.com/d2iq-labs/capi-runtime-extensions/common/pkg/capi/clustertopology/patches"
 	"github.com/d2iq-labs/capi-runtime-extensions/common/pkg/capi/clustertopology/patches/selectors"
 	"github.com/d2iq-labs/capi-runtime-extensions/common/pkg/capi/clustertopology/variables"
-	capdv1 "github.com/d2iq-labs/capi-runtime-extensions/common/pkg/external/sigs.k8s.io/cluster-api/test/infrastructure/docker/api/v1beta1"
 	dockerclusterconfig "github.com/d2iq-labs/capi-runtime-extensions/pkg/handlers/docker/clusterconfig"
 	"github.com/d2iq-labs/capi-runtime-extensions/pkg/handlers/generic/clusterconfig"
 )
diff --git a/pkg/handlers/docker/mutation/customimage/inject_worker.go b/pkg/handlers/docker/mutation/customimage/inject_worker.go
index d2fffd250..7a4df6380 100644
--- a/pkg/handlers/docker/mutation/customimage/inject_worker.go
+++ b/pkg/handlers/docker/mutation/customimage/inject_worker.go
@@ -14,11 +14,11 @@ import (
 	ctrl "sigs.k8s.io/controller-runtime"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 
+	capdv1 "github.com/d2iq-labs/capi-runtime-extensions/api/external/sigs.k8s.io/cluster-api/test/infrastructure/docker/api/v1beta1"
 	"github.com/d2iq-labs/capi-runtime-extensions/api/v1alpha1"
 	"github.com/d2iq-labs/capi-runtime-extensions/common/pkg/capi/clustertopology/patches"
 	"github.com/d2iq-labs/capi-runtime-extensions/common/pkg/capi/clustertopology/patches/selectors"
 	"github.com/d2iq-labs/capi-runtime-extensions/common/pkg/capi/clustertopology/variables"
-	capdv1 "github.com/d2iq-labs/capi-runtime-extensions/common/pkg/external/sigs.k8s.io/cluster-api/test/infrastructure/docker/api/v1beta1"
 	dockerworkerconfig "github.com/d2iq-labs/capi-runtime-extensions/pkg/handlers/docker/workerconfig"
 	"github.com/d2iq-labs/capi-runtime-extensions/pkg/handlers/generic/workerconfig"
 )
diff --git a/pkg/handlers/generic/lifecycle/cni/calico/strategy_helmaddon.go b/pkg/handlers/generic/lifecycle/cni/calico/strategy_helmaddon.go
index fbc7446fe..0daf383c4 100644
--- a/pkg/handlers/generic/lifecycle/cni/calico/strategy_helmaddon.go
+++ b/pkg/handlers/generic/lifecycle/cni/calico/strategy_helmaddon.go
@@ -16,7 +16,7 @@ import (
 	ctrlclient "sigs.k8s.io/controller-runtime/pkg/client"
 	"sigs.k8s.io/controller-runtime/pkg/controller/controllerutil"
 
-	caaphv1 "github.com/d2iq-labs/capi-runtime-extensions/common/pkg/external/sigs.k8s.io/cluster-api-addon-provider-helm/api/v1alpha1"
+	caaphv1 "github.com/d2iq-labs/capi-runtime-extensions/api/external/sigs.k8s.io/cluster-api-addon-provider-helm/api/v1alpha1"
 	"github.com/d2iq-labs/capi-runtime-extensions/common/pkg/k8s/client"
 )