Repository: rancher/cluster-api-provider-rke2
Pull request #367 (2024-07-11 16:02:21)

:chore: Rename CAPRKE2 org references in the codebase
**What this PR does / why we need it**:
Repo is now living under `rancher` GH org instead of `rancher-sandbox`, so this commit renames all old references with new one.

<!-- Enter a description of the change and why this change is needed -->

**Which issue(s) this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close the issue(s) when PR gets merged)*:
Fixes #

**Special notes for your reviewer**:

**Checklist**:
<!-- Put an "X" character inside the brackets of each completed task. Some may be optional depending on the PR in which case these can be deleted -->

- [x] squashed commits into logical changes
- [ ] includes documentation
- [ ] adds unit tests
- [x] adds or updates e2e tests



Patch:
diff --git a/.golangci.yml b/.golangci.yml
index 55ca6a6..d23ce5f 100644
--- a/.golangci.yml
+++ b/.golangci.yml
@@ -55,17 +55,17 @@ linters-settings:
       - "4"
       - "3"
   goimports:
-    local-prefixes: github.com/rancher-sandbox/cluster-api-provider-rke2
+    local-prefixes: github.com/rancher/cluster-api-provider-rke2
   gci:
     custom-order: true
-    #local-prefixes: github.com/rancher-sandbox/cluster-api-provider-rke2
+    #local-prefixes: github.com/rancher/cluster-api-provider-rke2
     sections:
       - "standard"
       - "blank"
       - "dot"
       - "default"
       - "prefix(sigs.k8s.io/cluster-api)"
-      - "prefix(github.com/rancher-sandbox/cluster-api-provider-rke2)"
+      - "prefix(github.com/rancher/cluster-api-provider-rke2)"
     wsl:
       force-err-cuddling: false
 linters:
diff --git a/Dockerfile b/Dockerfile
index df61afe..48e6f51 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -44,7 +44,7 @@ RUN --mount=type=cache,target=/go/pkg/mod \
 
 # Production image
 FROM gcr.io/distroless/static:nonroot-${ARCH}
-LABEL org.opencontainers.image.source=https://github.com/rancher-sandbox/cluster-api-provider-rke2
+LABEL org.opencontainers.image.source=https://github.com/rancher/cluster-api-provider-rke2
 WORKDIR /
 COPY --from=builder /workspace/manager .
 # Use uid of nonroot user (65532) because kubernetes expects numeric user when applying pod security policies
diff --git a/Makefile b/Makefile
index 53b6389..1ee5960 100644
--- a/Makefile
+++ b/Makefile
@@ -220,7 +220,7 @@ generate-go-conversions-rke2-control-plane: $(CONVERSION_GEN) ## Generate conver
 	$(MAKE) clean-generated-conversions SRC_DIRS="./controlplane/api/v1alpha1"
 	$(CONVERSION_GEN) \
 		--input-dirs=./controlplane/api/v1alpha1 \
-		--extra-peer-dirs=github.com/rancher-sandbox/cluster-api-provider-rke2/bootstrap/api/v1alpha1 \
+		--extra-peer-dirs=github.com/rancher/cluster-api-provider-rke2/bootstrap/api/v1alpha1 \
 		--build-tag=ignore_autogenerated_rk2_control_plane \
 		--output-file-base=zz_generated.conversion $(ROOT_DIR) \
 		--go-header-file=./hack/boilerplate.go.txt
@@ -299,11 +299,11 @@ managers: $(addprefix manager-,$(ALL_MANAGERS)) ## Run all manager-* targets
 
 .PHONY: manager-rke2-bootstrap
 manager-rke2-bootstrap: ## Build the rke2 bootstrap manager binary into the ./bin folder
-	go build -trimpath -ldflags "$(LDFLAGS)" -o $(BIN_DIR)/rke2-bootstrap-manager github.com/rancher-sandbox/cluster-api-provider-rke2/bootstrap
+	go build -trimpath -ldflags "$(LDFLAGS)" -o $(BIN_DIR)/rke2-bootstrap-manager github.com/rancher/cluster-api-provider-rke2/bootstrap
 
 .PHONY: manager-rke2-control-plane
 manager-rke2-control-plane: ## Build the rke2 control plane manager binary into the ./bin folder
-	go build -trimpath -ldflags "$(LDFLAGS)" -o $(BIN_DIR)/rke2-control-plane-manager github.com/rancher-sandbox/cluster-api-provider-rke2/controlplane
+	go build -trimpath -ldflags "$(LDFLAGS)" -o $(BIN_DIR)/rke2-control-plane-manager github.com/rancher/cluster-api-provider-rke2/controlplane
 
 .PHONY: docker-pull-prerequisites
 docker-pull-prerequisites:
diff --git a/README.md b/README.md
index d4a0046..f1cfeb2 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 # Cluster API Provider RKE2
 
