diff --git a/build/build-image/Dockerfile b/build/build-image/Dockerfile
index edd5c346bfe..a16210480db 100644
--- a/build/build-image/Dockerfile
+++ b/build/build-image/Dockerfile
@@ -44,7 +44,7 @@ RUN mkdir -p /usr/local/src/etcd &&\
 # Mark this as a kube-build container
 RUN touch /kube-build-image
 
-WORKDIR /go/src/github.com/GoogleCloudPlatform/kubernetes
+WORKDIR /go/src/k8s.io/kubernetes
 
 # Propagate the git tree version into the build image
 ADD kube-version-defs /kube-version-defs
@@ -54,4 +54,4 @@ ENV KUBE_GIT_VERSION_FILE /kube-version-defs
 ENV KUBE_OUTPUT_SUBPATH _output/dockerized
 
 # Upload Kubernetes source
-ADD kube-source.tar.gz /go/src/github.com/GoogleCloudPlatform/kubernetes
+ADD kube-source.tar.gz /go/src/k8s.io/kubernetes
diff --git a/hack/lib/golang.sh b/hack/lib/golang.sh
old mode 100644
new mode 100755
index f0fe3bd1be8..18b839315dc
--- a/hack/lib/golang.sh
+++ b/hack/lib/golang.sh
@@ -15,7 +15,7 @@
 # limitations under the License.
 
 # The golang package that we are building.
-readonly KUBE_GO_PACKAGE=github.com/GoogleCloudPlatform/kubernetes
+readonly KUBE_GO_PACKAGE=k8s.io/kubernetes
 readonly KUBE_GOPATH="${KUBE_OUTPUT}/go"
 
 # Load contrib target functions
diff --git a/shippable.yml b/shippable.yml
index 28a369e0711..c36402bab61 100644
--- a/shippable.yml
+++ b/shippable.yml
@@ -17,6 +17,7 @@ before_install:
   - if [[ $SHIPPABLE_GO_VERSION == *release* ]]; then gvm install release; gvm use release; fi
   - if [[ $SHIPPABLE_GO_VERSION =~ [0-9].[0-9] ]]; then gvm install go$SHIPPABLE_GO_VERSION; gvm use go$SHIPPABLE_GO_VERSION; fi
   - export GOPATH=$SHIPPABLE_GOPATH
+  - mkdir -p /root/workspace/src/k8s.io; mv /root/workspace/src/github.com/GoogleCloudPlatform/kubernetes /root/workspace/src/k8s.io/kubernetes
 
 install:
   - go get golang.org/x/tools/cmd/cover