diff --git a/alpine/containers/binfmt/Makefile b/alpine/containers/binfmt/Makefile
index 60993e346..4d0951a31 100644
--- a/alpine/containers/binfmt/Makefile
+++ b/alpine/containers/binfmt/Makefile
@@ -1,6 +1,6 @@
-RIDDLER=mobylinux/riddler:893c93bf54bc037f6952886330d5ba58746ace37@sha256:3d4a61555110be4b6e8ff6bcdcf5f8aa24d64564eb4162ea4e580d8916d083cc
+RIDDLER=mobylinux/riddler:7d4545d8b8ac2700971a83f12a3446a76db28c14@sha256:11b7310df6482fc38aa52b419c2ef1065d7b9207c633d47554e13aa99f6c0b72
 
-BINFMT_IMAGE=mobylinux/binfmt:e8e8e984e296148f1339c6cf335f55af2b9541a2@sha256:0c46639794bd6acaa71282dca282d8c113b1a7310b06be02cd850c07116c7d15
+BINFMT_IMAGE=mobylinux/binfmt:a94e0587b702edaa95cc6f303464959d0eb2311c@sha256:432732b90cbe0498f5ca148d75b90bb1eabd8fbfe8c872df8b23906c225091b1
 
 default: container.tar
 
diff --git a/alpine/containers/rng-tools/Makefile b/alpine/containers/rng-tools/Makefile
index bbd9a9071..144de3499 100644
--- a/alpine/containers/rng-tools/Makefile
+++ b/alpine/containers/rng-tools/Makefile
@@ -1,4 +1,4 @@
-RIDDLER=mobylinux/riddler:893c93bf54bc037f6952886330d5ba58746ace37@sha256:3d4a61555110be4b6e8ff6bcdcf5f8aa24d64564eb4162ea4e580d8916d083cc
+RIDDLER=mobylinux/riddler:7d4545d8b8ac2700971a83f12a3446a76db28c14@sha256:11b7310df6482fc38aa52b419c2ef1065d7b9207c633d47554e13aa99f6c0b72
 
 RNGD_IMAGE=mobylinux/rngd:3dad6dd43270fa632ac031e99d1947f20b22eec9@sha256:1c93c1db7196f6f71f8e300bc1d15f0376dd18e8891c8789d77c8ff19f3a9a92
 
diff --git a/alpine/packages/diagnostics/Makefile b/alpine/packages/diagnostics/Makefile
index 6424768d6..c3e249653 100644
--- a/alpine/packages/diagnostics/Makefile
+++ b/alpine/packages/diagnostics/Makefile
@@ -1,4 +1,4 @@
-GO_COMPILE=mobylinux/go-compile:1ccd40acabb46f43593a960f5d3e0a42df53fb90@sha256:208c795a9b6572df09d9bf52ff3cfa97b9a07d109811ec9d28453a22c53f9d17
+GO_COMPILE=mobylinux/go-compile:d2d25ac665b5148ad356d0eab3ff3762a68c633d@sha256:aab55d0c317460850e66a07dd94139cc11ea9e1c0bee88716a6a8c768740885f 
 
 default: usr/bin/diagnostics-server
 
diff --git a/alpine/packages/proxy/Makefile b/alpine/packages/proxy/Makefile
index 3d2771399..493fc032a 100644
--- a/alpine/packages/proxy/Makefile
+++ b/alpine/packages/proxy/Makefile
@@ -1,4 +1,4 @@
-GO_COMPILE=mobylinux/go-compile:1ccd40acabb46f43593a960f5d3e0a42df53fb90@sha256:208c795a9b6572df09d9bf52ff3cfa97b9a07d109811ec9d28453a22c53f9d17
+GO_COMPILE=mobylinux/go-compile:d2d25ac665b5148ad356d0eab3ff3762a68c633d@sha256:aab55d0c317460850e66a07dd94139cc11ea9e1c0bee88716a6a8c768740885f
 
 all: usr/bin/slirp-proxy sbin/proxy-vsockd
 