-![GitHub](https://img.shields.io/github/license/rancher-sandbox/cluster-api-provider-rke2)
+![GitHub](https://img.shields.io/github/license/rancher/cluster-api-provider-rke2)
 
 ------
 
@@ -71,10 +71,10 @@ With CAPI & clusterctl versions less than v1.6.0 you need a specific configurati
 ```yaml
 providers:
   - name: "rke2"
-    url: "https://github.com/rancher-sandbox/cluster-api-provider-rke2/releases/v0.1.1/bootstrap-components.yaml"
+    url: "https://github.com/rancher/cluster-api-provider-rke2/releases/v0.1.1/bootstrap-components.yaml"
     type: "BootstrapProvider"
   - name: "rke2"
-    url: "https://github.com/rancher-sandbox/cluster-api-provider-rke2/releases/v0.1.1/control-plane-components.yaml"
+    url: "https://github.com/rancher/cluster-api-provider-rke2/releases/v0.1.1/control-plane-components.yaml"
     type: "ControlPlaneProvider"
 ``` 
 > NOTE: Due to some issue related to how `CAPD` creates Load Balancer healthchecks, it is necessary to use a fork of `CAPD` by providing in the above configuration file the following :
@@ -260,7 +260,7 @@ These instructions are for development purposes initially and will be changed in
 
 > **Why clone into the GOPATH?** There have been historic issues with code generation tools when they are run outside the go path
 
-2. Fork the [Cluster API Provider RKE2](https://github.com/rancher-sandbox/cluster-api-provider-rke2) repo
+2. Fork the [Cluster API Provider RKE2](https://github.com/rancher/cluster-api-provider-rke2) repo
 3. Clone your new repo into the **GOPATH** (i.e. `~/go/src/github.com/yourname/cluster-api-provider-rke2`)
 4. Ensure **Tilt** and **kind** are installed
 5. Create a `tilt-settings.json` file in the root of your forked/cloned `cluster-api` directory.
diff --git a/bootstrap/PROJECT b/bootstrap/PROJECT
index 08c4a1e..76ead9a 100644
--- a/bootstrap/PROJECT
+++ b/bootstrap/PROJECT
@@ -6,7 +6,7 @@ domain: cluster.x-k8s.io
 layout:
 - go.kubebuilder.io/v3
 projectName: bootstrap
-repo: github.com/rancher-sandbox/cluster-api-provider-rke2/bootstrap
+repo: github.com/rancher/cluster-api-provider-rke2/bootstrap
 resources:
 - api:
     crdVersion: v1
@@ -15,7 +15,7 @@ resources:
   domain: cluster.x-k8s.io
   group: bootstrap
   kind: Rke2Config
-  path: github.com/rancher-sandbox/cluster-api-provider-rke2/bootstrap/api/v1alpha1
+  path: github.com/rancher/cluster-api-provider-rke2/bootstrap/api/v1alpha1
   version: v1alpha1
   webhooks:
     defaulting: true
@@ -27,7 +27,7 @@ resources:
   domain: cluster.x-k8s.io
   group: bootstrap
   kind: Rke2ConfigTemplate
-  path: github.com/rancher-sandbox/cluster-api-provider-rke2/bootstrap/api/v1alpha1
+  path: github.com/rancher/cluster-api-provider-rke2/bootstrap/api/v1alpha1
   version: v1alpha1
   webhooks:
     defaulting: true
@@ -39,7 +39,7 @@ resources:
   domain: cluster.x-k8s.io
   group: bootstrap
   kind: RKE2ConfigTemplate
-  path: github.com/rancher-sandbox/cluster-api-provider-rke2/bootstrap/api/v1beta1
+  path: github.com/rancher/cluster-api-provider-rke2/bootstrap/api/v1beta1
   version: v1beta1
   webhooks:
     conversion: true
diff --git a/bootstrap/api/v1alpha1/conversion.go b/bootstrap/api/v1alpha1/conversion.go
index 1637ade..5e9985e 100644
--- a/bootstrap/api/v1alpha1/conversion.go
+++ b/bootstrap/api/v1alpha1/conversion.go
@@ -23,7 +23,7 @@ import (
 
 	apiconversion "k8s.io/apimachinery/pkg/conversion"
 
-	bootstrapv1 "github.com/rancher-sandbox/cluster-api-provider-rke2/bootstrap/api/v1beta1"
+	bootstrapv1 "github.com/rancher/cluster-api-provider-rke2/bootstrap/api/v1beta1"
 	utilconversion "sigs.k8s.io/cluster-api/util/conversion"
 )
 
diff --git a/bootstrap/api/v1alpha1/doc.go b/bootstrap/api/v1alpha1/doc.go
index 7b8f2b6..b1fc4e3 100644
--- a/bootstrap/api/v1alpha1/doc.go
+++ b/bootstrap/api/v1alpha1/doc.go
@@ -16,6 +16,6 @@ limitations under the License.
 
 // Package v1alpha1 contains a v1alpha1 api for bootstrap resources.
 //
-// +k8s:conversion-gen=github.com/rancher-sandbox/cluster-api-provider-rke2/bootstrap/api/v1beta1
+// +k8s:conversion-gen=github.com/rancher/cluster-api-provider-rke2/bootstrap/api/v1beta1
 // +k8s:deepcopy-gen=package
 package v1alpha1
diff --git a/bootstrap/api/v1alpha1/zz_generated.conversion.go b/bootstrap/api/v1alpha1/zz_generated.conversion.go
index 0af1ded..7e8fab7 100644
--- a/bootstrap/api/v1alpha1/zz_generated.conversion.go
+++ b/bootstrap/api/v1alpha1/zz_generated.conversion.go
@@ -23,7 +23,7 @@ package v1alpha1
 import (
 	unsafe "unsafe"
 
-	v1beta1 "github.com/rancher-sandbox/cluster-api-provider-rke2/bootstrap/api/v1beta1"
+	v1beta1 "github.com/rancher/cluster-api-provider-rke2/bootstrap/api/v1beta1"
 	v1 "k8s.io/api/core/v1"
 	conversion "k8s.io/apimachinery/pkg/conversion"
 	runtime "k8s.io/apimachinery/pkg/runtime"
diff --git a/bootstrap/internal/cloudinit/cloudinit.go b/bootstrap/internal/cloudinit/cloudinit.go
index e8f502b..9586325 100644
--- a/bootstrap/internal/cloudinit/cloudinit.go
+++ b/bootstrap/internal/cloudinit/cloudinit.go
@@ -26,7 +26,7 @@ import (
 	"github.com/pkg/errors"
 	"gopkg.in/yaml.v3"
 
-	bootstrapv1 "github.com/rancher-sandbox/cluster-api-provider-rke2/bootstrap/api/v1beta1"
+	bootstrapv1 "github.com/rancher/cluster-api-provider-rke2/bootstrap/api/v1beta1"
 )
 
 var (
diff --git a/bootstrap/internal/cloudinit/controlplane_init.go b/bootstrap/internal/cloudinit/controlplane_init.go
index 4ae4381..efd267f 100644
--- a/bootstrap/internal/cloudinit/controlplane_init.go
+++ b/bootstrap/internal/cloudinit/controlplane_init.go
@@ -19,7 +19,7 @@ package cloudinit
 import (
 	"fmt"
 
-	"github.com/rancher-sandbox/cluster-api-provider-rke2/pkg/secret"
+	"github.com/rancher/cluster-api-provider-rke2/pkg/secret"
 )
 
 //nolint:lll
diff --git a/bootstrap/internal/controllers/rke2config_controller.go b/bootstrap/internal/controllers/rke2config_controller.go
index 069727e..6c45886 100644
--- a/bootstrap/internal/controllers/rke2config_controller.go
+++ b/bootstrap/internal/controllers/rke2config_controller.go
@@ -42,15 +42,15 @@ import (
 	"sigs.k8s.io/cluster-api/util/conditions"
 	"sigs.k8s.io/cluster-api/util/patch"
 
-	bootstrapv1 "github.com/rancher-sandbox/cluster-api-provider-rke2/bootstrap/api/v1beta1"
-	"github.com/rancher-sandbox/cluster-api-provider-rke2/bootstrap/internal/cloudinit"
-	"github.com/rancher-sandbox/cluster-api-provider-rke2/bootstrap/internal/ignition"
-	controlplanev1 "github.com/rancher-sandbox/cluster-api-provider-rke2/controlplane/api/v1beta1"
-	"github.com/rancher-sandbox/cluster-api-provider-rke2/pkg/consts"
-	"github.com/rancher-sandbox/cluster-api-provider-rke2/pkg/locking"
-	"github.com/rancher-sandbox/cluster-api-provider-rke2/pkg/rke2"
-	"github.com/rancher-sandbox/cluster-api-provider-rke2/pkg/secret"
-	bsutil "github.com/rancher-sandbox/cluster-api-provider-rke2/pkg/util"
+	bootstrapv1 "github.com/rancher/cluster-api-provider-rke2/bootstrap/api/v1beta1"
+	"github.com/rancher/cluster-api-provider-rke2/bootstrap/internal/cloudinit"
+	"github.com/rancher/cluster-api-provider-rke2/bootstrap/internal/ignition"
+	controlplanev1 "github.com/rancher/cluster-api-provider-rke2/controlplane/api/v1beta1"
+	"github.com/rancher/cluster-api-provider-rke2/pkg/consts"
+	"github.com/rancher/cluster-api-provider-rke2/pkg/locking"
+	"github.com/rancher/cluster-api-provider-rke2/pkg/rke2"
+	"github.com/rancher/cluster-api-provider-rke2/pkg/secret"
+	bsutil "github.com/rancher/cluster-api-provider-rke2/pkg/util"
 )
 
 const (
diff --git a/bootstrap/internal/ignition/butane/butane.go b/bootstrap/internal/ignition/butane/butane.go
index 65061b2..cd81310 100644
--- a/bootstrap/internal/ignition/butane/butane.go
+++ b/bootstrap/internal/ignition/butane/butane.go
@@ -29,8 +29,8 @@ import (
 	ignitionTypes "github.com/coreos/ignition/v2/config/v3_3/types"
 	"github.com/pkg/errors"
 
-	bootstrapv1 "github.com/rancher-sandbox/cluster-api-provider-rke2/bootstrap/api/v1beta1"
-	"github.com/rancher-sandbox/cluster-api-provider-rke2/bootstrap/internal/cloudinit"
+	bootstrapv1 "github.com/rancher/cluster-api-provider-rke2/bootstrap/api/v1beta1"
+	"github.com/rancher/cluster-api-provider-rke2/bootstrap/internal/cloudinit"
 )
 
 // The template contains configurations for two main sections: systemd units and storage files.
diff --git a/bootstrap/internal/ignition/ignition.go b/bootstrap/internal/ignition/ignition.go
index 107f802..b151c02 100644
--- a/bootstrap/internal/ignition/ignition.go
+++ b/bootstrap/internal/ignition/ignition.go
@@ -18,9 +18,9 @@ package ignition
 import (
 	"fmt"
 
-	bootstrapv1 "github.com/rancher-sandbox/cluster-api-provider-rke2/bootstrap/api/v1beta1"
-	"github.com/rancher-sandbox/cluster-api-provider-rke2/bootstrap/internal/cloudinit"
-	"github.com/rancher-sandbox/cluster-api-provider-rke2/bootstrap/internal/ignition/butane"
+	bootstrapv1 "github.com/rancher/cluster-api-provider-rke2/bootstrap/api/v1beta1"
+	"github.com/rancher/cluster-api-provider-rke2/bootstrap/internal/cloudinit"
+	"github.com/rancher/cluster-api-provider-rke2/bootstrap/internal/ignition/butane"
 )
 
 const (
diff --git a/bootstrap/main.go b/bootstrap/main.go
index fb34712..1b6bd93 100644
--- a/bootstrap/main.go
+++ b/bootstrap/main.go
@@ -41,12 +41,12 @@ import (
 	clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1"
 	"sigs.k8s.io/cluster-api/util/flags"
 
-	bootstrapv1alpha1 "github.com/rancher-sandbox/cluster-api-provider-rke2/bootstrap/api/v1alpha1"
-	bootstrapv1 "github.com/rancher-sandbox/cluster-api-provider-rke2/bootstrap/api/v1beta1"
-	"github.com/rancher-sandbox/cluster-api-provider-rke2/bootstrap/internal/controllers"
-	controlplanev1alpha1 "github.com/rancher-sandbox/cluster-api-provider-rke2/controlplane/api/v1alpha1"
-	controlplanev1 "github.com/rancher-sandbox/cluster-api-provider-rke2/controlplane/api/v1beta1"
-	"github.com/rancher-sandbox/cluster-api-provider-rke2/pkg/consts"
+	bootstrapv1alpha1 "github.com/rancher/cluster-api-provider-rke2/bootstrap/api/v1alpha1"
+	bootstrapv1 "github.com/rancher/cluster-api-provider-rke2/bootstrap/api/v1beta1"
+	"github.com/rancher/cluster-api-provider-rke2/bootstrap/internal/controllers"
+	controlplanev1alpha1 "github.com/rancher/cluster-api-provider-rke2/controlplane/api/v1alpha1"
+	controlplanev1 "github.com/rancher/cluster-api-provider-rke2/controlplane/api/v1beta1"
+	"github.com/rancher/cluster-api-provider-rke2/pkg/consts"
 )
 
 var (
diff --git a/controlplane/PROJECT b/controlplane/PROJECT
index ea86787..69dd724 100644
--- a/controlplane/PROJECT
+++ b/controlplane/PROJECT
@@ -2,7 +2,7 @@ domain: cluster.x-k8s.io
 layout:
 - go.kubebuilder.io/v3
 projectName: controlplane
-repo: github.com/rancher-sandbox/cluster-api-provider-rke2/controlplane
+repo: github.com/rancher/cluster-api-provider-rke2/controlplane
 resources:
 - api:
     crdVersion: v1
@@ -11,7 +11,7 @@ resources:
   domain: cluster.x-k8s.io
   group: controlplane
   kind: Rke2ControlPlane
-  path: github.com/rancher-sandbox/cluster-api-provider-rke2/controlplane/api/v1alpha1
+  path: github.com/rancher/cluster-api-provider-rke2/controlplane/api/v1alpha1
   version: v1alpha1
   webhooks:
     defaulting: true
@@ -23,7 +23,7 @@ resources:
   domain: cluster.x-k8s.io
   group: controlplane
   kind: Rke2ControlPlaneTemplate
-  path: github.com/rancher-sandbox/cluster-api-provider-rke2/controlplane/api/v1alpha1
+  path: github.com/rancher/cluster-api-provider-rke2/controlplane/api/v1alpha1
   version: v1alpha1
   webhooks:
     defaulting: true
diff --git a/controlplane/api/v1alpha1/conversion.go b/controlplane/api/v1alpha1/conversion.go
index 999ce4a..f7346ea 100644
--- a/controlplane/api/v1alpha1/conversion.go
+++ b/controlplane/api/v1alpha1/conversion.go
@@ -22,7 +22,7 @@ import (
 	apiconversion "k8s.io/apimachinery/pkg/conversion"
 	utilconversion "sigs.k8s.io/cluster-api/util/conversion"
 
-	controlplanev1 "github.com/rancher-sandbox/cluster-api-provider-rke2/controlplane/api/v1beta1"
+	controlplanev1 "github.com/rancher/cluster-api-provider-rke2/controlplane/api/v1beta1"
 	"sigs.k8s.io/controller-runtime/pkg/conversion"
 )
 
diff --git a/controlplane/api/v1alpha1/doc.go b/controlplane/api/v1alpha1/doc.go
index f93fe6f..1677ff8 100644
--- a/controlplane/api/v1alpha1/doc.go
+++ b/controlplane/api/v1alpha1/doc.go
@@ -16,6 +16,6 @@ limitations under the License.
 
 // Package v1alpha1 contains a v1alpha1 api for controlplane resources.
 //
-// +k8s:conversion-gen=github.com/rancher-sandbox/cluster-api-provider-rke2/controlplane/api/v1beta1
+// +k8s:conversion-gen=github.com/rancher/cluster-api-provider-rke2/controlplane/api/v1beta1
 // +k8s:deepcopy-gen=package
 package v1alpha1
diff --git a/controlplane/api/v1alpha1/rke2controlplane_types.go b/controlplane/api/v1alpha1/rke2controlplane_types.go
index ffbd453..c3dddea 100644
--- a/controlplane/api/v1alpha1/rke2controlplane_types.go
+++ b/controlplane/api/v1alpha1/rke2controlplane_types.go
@@ -23,7 +23,7 @@ import (
 
 	clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1"
 
-	bootstrapv1alpha1 "github.com/rancher-sandbox/cluster-api-provider-rke2/bootstrap/api/v1alpha1"
+	bootstrapv1alpha1 "github.com/rancher/cluster-api-provider-rke2/bootstrap/api/v1alpha1"
 )
 
 const (
diff --git a/controlplane/api/v1alpha1/zz_generated.conversion.go b/controlplane/api/v1alpha1/zz_generated.conversion.go
index a290240..beaa5b3 100644
--- a/controlplane/api/v1alpha1/zz_generated.conversion.go
+++ b/controlplane/api/v1alpha1/zz_generated.conversion.go
@@ -23,9 +23,9 @@ package v1alpha1
 import (
 	unsafe "unsafe"
 
-	apiv1alpha1 "github.com/rancher-sandbox/cluster-api-provider-rke2/bootstrap/api/v1alpha1"
-	apiv1beta1 "github.com/rancher-sandbox/cluster-api-provider-rke2/bootstrap/api/v1beta1"
-	v1beta1 "github.com/rancher-sandbox/cluster-api-provider-rke2/controlplane/api/v1beta1"
+	apiv1alpha1 "github.com/rancher/cluster-api-provider-rke2/bootstrap/api/v1alpha1"
+	apiv1beta1 "github.com/rancher/cluster-api-provider-rke2/bootstrap/api/v1beta1"
+	v1beta1 "github.com/rancher/cluster-api-provider-rke2/controlplane/api/v1beta1"
 	v1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	conversion "k8s.io/apimachinery/pkg/conversion"
diff --git a/controlplane/api/v1alpha1/zz_generated.deepcopy.go b/controlplane/api/v1alpha1/zz_generated.deepcopy.go
index 59d2783..189383d 100644
--- a/controlplane/api/v1alpha1/zz_generated.deepcopy.go
+++ b/controlplane/api/v1alpha1/zz_generated.deepcopy.go
@@ -21,7 +21,7 @@ limitations under the License.
 package v1alpha1
 
 import (
-	apiv1alpha1 "github.com/rancher-sandbox/cluster-api-provider-rke2/bootstrap/api/v1alpha1"
+	apiv1alpha1 "github.com/rancher/cluster-api-provider-rke2/bootstrap/api/v1alpha1"
 	corev1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime"
diff --git a/controlplane/api/v1beta1/rke2controlplane_types.go b/controlplane/api/v1beta1/rke2controlplane_types.go
index b68fb7f..6c56308 100644
--- a/controlplane/api/v1beta1/rke2controlplane_types.go
+++ b/controlplane/api/v1beta1/rke2controlplane_types.go
@@ -23,7 +23,7 @@ import (
 
 	clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1"
 
-	bootstrapv1 "github.com/rancher-sandbox/cluster-api-provider-rke2/bootstrap/api/v1beta1"
+	bootstrapv1 "github.com/rancher/cluster-api-provider-rke2/bootstrap/api/v1beta1"
 )
 
 const (
diff --git a/controlplane/api/v1beta1/rke2controlplane_webhook.go b/controlplane/api/v1beta1/rke2controlplane_webhook.go
index 65cb4a2..475ed14 100644
--- a/controlplane/api/v1beta1/rke2controlplane_webhook.go
+++ b/controlplane/api/v1beta1/rke2controlplane_webhook.go
@@ -28,7 +28,7 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/webhook"
 	"sigs.k8s.io/controller-runtime/pkg/webhook/admission"
 
-	bootstrapv1 "github.com/rancher-sandbox/cluster-api-provider-rke2/bootstrap/api/v1beta1"
+	bootstrapv1 "github.com/rancher/cluster-api-provider-rke2/bootstrap/api/v1beta1"
 )
 
 // log is for logging in this package.
diff --git a/controlplane/api/v1beta1/rke2controlplanetemplate_webhook.go b/controlplane/api/v1beta1/rke2controlplanetemplate_webhook.go
index 2ed42cc..0da528b 100644
--- a/controlplane/api/v1beta1/rke2controlplanetemplate_webhook.go
+++ b/controlplane/api/v1beta1/rke2controlplanetemplate_webhook.go
@@ -27,7 +27,7 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/webhook"
 	"sigs.k8s.io/controller-runtime/pkg/webhook/admission"
 
-	bootstrapv1 "github.com/rancher-sandbox/cluster-api-provider-rke2/bootstrap/api/v1beta1"
+	bootstrapv1 "github.com/rancher/cluster-api-provider-rke2/bootstrap/api/v1beta1"
 )
 
 // SetupWebhookWithManager sets up the Controller Manager for the Webhook for the RKE2ControlPlaneTemplate resource.
diff --git a/controlplane/api/v1beta1/zz_generated.deepcopy.go b/controlplane/api/v1beta1/zz_generated.deepcopy.go
index ad2569b..ec46909 100644
--- a/controlplane/api/v1beta1/zz_generated.deepcopy.go
+++ b/controlplane/api/v1beta1/zz_generated.deepcopy.go
@@ -21,7 +21,7 @@ limitations under the License.
 package v1beta1
 
 import (
-	apiv1beta1 "github.com/rancher-sandbox/cluster-api-provider-rke2/bootstrap/api/v1beta1"
+	apiv1beta1 "github.com/rancher/cluster-api-provider-rke2/bootstrap/api/v1beta1"
 	corev1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime"
diff --git a/controlplane/internal/controllers/rke2controlplane_controller.go b/controlplane/internal/controllers/rke2controlplane_controller.go
index b732525..528657a 100644
--- a/controlplane/internal/controllers/rke2controlplane_controller.go
+++ b/controlplane/internal/controllers/rke2controlplane_controller.go
@@ -48,11 +48,11 @@ import (
 	"sigs.k8s.io/cluster-api/util/conditions"
 	"sigs.k8s.io/cluster-api/util/patch"
 
-	controlplanev1 "github.com/rancher-sandbox/cluster-api-provider-rke2/controlplane/api/v1beta1"
-	"github.com/rancher-sandbox/cluster-api-provider-rke2/pkg/kubeconfig"
-	"github.com/rancher-sandbox/cluster-api-provider-rke2/pkg/registration"
-	"github.com/rancher-sandbox/cluster-api-provider-rke2/pkg/rke2"
-	"github.com/rancher-sandbox/cluster-api-provider-rke2/pkg/secret"
+	controlplanev1 "github.com/rancher/cluster-api-provider-rke2/controlplane/api/v1beta1"
+	"github.com/rancher/cluster-api-provider-rke2/pkg/kubeconfig"
+	"github.com/rancher/cluster-api-provider-rke2/pkg/registration"
+	"github.com/rancher/cluster-api-provider-rke2/pkg/rke2"
+	"github.com/rancher/cluster-api-provider-rke2/pkg/secret"
 )
 
 const (
diff --git a/controlplane/internal/controllers/scale.go b/controlplane/internal/controllers/scale.go
index e01ce96..b836573 100644
--- a/controlplane/internal/controllers/scale.go
+++ b/controlplane/internal/controllers/scale.go
@@ -38,9 +38,9 @@ import (
 	"sigs.k8s.io/cluster-api/util/collections"
 	"sigs.k8s.io/cluster-api/util/conditions"
 
-	bootstrapv1 "github.com/rancher-sandbox/cluster-api-provider-rke2/bootstrap/api/v1beta1"
-	controlplanev1 "github.com/rancher-sandbox/cluster-api-provider-rke2/controlplane/api/v1beta1"
-	rke2 "github.com/rancher-sandbox/cluster-api-provider-rke2/pkg/rke2"
+	bootstrapv1 "github.com/rancher/cluster-api-provider-rke2/bootstrap/api/v1beta1"
+	controlplanev1 "github.com/rancher/cluster-api-provider-rke2/controlplane/api/v1beta1"
+	rke2 "github.com/rancher/cluster-api-provider-rke2/pkg/rke2"
 )
 
 func (r *RKE2ControlPlaneReconciler) initializeControlPlane(
diff --git a/controlplane/main.go b/controlplane/main.go
index 9eeba17..1661103 100644
--- a/controlplane/main.go
+++ b/controlplane/main.go
@@ -42,12 +42,12 @@ import (
 	clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1"
 	"sigs.k8s.io/cluster-api/util/flags"
 
-	bootstrapv1alpha1 "github.com/rancher-sandbox/cluster-api-provider-rke2/bootstrap/api/v1alpha1"
-	bootstrapv1 "github.com/rancher-sandbox/cluster-api-provider-rke2/bootstrap/api/v1beta1"
-	controlplanev1alpha1 "github.com/rancher-sandbox/cluster-api-provider-rke2/controlplane/api/v1alpha1"
-	controlplanev1 "github.com/rancher-sandbox/cluster-api-provider-rke2/controlplane/api/v1beta1"
-	"github.com/rancher-sandbox/cluster-api-provider-rke2/controlplane/internal/controllers"
-	"github.com/rancher-sandbox/cluster-api-provider-rke2/pkg/consts"
+	bootstrapv1alpha1 "github.com/rancher/cluster-api-provider-rke2/bootstrap/api/v1alpha1"
+	bootstrapv1 "github.com/rancher/cluster-api-provider-rke2/bootstrap/api/v1beta1"
+	controlplanev1alpha1 "github.com/rancher/cluster-api-provider-rke2/controlplane/api/v1alpha1"
+	controlplanev1 "github.com/rancher/cluster-api-provider-rke2/controlplane/api/v1beta1"
+	"github.com/rancher/cluster-api-provider-rke2/controlplane/internal/controllers"
+	"github.com/rancher/cluster-api-provider-rke2/pkg/consts"
 )
 
 var (
diff --git a/docs/adr/0001-separate-CP-and-worker-versions.md b/docs/adr/0001-separate-CP-and-worker-versions.md
index 3d85e30..1f84b4a 100644
--- a/docs/adr/0001-separate-CP-and-worker-versions.md
+++ b/docs/adr/0001-separate-CP-and-worker-versions.md
@@ -36,6 +36,6 @@ and the `RKE2ControlPlane` version fields. Existing `AgentConfig` version will b
 
 `AgentConfig` version is removed, so the `RKE2ControlPlane` and `MachineDeployment` should declare valid versions, following `RKE2` naming [pattern](https://github.com/rancher/rke2/releases).
 
-For users affected by the [#315](https://github.com/rancher-sandbox/cluster-api-provider-rke2/issues/315) this will require 2 step process:
+For users affected by the [#315](https://github.com/rancher/cluster-api-provider-rke2/issues/315) this will require 2 step process:
 1. Check that version defined in `MachineDeployment` matches rke2 releases: [https://github.com/rancher/rke2/releases](https://github.com/rancher/rke2/releases)
 2. Force re-rollout of all worker nodes to the version currently set in `MachineDeployment` or upgrade workers to the new version.
diff --git a/docs/adr/0002-deprecate-kubebuilder-defaults.md b/docs/adr/0002-deprecate-kubebuilder-defaults.md
index 6ff5245..df00a60 100644
--- a/docs/adr/0002-deprecate-kubebuilder-defaults.md
+++ b/docs/adr/0002-deprecate-kubebuilder-defaults.md
@@ -26,7 +26,7 @@ Enforcing default values for fields in CRD definitions can cause problem with th
 ## Decision
 <!-- What is the decision that has been made -->
 
-Kubebuilder defaulting annotations were [deprecated in CAPRKE2 API](https://github.com/rancher-sandbox/cluster-api-provider-rke2/commit/86025754c0993e6e0d549110cc7f38687ac420e3). As a result of this deprecation
+Kubebuilder defaulting annotations were [deprecated in CAPRKE2 API](https://github.com/rancher/cluster-api-provider-rke2/commit/86025754c0993e6e0d549110cc7f38687ac420e3). As a result of this deprecation
 CRD definitions don't include default values for some fields.
 
 ## Consequences
diff --git a/docs/release.md b/docs/release.md
index dbcfb46..070cbaf 100644
--- a/docs/release.md
+++ b/docs/release.md
@@ -10,7 +10,7 @@
 1. Clone the repository locally: 
 
 ```bash
-git clone git@github.com:rancher-sandbox/cluster-api-provider-rke2.git
+git clone git@github.com:rancher/cluster-api-provider-rke2.git
 ```
 
 2. Depending on whether you are cutting a minor or patch release, the process varies.
@@ -20,7 +20,7 @@ git clone git@github.com:rancher-sandbox/cluster-api-provider-rke2.git
         Create a new release branch (i.e release-X) and push it to the upstream repository.
 
         ```bash
-            # Note: `upstream` must be the remote pointing to `github.com:rancher-sandbox/cluster-api-provider-rke2`.
+            # Note: `upstream` must be the remote pointing to `github.com:rancher/cluster-api-provider-rke2`.
             git checkout -b release-0.2
             git push -u upstream release-0.2
             # Export the tag of the minor release to be cut, e.g.:
@@ -45,7 +45,7 @@ git tag -s -a ${RELEASE_TAG} -m ${RELEASE_TAG}
 git push upstream ${RELEASE_TAG}
 ```
 
-This will trigger a [release GitHub action](https://github.com/rancher-sandbox/cluster-api-provider-rke2/blob/main/.github/workflows/release.yml) that creates a release with RKE2 provider components.
+This will trigger a [release GitHub action](https://github.com/rancher/cluster-api-provider-rke2/blob/main/.github/workflows/release.yml) that creates a release with RKE2 provider components.
 
 ## Versioning
 
diff --git a/go.mod b/go.mod
index 834ce58..a4e4186 100644
--- a/go.mod
+++ b/go.mod
@@ -1,4 +1,4 @@
-module github.com/rancher-sandbox/cluster-api-provider-rke2
+module github.com/rancher/cluster-api-provider-rke2
 
 go 1.21
 
diff --git a/hack/version.sh b/hack/version.sh
index c5de0d3..1389a69 100755
--- a/hack/version.sh
+++ b/hack/version.sh
@@ -85,7 +85,7 @@ version::ldflags() {
         local key=${1}
         local val=${2}
         ldflags+=(
-            "-X 'github.com/rancher-sandbox/cluster-api-provider-rke2/version.${key}=${val}'"
+            "-X 'github.com/rancher/cluster-api-provider-rke2/version.${key}=${val}'"
         )
     }
 
diff --git a/pkg/etcd/client_generator.go b/pkg/etcd/client_generator.go
index 39f006e..e2e5771 100644
--- a/pkg/etcd/client_generator.go
+++ b/pkg/etcd/client_generator.go
@@ -28,7 +28,7 @@ import (
 	kerrors "k8s.io/apimachinery/pkg/util/errors"
 	"k8s.io/client-go/rest"
 
-	"github.com/rancher-sandbox/cluster-api-provider-rke2/pkg/proxy"
+	"github.com/rancher/cluster-api-provider-rke2/pkg/proxy"
 )
 
 const etcdPort = 2379
diff --git a/pkg/etcd/etcd.go b/pkg/etcd/etcd.go
index d9ba807..aa7c3dc 100644
--- a/pkg/etcd/etcd.go
+++ b/pkg/etcd/etcd.go
@@ -28,7 +28,7 @@ import (
 	"google.golang.org/grpc"
 	kerrors "k8s.io/apimachinery/pkg/util/errors"
 
-	"github.com/rancher-sandbox/cluster-api-provider-rke2/pkg/proxy"
+	"github.com/rancher/cluster-api-provider-rke2/pkg/proxy"
 )
 
 // GRPCDial is a function that creates a connection to a given endpoint.
diff --git a/pkg/etcd/util/util.go b/pkg/etcd/util/util.go
index 7a1d244..0d845b5 100644
--- a/pkg/etcd/util/util.go
+++ b/pkg/etcd/util/util.go
@@ -22,7 +22,7 @@ import (
 
 	"k8s.io/apimachinery/pkg/util/sets"
 
-	"github.com/rancher-sandbox/cluster-api-provider-rke2/pkg/etcd"
+	"github.com/rancher/cluster-api-provider-rke2/pkg/etcd"
 )
 
 // MemberForName returns the etcd member with the matching name.
diff --git a/pkg/kubeconfig/kubeconfig.go b/pkg/kubeconfig/kubeconfig.go
index 866c667..5435e8a 100644
--- a/pkg/kubeconfig/kubeconfig.go
+++ b/pkg/kubeconfig/kubeconfig.go
@@ -34,7 +34,7 @@ import (
 	"sigs.k8s.io/cluster-api/util"
 	"sigs.k8s.io/cluster-api/util/certs"
 
-	"github.com/rancher-sandbox/cluster-api-provider-rke2/pkg/secret"
+	"github.com/rancher/cluster-api-provider-rke2/pkg/secret"
 )
 
 // ErrDependentCertificateNotFound is returned when the kubeconfig cannot be generated because the
diff --git a/pkg/registration/registration.go b/pkg/registration/registration.go
index 6bbfc5e..8c23510 100644
--- a/pkg/registration/registration.go
+++ b/pkg/registration/registration.go
@@ -23,7 +23,7 @@ import (
 	clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1"
 	"sigs.k8s.io/cluster-api/util/collections"
 
-	controlplanev1 "github.com/rancher-sandbox/cluster-api-provider-rke2/controlplane/api/v1beta1"
+	controlplanev1 "github.com/rancher/cluster-api-provider-rke2/controlplane/api/v1beta1"
 )
 
 // GetRegistrationAddresses is a function type that is used to provide different implementations of
diff --git a/pkg/rke2/config.go b/pkg/rke2/config.go
index 71af779..b2cc404 100644
--- a/pkg/rke2/config.go
+++ b/pkg/rke2/config.go
@@ -26,10 +26,10 @@ import (
 
 	clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1"
 
-	bootstrapv1 "github.com/rancher-sandbox/cluster-api-provider-rke2/bootstrap/api/v1beta1"
-	controlplanev1 "github.com/rancher-sandbox/cluster-api-provider-rke2/controlplane/api/v1beta1"
-	"github.com/rancher-sandbox/cluster-api-provider-rke2/pkg/consts"
-	bsutil "github.com/rancher-sandbox/cluster-api-provider-rke2/pkg/util"
+	bootstrapv1 "github.com/rancher/cluster-api-provider-rke2/bootstrap/api/v1beta1"
+	controlplanev1 "github.com/rancher/cluster-api-provider-rke2/controlplane/api/v1beta1"
+	"github.com/rancher/cluster-api-provider-rke2/pkg/consts"
+	bsutil "github.com/rancher/cluster-api-provider-rke2/pkg/util"
 )
 
 const (
diff --git a/pkg/rke2/control_plane.go b/pkg/rke2/control_plane.go
index ea35d95..00973b2 100644
--- a/pkg/rke2/control_plane.go
+++ b/pkg/rke2/control_plane.go
@@ -36,8 +36,8 @@ import (
 	capifd "sigs.k8s.io/cluster-api/util/failuredomains"
 	"sigs.k8s.io/cluster-api/util/patch"
 
-	bootstrapv1 "github.com/rancher-sandbox/cluster-api-provider-rke2/bootstrap/api/v1beta1"
-	controlplanev1 "github.com/rancher-sandbox/cluster-api-provider-rke2/controlplane/api/v1beta1"
+	bootstrapv1 "github.com/rancher/cluster-api-provider-rke2/bootstrap/api/v1beta1"
+	controlplanev1 "github.com/rancher/cluster-api-provider-rke2/controlplane/api/v1beta1"
 )
 
 // ControlPlane holds business logic around control planes.
diff --git a/pkg/rke2/machine_filters.go b/pkg/rke2/machine_filters.go
index 653e295..4a56126 100644
--- a/pkg/rke2/machine_filters.go
+++ b/pkg/rke2/machine_filters.go
@@ -9,9 +9,9 @@ import (
 	clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1"
 	"sigs.k8s.io/cluster-api/util/collections"
 
-	bootstrapv1 "github.com/rancher-sandbox/cluster-api-provider-rke2/bootstrap/api/v1beta1"
-	controlplanev1 "github.com/rancher-sandbox/cluster-api-provider-rke2/controlplane/api/v1beta1"
-	bsutil "github.com/rancher-sandbox/cluster-api-provider-rke2/pkg/util"
+	bootstrapv1 "github.com/rancher/cluster-api-provider-rke2/bootstrap/api/v1beta1"
+	controlplanev1 "github.com/rancher/cluster-api-provider-rke2/controlplane/api/v1beta1"
+	bsutil "github.com/rancher/cluster-api-provider-rke2/pkg/util"
 )
 
 // matchesRCPConfiguration returns a filter to find all machines that matches with RCP config and do not require any rollout.
diff --git a/pkg/rke2/management_cluster.go b/pkg/rke2/management_cluster.go
index e71c304..57e3c45 100644
--- a/pkg/rke2/management_cluster.go
+++ b/pkg/rke2/management_cluster.go
@@ -38,7 +38,7 @@ import (
 	"sigs.k8s.io/cluster-api/util/certs"
 	"sigs.k8s.io/cluster-api/util/collections"
 
-	"github.com/rancher-sandbox/cluster-api-provider-rke2/pkg/secret"
+	"github.com/rancher/cluster-api-provider-rke2/pkg/secret"
 )
 
 const (
diff --git a/pkg/rke2/registries.go b/pkg/rke2/registries.go
index fef023d..3c82909 100644
--- a/pkg/rke2/registries.go
+++ b/pkg/rke2/registries.go
@@ -20,8 +20,8 @@ import (
 	apierrors "k8s.io/apimachinery/pkg/api/errors"
 	"k8s.io/apimachinery/pkg/types"
 
-	bootstrapv1 "github.com/rancher-sandbox/cluster-api-provider-rke2/bootstrap/api/v1beta1"
-	bsutil "github.com/rancher-sandbox/cluster-api-provider-rke2/pkg/util"
+	bootstrapv1 "github.com/rancher/cluster-api-provider-rke2/bootstrap/api/v1beta1"
+	bsutil "github.com/rancher/cluster-api-provider-rke2/pkg/util"
 )
 
 const (
diff --git a/pkg/rke2/registries_types.go b/pkg/rke2/registries_types.go
index f0e7270..cb86c27 100644
--- a/pkg/rke2/registries_types.go
+++ b/pkg/rke2/registries_types.go
@@ -21,7 +21,7 @@ import (
 	"github.com/go-logr/logr"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 
-	bootstrapv1 "github.com/rancher-sandbox/cluster-api-provider-rke2/bootstrap/api/v1beta1"
+	bootstrapv1 "github.com/rancher/cluster-api-provider-rke2/bootstrap/api/v1beta1"
 )
 
 // Mirror contains the config related to the registry mirror.
diff --git a/pkg/rke2/workload_cluster.go b/pkg/rke2/workload_cluster.go
index fa9be68..ff9de26 100644
--- a/pkg/rke2/workload_cluster.go
+++ b/pkg/rke2/workload_cluster.go
@@ -42,8 +42,8 @@ import (
 	"sigs.k8s.io/cluster-api/util/conditions"
 	"sigs.k8s.io/cluster-api/util/patch"
 
-	controlplanev1 "github.com/rancher-sandbox/cluster-api-provider-rke2/controlplane/api/v1beta1"
-	"github.com/rancher-sandbox/cluster-api-provider-rke2/pkg/etcd"
+	controlplanev1 "github.com/rancher/cluster-api-provider-rke2/controlplane/api/v1beta1"
+	"github.com/rancher/cluster-api-provider-rke2/pkg/etcd"
 )
 
 const (
diff --git a/pkg/rke2/workload_cluster_etcd.go b/pkg/rke2/workload_cluster_etcd.go
index 13593ee..81d791d 100644
--- a/pkg/rke2/workload_cluster_etcd.go
+++ b/pkg/rke2/workload_cluster_etcd.go
@@ -28,7 +28,7 @@ import (
 
 	clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1"
 
-	etcdutil "github.com/rancher-sandbox/cluster-api-provider-rke2/pkg/etcd/util"
+	etcdutil "github.com/rancher/cluster-api-provider-rke2/pkg/etcd/util"
 )
 
 // ReconcileEtcdMembers iterates over all etcd members and finds members that do not have corresponding nodes.
diff --git a/pkg/secret/certificates.go b/pkg/secret/certificates.go
index 74322c8..1cb452d 100644
--- a/pkg/secret/certificates.go
+++ b/pkg/secret/certificates.go
@@ -37,8 +37,8 @@ import (
 	clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1"
 	"sigs.k8s.io/cluster-api/util/certs"
 
-	bootstrapv1 "github.com/rancher-sandbox/cluster-api-provider-rke2/bootstrap/api/v1beta1"
-	"github.com/rancher-sandbox/cluster-api-provider-rke2/pkg/consts"
+	bootstrapv1 "github.com/rancher/cluster-api-provider-rke2/bootstrap/api/v1beta1"
+	"github.com/rancher/cluster-api-provider-rke2/pkg/consts"
 )
 
 const (
diff --git a/pkg/util/util.go b/pkg/util/util.go
index c49df1d..fbd9c97 100644
--- a/pkg/util/util.go
+++ b/pkg/util/util.go
@@ -30,8 +30,8 @@ import (
 
 	clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1"
 
-	bootstrapv1 "github.com/rancher-sandbox/cluster-api-provider-rke2/bootstrap/api/v1beta1"
-	controlplanev1 "github.com/rancher-sandbox/cluster-api-provider-rke2/controlplane/api/v1beta1"
+	bootstrapv1 "github.com/rancher/cluster-api-provider-rke2/bootstrap/api/v1beta1"
+	controlplanev1 "github.com/rancher/cluster-api-provider-rke2/controlplane/api/v1beta1"
 )
 
 const (
diff --git a/samples/aws/README.md b/samples/aws/README.md
index 4c91656..1a63918 100644
--- a/samples/aws/README.md
+++ b/samples/aws/README.md
@@ -2,7 +2,7 @@
 This README focuses on using the RKE2 provider with the AWS Infrastructure provider.
 
 ## Setting up the Management Cluster
-Make sure your set up a Management Cluster to use with Cluster API, example [here in the main README](https://github.com/rancher-sandbox/cluster-api-provider-rke2#management-cluster).
+Make sure your set up a Management Cluster to use with Cluster API, example [here in the main README](https://github.com/rancher/cluster-api-provider-rke2#management-cluster).
 
 ## Deploying the Cluster API AWS Infrastructure Provider
 
@@ -42,7 +42,7 @@ export AWS_AMI_ID="ami-id"
 Now, we can generate the YAML files from the templates using `clusterctl generate yaml` command:
 
 ```bash
-clusterctl generate cluster --from https://github.com/rancher-sandbox/cluster-api-provider-rke2/blob/main/samples/aws/internal/cluster-template.yaml -n example-aws rke2-aws > aws-rke2-clusterctl.yaml
+clusterctl generate cluster --from https://github.com/rancher/cluster-api-provider-rke2/blob/main/samples/aws/internal/cluster-template.yaml -n example-aws rke2-aws > aws-rke2-clusterctl.yaml
 ```
 
 After examining the result YAML file, you can apply to the management cluster using :
@@ -100,6 +100,6 @@ export AWS_S3_BUCKET_NAME=<YOUR_AWS_S3_BUCKET_NAME>
 Now you can generate manifests from the cluster template:
 
 ```bash
-clusterctl generate cluster --from https://github.com/rancher-sandbox/cluster-api-provider-rke2/blob/main/samples/aws/ignition-external/cluster-template-aws-ignition-external-cloud-provider.yaml -n example-aws rke2-aws > aws-rke2-clusterctl.yaml
+clusterctl generate cluster --from https://github.com/rancher/cluster-api-provider-rke2/blob/main/samples/aws/ignition-external/cluster-template-aws-ignition-external-cloud-provider.yaml -n example-aws rke2-aws > aws-rke2-clusterctl.yaml
 ```
 


Test patch:
diff --git a/bootstrap/api/v1alpha1/conversion_test.go b/bootstrap/api/v1alpha1/conversion_test.go
index 8af314e..366c78e 100644
--- a/bootstrap/api/v1alpha1/conversion_test.go
+++ b/bootstrap/api/v1alpha1/conversion_test.go
@@ -26,7 +26,7 @@ import (
 	"k8s.io/apimachinery/pkg/runtime"
 	runtimeserializer "k8s.io/apimachinery/pkg/runtime/serializer"
 
-	bootstrapv1 "github.com/rancher-sandbox/cluster-api-provider-rke2/bootstrap/api/v1beta1"
+	bootstrapv1 "github.com/rancher/cluster-api-provider-rke2/bootstrap/api/v1beta1"
 	utilconversion "sigs.k8s.io/cluster-api/util/conversion"
 )
 
diff --git a/bootstrap/internal/controllers/suite_test.go b/bootstrap/internal/controllers/suite_test.go
index 6aec8ea..ebfcda7 100644
--- a/bootstrap/internal/controllers/suite_test.go
+++ b/bootstrap/internal/controllers/suite_test.go
@@ -30,7 +30,7 @@ import (
 	logf "sigs.k8s.io/controller-runtime/pkg/log"
 	"sigs.k8s.io/controller-runtime/pkg/log/zap"
 
-	bootstrapv1 "github.com/rancher-sandbox/cluster-api-provider-rke2/bootstrap/api/v1beta1"
+	bootstrapv1 "github.com/rancher/cluster-api-provider-rke2/bootstrap/api/v1beta1"
 )
 
 // These tests use Ginkgo (BDD-style Go testing framework). Refer to
diff --git a/bootstrap/internal/ignition/butane/butane_test.go b/bootstrap/internal/ignition/butane/butane_test.go
index 4063077..b64c106 100644
--- a/bootstrap/internal/ignition/butane/butane_test.go
+++ b/bootstrap/internal/ignition/butane/butane_test.go
@@ -27,8 +27,8 @@ import (
 
 	"k8s.io/utils/pointer"
 
-	bootstrapv1 "github.com/rancher-sandbox/cluster-api-provider-rke2/bootstrap/api/v1beta1"
-	"github.com/rancher-sandbox/cluster-api-provider-rke2/bootstrap/internal/cloudinit"
+	bootstrapv1 "github.com/rancher/cluster-api-provider-rke2/bootstrap/api/v1beta1"
+	"github.com/rancher/cluster-api-provider-rke2/bootstrap/internal/cloudinit"
 )
 
 func TestButane(t *testing.T) {
diff --git a/bootstrap/internal/ignition/ignition_test.go b/bootstrap/internal/ignition/ignition_test.go
index 67a247e..1336ac0 100644
--- a/bootstrap/internal/ignition/ignition_test.go
+++ b/bootstrap/internal/ignition/ignition_test.go
@@ -23,8 +23,8 @@ import (
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 
-	bootstrapv1 "github.com/rancher-sandbox/cluster-api-provider-rke2/bootstrap/api/v1beta1"
-	"github.com/rancher-sandbox/cluster-api-provider-rke2/bootstrap/internal/cloudinit"
+	bootstrapv1 "github.com/rancher/cluster-api-provider-rke2/bootstrap/api/v1beta1"
+	"github.com/rancher/cluster-api-provider-rke2/bootstrap/internal/cloudinit"
 )
 
 func TestIgnition(t *testing.T) {
diff --git a/controlplane/api/v1alpha1/conversion_test.go b/controlplane/api/v1alpha1/conversion_test.go
index b38d703..a3442f3 100644
--- a/controlplane/api/v1alpha1/conversion_test.go
+++ b/controlplane/api/v1alpha1/conversion_test.go
@@ -24,7 +24,7 @@ import (
 	"k8s.io/apimachinery/pkg/api/apitesting/fuzzer"
 	"k8s.io/apimachinery/pkg/runtime"
 
-	controlplanev1 "github.com/rancher-sandbox/cluster-api-provider-rke2/controlplane/api/v1beta1"
+	controlplanev1 "github.com/rancher/cluster-api-provider-rke2/controlplane/api/v1beta1"
 	utilconversion "sigs.k8s.io/cluster-api/util/conversion"
 )
 
diff --git a/controlplane/internal/controllers/rke2controlplane_controller_test.go b/controlplane/internal/controllers/rke2controlplane_controller_test.go
index 6981a3a..4893d1a 100644
--- a/controlplane/internal/controllers/rke2controlplane_controller_test.go
+++ b/controlplane/internal/controllers/rke2controlplane_controller_test.go
@@ -3,11 +3,11 @@ package controllers
 import (
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
-	bootstrapv1 "github.com/rancher-sandbox/cluster-api-provider-rke2/bootstrap/api/v1beta1"
-	controlplanev1 "github.com/rancher-sandbox/cluster-api-provider-rke2/controlplane/api/v1beta1"
+	bootstrapv1 "github.com/rancher/cluster-api-provider-rke2/bootstrap/api/v1beta1"
+	controlplanev1 "github.com/rancher/cluster-api-provider-rke2/controlplane/api/v1beta1"
 
-	// "github.com/rancher-sandbox/cluster-api-provider-rke2/pkg/kubeconfig"
-	"github.com/rancher-sandbox/cluster-api-provider-rke2/pkg/rke2"
+	// "github.com/rancher/cluster-api-provider-rke2/pkg/kubeconfig"
+	"github.com/rancher/cluster-api-provider-rke2/pkg/rke2"
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1"
diff --git a/controlplane/internal/controllers/suite_test.go b/controlplane/internal/controllers/suite_test.go
index 209807d..0ea271f 100644
--- a/controlplane/internal/controllers/suite_test.go
+++ b/controlplane/internal/controllers/suite_test.go
@@ -29,9 +29,9 @@ import (
 	. "github.com/onsi/gomega"
 
 	// +kubebuilder:scaffold:imports
-	bootstrapv1 "github.com/rancher-sandbox/cluster-api-provider-rke2/bootstrap/api/v1beta1"
-	controlplanev1 "github.com/rancher-sandbox/cluster-api-provider-rke2/controlplane/api/v1beta1"
-	"github.com/rancher-sandbox/cluster-api-provider-rke2/test/helpers"
+	bootstrapv1 "github.com/rancher/cluster-api-provider-rke2/bootstrap/api/v1beta1"
+	controlplanev1 "github.com/rancher/cluster-api-provider-rke2/controlplane/api/v1beta1"
+	"github.com/rancher/cluster-api-provider-rke2/test/helpers"
 	clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1"
 )
 
diff --git a/pkg/etcd/client_generator_test.go b/pkg/etcd/client_generator_test.go
index 62adb99..a509d0f 100644
--- a/pkg/etcd/client_generator_test.go
+++ b/pkg/etcd/client_generator_test.go
@@ -24,7 +24,7 @@ import (
 
 	. "github.com/onsi/gomega"
 	"github.com/pkg/errors"
-	"github.com/rancher-sandbox/cluster-api-provider-rke2/pkg/etcd/fake"
+	"github.com/rancher/cluster-api-provider-rke2/pkg/etcd/fake"
 
 	"go.etcd.io/etcd/api/v3/etcdserverpb"
 	clientv3 "go.etcd.io/etcd/client/v3"
diff --git a/pkg/etcd/etcd_test.go b/pkg/etcd/etcd_test.go
index e75df4b..a1b7711 100644
--- a/pkg/etcd/etcd_test.go
+++ b/pkg/etcd/etcd_test.go
@@ -21,7 +21,7 @@ import (
 
 	. "github.com/onsi/gomega"
 	"github.com/pkg/errors"
-	etcdfake "github.com/rancher-sandbox/cluster-api-provider-rke2/pkg/etcd/fake"
+	etcdfake "github.com/rancher/cluster-api-provider-rke2/pkg/etcd/fake"
 	"go.etcd.io/etcd/api/v3/etcdserverpb"
 	clientv3 "go.etcd.io/etcd/client/v3"
 	ctrl "sigs.k8s.io/controller-runtime"
diff --git a/pkg/registration/registration_test.go b/pkg/registration/registration_test.go
index bebfb08..9f8055b 100644
--- a/pkg/registration/registration_test.go
+++ b/pkg/registration/registration_test.go
@@ -22,8 +22,8 @@ import (
 	. "github.com/onsi/gomega"
 	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 
-	controlplanev1 "github.com/rancher-sandbox/cluster-api-provider-rke2/controlplane/api/v1beta1"
-	"github.com/rancher-sandbox/cluster-api-provider-rke2/pkg/registration"
+	controlplanev1 "github.com/rancher/cluster-api-provider-rke2/controlplane/api/v1beta1"
+	"github.com/rancher/cluster-api-provider-rke2/pkg/registration"
 	clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1"
 	"sigs.k8s.io/cluster-api/util/collections"
 )
diff --git a/pkg/rke2/config_test.go b/pkg/rke2/config_test.go
index 614e454..eb42658 100644
--- a/pkg/rke2/config_test.go
+++ b/pkg/rke2/config_test.go
@@ -27,9 +27,9 @@ import (
 
 	"sigs.k8s.io/cluster-api/api/v1beta1"
 
-	bootstrapv1 "github.com/rancher-sandbox/cluster-api-provider-rke2/bootstrap/api/v1beta1"
-	controlplanev1 "github.com/rancher-sandbox/cluster-api-provider-rke2/controlplane/api/v1beta1"
-	"github.com/rancher-sandbox/cluster-api-provider-rke2/pkg/consts"
+	bootstrapv1 "github.com/rancher/cluster-api-provider-rke2/bootstrap/api/v1beta1"
+	controlplanev1 "github.com/rancher/cluster-api-provider-rke2/controlplane/api/v1beta1"
+	"github.com/rancher/cluster-api-provider-rke2/pkg/consts"
 )
 
 var _ = Describe("RKE2ServerConfig", func() {
diff --git a/pkg/rke2/machine_filters_test.go b/pkg/rke2/machine_filters_test.go
index 529a9a0..92a55cd 100644
--- a/pkg/rke2/machine_filters_test.go
+++ b/pkg/rke2/machine_filters_test.go
@@ -10,8 +10,8 @@ import (
 	clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1"
 	"sigs.k8s.io/cluster-api/util/collections"
 
-	bootstrapv1 "github.com/rancher-sandbox/cluster-api-provider-rke2/bootstrap/api/v1beta1"
-	controlplanev1 "github.com/rancher-sandbox/cluster-api-provider-rke2/controlplane/api/v1beta1"
+	bootstrapv1 "github.com/rancher/cluster-api-provider-rke2/bootstrap/api/v1beta1"
+	controlplanev1 "github.com/rancher/cluster-api-provider-rke2/controlplane/api/v1beta1"
 )
 
 var (
diff --git a/pkg/rke2/registries_test.go b/pkg/rke2/registries_test.go
index 0458974..35ee0f9 100644
--- a/pkg/rke2/registries_test.go
+++ b/pkg/rke2/registries_test.go
@@ -27,7 +27,7 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/client/fake"
 	"sigs.k8s.io/controller-runtime/pkg/log"
 
-	bootstrapv1 "github.com/rancher-sandbox/cluster-api-provider-rke2/bootstrap/api/v1beta1"
+	bootstrapv1 "github.com/rancher/cluster-api-provider-rke2/bootstrap/api/v1beta1"
 )
 
 var _ = Describe("RKE2RegistryConfig", func() {
diff --git a/pkg/rke2/suite_test.go b/pkg/rke2/suite_test.go
index ba3187c..bed8f8a 100644
--- a/pkg/rke2/suite_test.go
+++ b/pkg/rke2/suite_test.go
@@ -13,9 +13,9 @@ import (
 	. "github.com/onsi/gomega"
 
 	// +kubebuilder:scaffold:imports
-	bootstrapv1 "github.com/rancher-sandbox/cluster-api-provider-rke2/bootstrap/api/v1beta1"
-	controlplanev1 "github.com/rancher-sandbox/cluster-api-provider-rke2/controlplane/api/v1beta1"
-	"github.com/rancher-sandbox/cluster-api-provider-rke2/test/helpers"
+	bootstrapv1 "github.com/rancher/cluster-api-provider-rke2/bootstrap/api/v1beta1"
+	controlplanev1 "github.com/rancher/cluster-api-provider-rke2/controlplane/api/v1beta1"
+	"github.com/rancher/cluster-api-provider-rke2/test/helpers"
 	clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1"
 )
 
diff --git a/pkg/rke2/workload_cluster_etcd_test.go b/pkg/rke2/workload_cluster_etcd_test.go
index 40495ba..2730fba 100644
--- a/pkg/rke2/workload_cluster_etcd_test.go
+++ b/pkg/rke2/workload_cluster_etcd_test.go
@@ -24,7 +24,7 @@ import (
 
 	"github.com/blang/semver/v4"
 	. "github.com/onsi/gomega"
-	"github.com/rancher-sandbox/cluster-api-provider-rke2/pkg/etcd"
+	"github.com/rancher/cluster-api-provider-rke2/pkg/etcd"
 	pb "go.etcd.io/etcd/api/v3/etcdserverpb"
 	clientv3 "go.etcd.io/etcd/client/v3"
 	appsv1 "k8s.io/api/apps/v1"
@@ -36,7 +36,7 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/client"
 	"sigs.k8s.io/controller-runtime/pkg/client/fake"
 
-	etcdfake "github.com/rancher-sandbox/cluster-api-provider-rke2/pkg/etcd/fake"
+	etcdfake "github.com/rancher/cluster-api-provider-rke2/pkg/etcd/fake"
 	clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1"
 )
 
diff --git a/pkg/rke2/workload_cluster_test.go b/pkg/rke2/workload_cluster_test.go
index efcf510..3277ca9 100644
--- a/pkg/rke2/workload_cluster_test.go
+++ b/pkg/rke2/workload_cluster_test.go
@@ -6,8 +6,8 @@ import (
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 	"github.com/pkg/errors"
-	bootstrapv1 "github.com/rancher-sandbox/cluster-api-provider-rke2/bootstrap/api/v1beta1"
-	controlplanev1 "github.com/rancher-sandbox/cluster-api-provider-rke2/controlplane/api/v1beta1"
+	bootstrapv1 "github.com/rancher/cluster-api-provider-rke2/bootstrap/api/v1beta1"
+	controlplanev1 "github.com/rancher/cluster-api-provider-rke2/controlplane/api/v1beta1"
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/types"
diff --git a/test/e2e/config/e2e_conf.yaml b/test/e2e/config/e2e_conf.yaml
index 2582d8b..53216b9 100644
--- a/test/e2e/config/e2e_conf.yaml
+++ b/test/e2e/config/e2e_conf.yaml
@@ -1,9 +1,9 @@
 managementClusterName: caprke2-e2e
 
 images:
-  - name: ghcr.io/rancher-sandbox/cluster-api-provider-rke2-bootstrap:v0.4.0
+  - name: ghcr.io/rancher/cluster-api-provider-rke2-bootstrap:v0.4.0
     loadBehavior: tryLoad
-  - name: ghcr.io/rancher-sandbox/cluster-api-provider-rke2-controlplane:v0.4.0
+  - name: ghcr.io/rancher/cluster-api-provider-rke2-controlplane:v0.4.0
     loadBehavior: tryLoad
   - name: ghcr.io/rancher/cluster-api-provider-rke2-bootstrap:dev
     loadBehavior: mustLoad
@@ -53,7 +53,7 @@ providers:
     type: ControlPlaneProvider
     versions:
     - name: "v0.2.7"
-      value: "https://github.com/rancher-sandbox/cluster-api-provider-rke2/releases/download/v0.2.7/control-plane-components.yaml"
+      value: "https://github.com/rancher/cluster-api-provider-rke2/releases/download/v0.2.7/control-plane-components.yaml"
       type: "url"
       contract: v1beta1
       files:
@@ -65,7 +65,7 @@ providers:
         - old: "--leader-elect"
           new: "--leader-elect=false"
     - name: "v0.3.0"
-      value: "https://github.com/rancher-sandbox/cluster-api-provider-rke2/releases/download/v0.3.0/control-plane-components.yaml"
+      value: "https://github.com/rancher/cluster-api-provider-rke2/releases/download/v0.3.0/control-plane-components.yaml"
       type: "url"
       contract: v1beta1
       files:
@@ -77,7 +77,7 @@ providers:
         - old: "--leader-elect"
           new: "--leader-elect=false"
     - name: "v0.4.0"
-      value: "https://github.com/rancher-sandbox/cluster-api-provider-rke2/releases/download/v0.4.0/control-plane-components.yaml"
+      value: "https://github.com/rancher/cluster-api-provider-rke2/releases/download/v0.4.0/control-plane-components.yaml"
       type: "url"
       contract: v1beta1
       files:
@@ -103,7 +103,7 @@ providers:
     type: BootstrapProvider
     versions:
     - name: "v0.2.7"
-      value: "https://github.com/rancher-sandbox/cluster-api-provider-rke2/releases/download/v0.2.7/bootstrap-components.yaml"
+      value: "https://github.com/rancher/cluster-api-provider-rke2/releases/download/v0.2.7/bootstrap-components.yaml"
       type: "url"
       contract: v1beta1
       files:
@@ -115,7 +115,7 @@ providers:
         - old: "--leader-elect"
           new: "--leader-elect=false"
     - name: "v0.3.0"
-      value: "https://github.com/rancher-sandbox/cluster-api-provider-rke2/releases/download/v0.3.0/bootstrap-components.yaml"
+      value: "https://github.com/rancher/cluster-api-provider-rke2/releases/download/v0.3.0/bootstrap-components.yaml"
       type: "url"
       contract: v1beta1
       files:
@@ -127,7 +127,7 @@ providers:
         - old: "--leader-elect"
           new: "--leader-elect=false"
     - name: "v0.4.0"
-      value: "https://github.com/rancher-sandbox/cluster-api-provider-rke2/releases/download/v0.4.0/bootstrap-components.yaml"
+      value: "https://github.com/rancher/cluster-api-provider-rke2/releases/download/v0.4.0/bootstrap-components.yaml"
       type: "url"
       contract: v1beta1
       files:
diff --git a/test/e2e/e2e_suite_test.go b/test/e2e/e2e_suite_test.go
index 4b5cf7c..c7e7688 100644
--- a/test/e2e/e2e_suite_test.go
+++ b/test/e2e/e2e_suite_test.go
@@ -33,9 +33,9 @@ import (
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/klog/v2"
 
-	bootstrapv1 "github.com/rancher-sandbox/cluster-api-provider-rke2/bootstrap/api/v1beta1"
-	controlplanev1alpha1 "github.com/rancher-sandbox/cluster-api-provider-rke2/controlplane/api/v1alpha1"
-	controlplanev1 "github.com/rancher-sandbox/cluster-api-provider-rke2/controlplane/api/v1beta1"
+	bootstrapv1 "github.com/rancher/cluster-api-provider-rke2/bootstrap/api/v1beta1"
+	controlplanev1alpha1 "github.com/rancher/cluster-api-provider-rke2/controlplane/api/v1alpha1"
+	controlplanev1 "github.com/rancher/cluster-api-provider-rke2/controlplane/api/v1beta1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1"
 	clusterv1exp "sigs.k8s.io/cluster-api/exp/api/v1beta1"
diff --git a/test/e2e/helpers.go b/test/e2e/helpers.go
index 0e44a6a..3f48e36 100644
--- a/test/e2e/helpers.go
+++ b/test/e2e/helpers.go
@@ -33,9 +33,9 @@ import (
 	"k8s.io/apimachinery/pkg/types"
 	"k8s.io/klog/v2"
 
-	controlplanev1alpha1 "github.com/rancher-sandbox/cluster-api-provider-rke2/controlplane/api/v1alpha1"
-	controlplanev1 "github.com/rancher-sandbox/cluster-api-provider-rke2/controlplane/api/v1beta1"
-	bsutil "github.com/rancher-sandbox/cluster-api-provider-rke2/pkg/util"
+	controlplanev1alpha1 "github.com/rancher/cluster-api-provider-rke2/controlplane/api/v1alpha1"
+	controlplanev1 "github.com/rancher/cluster-api-provider-rke2/controlplane/api/v1beta1"
+	bsutil "github.com/rancher/cluster-api-provider-rke2/pkg/util"
 	clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1"
 	"sigs.k8s.io/cluster-api/test/framework"
 	"sigs.k8s.io/cluster-api/test/framework/clusterctl"
diff --git a/test/e2e/metadata_e2e_test.go b/test/e2e/metadata_e2e_test.go
index 3b2366f..449b566 100644
--- a/test/e2e/metadata_e2e_test.go
+++ b/test/e2e/metadata_e2e_test.go
@@ -31,7 +31,7 @@ import (
 	corev1 "k8s.io/api/core/v1"
 	"k8s.io/utils/ptr"
 
-	controlplanev1 "github.com/rancher-sandbox/cluster-api-provider-rke2/controlplane/api/v1beta1"
+	controlplanev1 "github.com/rancher/cluster-api-provider-rke2/controlplane/api/v1beta1"
 	clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1"
 	"sigs.k8s.io/controller-runtime/pkg/client"