diff --git a/Makefile b/Makefile
index cbbb7b29..c0893fd1 100644
--- a/Makefile
+++ b/Makefile
@@ -50,7 +50,7 @@ E2E_CONF_FILE ?= $(ROOT_DIR)/test/e2e/config/e2e_conf.yaml
 export PATH := $(abspath $(TOOLS_BIN_DIR)):$(PATH)
 
 # Set --output-base for conversion-gen if we are not within GOPATH
-ifneq ($(abspath $(ROOT_DIR)),$(shell go env GOPATH)/src/github.com/rancher-sandbox/cluster-api-provider-rke2)
+ifneq ($(abspath $(ROOT_DIR)),$(shell go env GOPATH)/src/github.com/rancher/cluster-api-provider-rke2)
 	CONVERSION_GEN_OUTPUT_BASE_CAPRKE2 := --output-base=$(ROOT_DIR)/$(CAPRKE2_DIR)
 	CONVERSION_GEN_OUTPUT_BASE_CAPBPR := --output-base=$(ROOT_DIR)/$(CAPBPR_DIR)
 else
@@ -113,7 +113,7 @@ TAG ?= dev
 ARCH ?= $(shell go env GOARCH)
 ALL_ARCH = amd64 arm arm64 ppc64le s390x
 REGISTRY ?= ghcr.io
-ORG ?= rancher-sandbox
+ORG ?= rancher
 CONTROLLER_IMAGE_NAME := cluster-api-provider-rke2
 BOOTSTRAP_IMAGE_NAME := $(CONTROLLER_IMAGE_NAME)-bootstrap
 CONTROLPLANE_IMAGE_NAME = $(CONTROLLER_IMAGE_NAME)-controlplane
@@ -466,7 +466,7 @@ release-manifests: $(RELEASE_DIR) $(KUSTOMIZE) ## Build the manifests to publish
 .PHONY: release-notes
 release-notes: $(RELEASE_DIR) $(GH)
 	if [ -n "${PRE_RELEASE}" ]; then \
-	echo ":rotating_light: This is a RELEASE CANDIDATE. Use it only for testing purposes. If you find any bugs, file an [issue](https://github.com/rancher-sandbox/cluster-api-provider-rke2/issues/new)." > $(RELEASE_DIR)/CHANGELOG.md; \
+	echo ":rotating_light: This is a RELEASE CANDIDATE. Use it only for testing purposes. If you find any bugs, file an [issue](https://github.com/rancher/cluster-api-provider-rke2/issues/new)." > $(RELEASE_DIR)/CHANGELOG.md; \
 	else \
 	$(GH) api repos/$(ORG)/$(GH_REPO_NAME)/releases/generate-notes -F tag_name=$(VERSION) -F previous_tag_name=$(PREVIOUS_VERSION) --jq '.body' > $(RELEASE_DIR)/CHANGELOG.md; \
 	fi
diff --git a/bootstrap/config/default/manager_image_patch.yaml b/bootstrap/config/default/manager_image_patch.yaml
index 3f091cd1..31774009 100644
--- a/bootstrap/config/default/manager_image_patch.yaml
+++ b/bootstrap/config/default/manager_image_patch.yaml
@@ -7,5 +7,5 @@ spec:
   template:
     spec:
       containers:
-        - image: ghcr.io/rancher-sandbox/cluster-api-provider-rke2-bootstrap:dev
+        - image: ghcr.io/rancher/cluster-api-provider-rke2-bootstrap:dev
           name: manager
\ No newline at end of file
diff --git a/controlplane/config/default/manager_image_patch.yaml b/controlplane/config/default/manager_image_patch.yaml
index df030422..8e19484f 100644
--- a/controlplane/config/default/manager_image_patch.yaml
+++ b/controlplane/config/default/manager_image_patch.yaml
@@ -7,5 +7,5 @@ spec:
   template:
     spec:
       containers:
-        - image: ghcr.io/rancher-sandbox/cluster-api-provider-rke2-controlplane:dev
+        - image: ghcr.io/rancher/cluster-api-provider-rke2-controlplane:dev
           name: manager
\ No newline at end of file
diff --git a/test/e2e/config/e2e_conf.yaml b/test/e2e/config/e2e_conf.yaml
index 0928ffe7..2e30d4a1 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:dev
+  - name: ghcr.io/rancher/cluster-api-provider-rke2-bootstrap:dev
     loadBehavior: mustLoad
-  - name: ghcr.io/rancher-sandbox/cluster-api-provider-rke2-controlplane:dev
+  - name: ghcr.io/rancher/cluster-api-provider-rke2-controlplane:dev
     loadBehavior: mustLoad
 
 providers:
diff --git a/tilt-provider.json b/tilt-provider.json
index ac99f3f4..6642138e 100644
--- a/tilt-provider.json
+++ b/tilt-provider.json
@@ -3,7 +3,7 @@
       "name": "rke2-control-plane",
       "config": {
         "context": "controlplane",
-        "image": "ghcr.io/rancher-sandbox/cluster-api-provider-rke2-controlplane:dev",
+        "image": "ghcr.io/rancher/cluster-api-provider-rke2-controlplane:dev",
         "live_reload_deps": [
           "main.go",
           "go.mod",
@@ -21,7 +21,7 @@
         "name": "rke2-bootstrap",
         "config": {
           "context": "bootstrap",
-          "image": "ghcr.io/rancher-sandbox/cluster-api-provider-rke2-bootstrap:dev",
+          "image": "ghcr.io/rancher/cluster-api-provider-rke2-bootstrap:dev",
           "live_reload_deps": [
             "main.go",
             "go.mod",