diff --git a/Dockerfile b/Dockerfile
index eac1c28..88251b0 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
 FROM golang:1.5.1
 
-COPY . /go/src/github.com/jfrazelle/go
-WORKDIR /go/src/github.com/jfrazelle/go
+COPY . /go/src/github.com/docker/go
+WORKDIR /go/src/github.com/docker/go
diff --git a/Makefile b/Makefile
index 01b4c89..4c04488 100644
--- a/Makefile
+++ b/Makefile
@@ -20,10 +20,10 @@ run_patch: download_go_src
 update: run_patch clean
 
 docker:
-	docker build --rm --force-rm -t jfrazelle/go .
+	docker build --rm --force-rm -t docker/go .
 
 test: docker
-	docker run --rm jfrazelle/go go test ./...
+	docker run --rm docker/go go test ./...
 
 
 clean:
diff --git a/README.md b/README.md
index 3e1f3c8..730b880 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-[![Circle CI](https://circleci.com/gh/jfrazelle/go.svg?style=svg)](https://circleci.com/gh/jfrazelle/go)
+[![Circle CI](https://circleci.com/gh/docker/go.svg?style=svg)](https://circleci.com/gh/docker/go)
 
 This is a repository used for building go packages based off upstream with
 small patches.