diff --git a/alpine/packages/vsudd/Makefile b/alpine/packages/vsudd/Makefile
index 0ee3373bf..6516d27a9 100644
--- a/alpine/packages/vsudd/Makefile
+++ b/alpine/packages/vsudd/Makefile
@@ -1,4 +1,4 @@
-GO_COMPILE=mobylinux/go-compile:1ccd40acabb46f43593a960f5d3e0a42df53fb90@sha256:208c795a9b6572df09d9bf52ff3cfa97b9a07d109811ec9d28453a22c53f9d17
+GO_COMPILE=mobylinux/go-compile:d2d25ac665b5148ad356d0eab3ff3762a68c633d@sha256:aab55d0c317460850e66a07dd94139cc11ea9e1c0bee88716a6a8c768740885f
 
 default: sbin/vsudd
 
diff --git a/alpine/test/Makefile b/alpine/test/Makefile
index dfebab439..05550f6e3 100644
--- a/alpine/test/Makefile
+++ b/alpine/test/Makefile
@@ -1,6 +1,6 @@
 default: test.img
 
-RIDDLER=mobylinux/riddler:893c93bf54bc037f6952886330d5ba58746ace37@sha256:3d4a61555110be4b6e8ff6bcdcf5f8aa24d64564eb4162ea4e580d8916d083cc
+RIDDLER=mobylinux/riddler:7d4545d8b8ac2700971a83f12a3446a76db28c14@sha256:11b7310df6482fc38aa52b419c2ef1065d7b9207c633d47554e13aa99f6c0b72
 
 TEST_IMAGE=mobylinux/test:725422886c3ea8fca2e0f4a8df5c6442cb1e937b@sha256:a077b8f84a51a4f4271b62adaa44985a4feff3d0a82b0d5fa8a46b45378428bc
 
diff --git a/base/binfmt/Makefile b/base/binfmt/Makefile
index 5c445be66..90b4f3a3f 100644
--- a/base/binfmt/Makefile
+++ b/base/binfmt/Makefile
@@ -2,7 +2,7 @@ QEMU_IMAGE=mobylinux/qemu-user-static:da39a3ee5e6b4b0d3255bfef95601890afd80709@s
 QEMU_FILES=qemu-arm qemu-aarch64 qemu-ppc64le
 QEMU_BINARIES=$(addprefix usr/bin/,$(QEMU_FILES))
 
-GO_COMPILE=mobylinux/go-compile:1ccd40acabb46f43593a960f5d3e0a42df53fb90@sha256:208c795a9b6572df09d9bf52ff3cfa97b9a07d109811ec9d28453a22c53f9d17
+GO_COMPILE=mobylinux/go-compile:d2d25ac665b5148ad356d0eab3ff3762a68c633d@sha256:aab55d0c317460850e66a07dd94139cc11ea9e1c0bee88716a6a8c768740885f
 
 BINFMT_BINARY=usr/bin/binfmt
 
diff --git a/tools/go-compile/Dockerfile b/tools/go-compile/Dockerfile
index 94204e1b2..d29708348 100644
--- a/tools/go-compile/Dockerfile
+++ b/tools/go-compile/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.7-alpine3.5
+FROM golang:1.8-alpine
 RUN apk update && apk add --no-cache build-base git
 
 RUN go get -u github.com/golang/lint/golint
diff --git a/tools/go-compile/Makefile b/tools/go-compile/Makefile
index d80093b56..7e3528196 100644
--- a/tools/go-compile/Makefile
+++ b/tools/go-compile/Makefile
@@ -1,6 +1,6 @@
 .PHONY: tag push
 
-BASE=golang:1.7-alpine3.5
+BASE=golang:1.8-alpine
 IMAGE=go-compile
 
 default: push
diff --git a/tools/riddler/Dockerfile b/tools/riddler/Dockerfile
index 2f194dd4f..ae7fd9de0 100644
--- a/tools/riddler/Dockerfile
+++ b/tools/riddler/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.7-alpine
+FROM golang:1.8-alpine
 
 RUN \
   apk update && apk upgrade && \
diff --git a/tools/riddler/Makefile b/tools/riddler/Makefile
index 1a6970ef0..1e9aca79a 100644
--- a/tools/riddler/Makefile
+++ b/tools/riddler/Makefile
@@ -1,6 +1,6 @@
 .PHONY: tag push
 
-BASE=golang:1.7-alpine
+BASE=golang:1.8-alpine
 IMAGE=riddler
 
 default: push