diff --git a/cmd/control/console.go b/cmd/control/console.go
index 071410c9..84eb4c03 100644
--- a/cmd/control/console.go
+++ b/cmd/control/console.go
@@ -76,7 +76,7 @@ func consoleSwitch(c *cli.Context) error {
 		Privileged: true,
 		Net:        "host",
 		Pid:        "host",
-		Image:      fmt.Sprintf("rancher/os-base:%s", config.VERSION),
+		Image:      config.OS_BASE,
 		Labels: map[string]string{
 			config.SCOPE: config.SYSTEM,
 		},
diff --git a/cmd/control/selinux.go b/cmd/control/selinux.go
index e80ef61c..8b3b3912 100644
--- a/cmd/control/selinux.go
+++ b/cmd/control/selinux.go
@@ -50,7 +50,7 @@ func selinuxCommand() cli.Command {
 			"-v", "/etc/selinux:/etc/selinux",
 			"-v", "/var/lib/selinux:/var/lib/selinux",
 			"-v", "/usr/share/selinux:/usr/share/selinux",
-			fmt.Sprintf("rancher/os-selinuxtools:%s", config.VERSION+config.SUFFIX), "bash"}
+			fmt.Sprintf("%s/os-selinuxtools:%s%s", config.OS_REPO, config.VERSION, config.SUFFIX), "bash"}
 		syscall.Exec("/bin/system-docker", argv, []string{})
 		return nil
 	}
diff --git a/config/types.go b/config/types.go
index 6b2fe5bf..fa49477e 100644
--- a/config/types.go
+++ b/config/types.go
@@ -1,6 +1,7 @@
 package config
 
 import (
+	"fmt"
 	"runtime"
 
 	"github.com/coreos/coreos-cloudinit/config"
@@ -50,6 +51,8 @@ var (
 	VERSION       string
 	ARCH          string
 	SUFFIX        string
+	OS_REPO       string
+	OS_BASE       string
 	PrivateKeys   = []string{
 		"rancher.ssh",
 		"rancher.docker.ca_key",
@@ -69,6 +72,9 @@ func init() {
 	if SUFFIX == "" && ARCH != "amd64" {
 		SUFFIX = "_" + ARCH
 	}
+	if OS_BASE == "" {
+		OS_BASE = fmt.Sprintf("%s/os-base:%s%s", OS_REPO, VERSION, SUFFIX)
+	}
 }
 
 type Repository struct {
diff --git a/scripts/build-target b/scripts/build-target
index ec1da281..ca637dd3 100755
--- a/scripts/build-target
+++ b/scripts/build-target
@@ -15,6 +15,6 @@ fi
 OUTPUT=${OUTPUT:-bin/ros}
 echo Building $OUTPUT
 
-CONST="-X github.com/docker/docker/dockerversion.GitCommit=${COMMIT} -X github.com/docker/docker/dockerversion.Version=${DOCKER_PATCH_VERSION} -X github.com/docker/docker/dockerversion.BuildTime=$(date -u +'%Y-%m-%dT%H:%M:%SZ') -X github.com/docker/docker/dockerversion.IAmStatic=true -X github.com/rancher/os/config.VERSION=${VERSION}"
+CONST="-X github.com/docker/docker/dockerversion.GitCommit=${COMMIT} -X github.com/docker/docker/dockerversion.Version=${DOCKER_PATCH_VERSION} -X github.com/docker/docker/dockerversion.BuildTime=$(date -u +'%Y-%m-%dT%H:%M:%SZ') -X github.com/docker/docker/dockerversion.IAmStatic=true -X github.com/rancher/os/config.VERSION=${VERSION} -X github.com/rancher/os/config.OS_REPO=${OS_REPO}"
 go build -tags "selinux cgo daemon netgo dnspatch" -installsuffix netgo -ldflags "$CONST -linkmode external -extldflags -static" -o ${OUTPUT}
 strip --strip-all ${OUTPUT}