diff --git a/build/build-image/cross/Dockerfile b/build/build-image/cross/Dockerfile
index cdcd79f0270..f411262b543 100644
--- a/build/build-image/cross/Dockerfile
+++ b/build/build-image/cross/Dockerfile
@@ -79,7 +79,7 @@ RUN export ETCD_VERSION=v3.0.14; \
   && ln -s ../src/etcd/etcd-${ETCD_VERSION}-linux-amd64/etcd /usr/local/bin/
 
 # TODO: Remove the need for two golang versions; when we use go1.8 for all other builds we can remove this
-ENV K8S_GOLANG_EDGE_VERSION=1.8rc1 \
+ENV K8S_GOLANG_EDGE_VERSION=1.8rc2 \
     K8S_EDGE_GOROOT=/usr/local/go_k8s_edge
 RUN mkdir -p ${K8S_EDGE_GOROOT} \
   && curl -sSL https://golang.org/dl/go${K8S_GOLANG_EDGE_VERSION}.linux-amd64.tar.gz | tar -xz -C ${K8S_EDGE_GOROOT} --strip-components=1
diff --git a/cluster/addons/addon-manager/CHANGELOG.md b/cluster/addons/addon-manager/CHANGELOG.md
index 60615e819a0..d29def9671b 100644
--- a/cluster/addons/addon-manager/CHANGELOG.md
+++ b/cluster/addons/addon-manager/CHANGELOG.md
@@ -1,4 +1,4 @@
-### Version 6.2 (Wed January 18 2017 Lucas Käldström <lucas.kaldstrom@hotmail.co.uk>)
+### Version 6.3 (Fri January 27 2017 Lucas Käldström <lucas.kaldstrom@hotmail.co.uk>)
  - Updated the arm base image to `armhf/busybox` and now using qemu v2.7 for emulation.
 
 ### Version 6.2 (Thu January 12 2017 Zihong Zheng <zihongz@google.com>)