diff --git a/docker/go-1.6.3/Dockerfile b/docker/go-1.6.3/Dockerfile
new file mode 100644
index 0000000..a09270c
--- /dev/null
+++ b/docker/go-1.6.3/Dockerfile
@@ -0,0 +1,17 @@
+# Go cross compiler (xgo): Go 1.6.3
+# Copyright (c) 2016 Péter Szilágyi. All rights reserved.
+#
+# Released under the MIT license.
+
+FROM karalabe/xgo-base
+
+MAINTAINER Péter Szilágyi <peterke@gmail.com>
+
+# Configure the root Go distribution and bootstrap based on it
+ENV GO_VERSION 163
+
+RUN \
+  export ROOT_DIST=https://storage.googleapis.com/golang/go1.6.3.linux-amd64.tar.gz     && \
+  export ROOT_DIST_SHA=cdde5e08530c0579255d6153b08fdb3b8e47caabbe717bc7bcd7561275a87aeb && \
+  \
+  $BOOTSTRAP_PURE
diff --git a/docker/go-1.7beta1/Dockerfile b/docker/go-1.7rc5/Dockerfile
similarity index 55%
rename from docker/go-1.7beta1/Dockerfile
rename to docker/go-1.7rc5/Dockerfile
index b5393f9..40171ea 100644
--- a/docker/go-1.7beta1/Dockerfile
+++ b/docker/go-1.7rc5/Dockerfile
@@ -1,4 +1,4 @@
-# Go cross compiler (xgo): Go 1.7beta1
+# Go cross compiler (xgo): Go 1.7rc5
 # Copyright (c) 2016 Péter Szilágyi. All rights reserved.
 #
 # Released under the MIT license.
@@ -11,7 +11,7 @@ MAINTAINER Péter Szilágyi <peterke@gmail.com>
 ENV GO_VERSION 170
 
 RUN \
-  export ROOT_DIST=https://storage.googleapis.com/golang/go1.7beta1.linux-amd64.tar.gz  && \
-  export ROOT_DIST_SHA=a55e718935e2be1d5b920ed262fd06885d2d7fc4eab7722aa02c205d80532e3b && \
+  export ROOT_DIST=https://storage.googleapis.com/golang/go1.7rc5.linux-amd64.tar.gz    && \
+  export ROOT_DIST_SHA=2ddf9f553aefe91d96dd3f13be55159869a221fd0111cd211dccf2cab3ee5e4a && \
   \
   $BOOTSTRAP_PURE