diff --git a/.drone.yml b/.drone.yml
index 3d06e3d761..aace97541b 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -42,7 +42,7 @@ steps:
     dockerfile: package/Dockerfile
     password:
       from_secret: docker_password
-    repo: "ibuildthecloud/k3s"
+    repo: "rancher/k3s"
     tag: "${DRONE_TAG}-amd64"
     username:
       from_secret: docker_username
@@ -104,7 +104,7 @@ steps:
     dockerfile: package/Dockerfile
     password:
       from_secret: docker_password
-    repo: "ibuildthecloud/k3s"
+    repo: "rancher/k3s"
     tag: "${DRONE_TAG}-arm64"
     username:
       from_secret: docker_username
@@ -166,7 +166,7 @@ steps:
     dockerfile: package/Dockerfile
     password:
       from_secret: docker_password
-    repo: "ibuildthecloud/k3s"
+    repo: "rancher/k3s"
     tag: "${DRONE_TAG}-arm"
     username:
       from_secret: docker_username
@@ -204,8 +204,8 @@ steps:
       - linux/amd64
       - linux/arm64
       - linux/arm
-    target: "ibuildthecloud/k3s:${DRONE_TAG}"
-    template: "ibuildthecloud/k3s:${DRONE_TAG}-ARCH"
+    target: "rancher/k3s:${DRONE_TAG}"
+    template: "rancher/k3s:${DRONE_TAG}-ARCH"
   when:
     instance:
     - drone-publish.rancher.io
diff --git a/docker-compose.yml b/docker-compose.yml
index 9e610f79dd..e5e08f1948 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,7 +1,7 @@
 version: '3'
 services:
   server:
-    image: ibuildthecloud/k3s:v0.1.0-rc3
+    image: rancher/k3s:v0.1.0-rc6
     command: server --disable-agent
     environment:
     - K3S_CLUSTER_SECRET=somethingtotallyrandom
@@ -15,7 +15,7 @@ services:
     - 6443:6443
 
   node:
-    image: ibuildthecloud/k3s:v0.1.0-rc3
+    image: rancher/k3s:v0.1.0-rc6
     tmpfs:
     - /run
     - /var/run
diff --git a/install.sh b/install.sh
index a6449e8846..6e34d8a5c7 100755
--- a/install.sh
+++ b/install.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 set -e
 
-VERSION=v0.1.0-rc3
+VERSION=v0.1.0-rc6
 
 info()
 {
@@ -41,13 +41,13 @@ case $ARCH in
         fatal Unknown architecture $ARCH
 esac
 
-BINURL=https://github.com/ibuildthecloud/k3s/releases/download/${VERSION}/k3s${SUFFIX}
-HASHURL=https://github.com/ibuildthecloud/k3s/releases/download/${VERSION}/sha256sum-${ARCH}.txt
+BINURL=https://github.com/rancher/k3s/releases/download/${VERSION}/k3s${SUFFIX}
+HASHURL=https://github.com/rancher/k3s/releases/download/${VERSION}/sha256sum-${ARCH}.txt
 
 if [ -d /run/systemd ]; then
     SYSTEMD=true
 else
-    fatal "Can not find systemd or Docker to use as a process supervisor for k3s"
+    fatal "Can not find systemd to use as a process supervisor for k3s"
 fi
 
 SUDO=sudo