diff --git a/alpine/containers/binfmt/Makefile b/alpine/containers/binfmt/Makefile
index e7b5a9255..e7cd984b3 100644
--- a/alpine/containers/binfmt/Makefile
+++ b/alpine/containers/binfmt/Makefile
@@ -1,8 +1,8 @@
 # Tag: 893c93bf54bc037f6952886330d5ba58746ace37
 RIDDLER=mobylinux/riddler@sha256:3d4a61555110be4b6e8ff6bcdcf5f8aa24d64564eb4162ea4e580d8916d083cc
 
-# Tag: c3312201a71982a820067a521e457a8c29aa7397
-BINFMT_IMAGE=mobylinux/binfmt@sha256:2d08969710368376d927b0fc51796a2c30c67070421d4eb1973a08a83f98181f
+# Tag: e8e8e984e296148f1339c6cf335f55af2b9541a2
+BINFMT_IMAGE=mobylinux/binfmt@sha256:0c46639794bd6acaa71282dca282d8c113b1a7310b06be02cd850c07116c7d15
 
 default: container.tar
 
diff --git a/alpine/packages/diagnostics/Makefile b/alpine/packages/diagnostics/Makefile
index 2e26aa50c..b72c35b2e 100644
--- a/alpine/packages/diagnostics/Makefile
+++ b/alpine/packages/diagnostics/Makefile
@@ -1,5 +1,5 @@
-# Tag: 56f72369b2100961d418cd8a614a6019bb53dc9c
-GO_COMPILE=mobylinux/go-compile@sha256:98eb2ded03c6bb717b5b19c5723f221b00e85c18352c042d0c8470a4fb32ea24
+# Tag: 1ccd40acabb46f43593a960f5d3e0a42df53fb90
+GO_COMPILE=mobylinux/go-compile@sha256:208c795a9b6572df09d9bf52ff3cfa97b9a07d109811ec9d28453a22c53f9d17
 
 default: usr/bin/diagnostics-server
 
diff --git a/alpine/packages/proxy/Makefile b/alpine/packages/proxy/Makefile
index 71ab245f4..c8c8f2f3b 100644
--- a/alpine/packages/proxy/Makefile
+++ b/alpine/packages/proxy/Makefile
@@ -1,5 +1,5 @@
-# Tag: 56f72369b2100961d418cd8a614a6019bb53dc9c
-GO_COMPILE=mobylinux/go-compile@sha256:98eb2ded03c6bb717b5b19c5723f221b00e85c18352c042d0c8470a4fb32ea24
+# Tag: 1ccd40acabb46f43593a960f5d3e0a42df53fb90
+GO_COMPILE=mobylinux/go-compile@sha256:208c795a9b6572df09d9bf52ff3cfa97b9a07d109811ec9d28453a22c53f9d17
 
 all: usr/bin/slirp-proxy sbin/proxy-vsockd
 
diff --git a/alpine/packages/vsudd/Makefile b/alpine/packages/vsudd/Makefile
index 7092f8bc6..5bc12f087 100644
--- a/alpine/packages/vsudd/Makefile
+++ b/alpine/packages/vsudd/Makefile
@@ -1,5 +1,5 @@
-# Tag: 56f72369b2100961d418cd8a614a6019bb53dc9c
-GO_COMPILE=mobylinux/go-compile@sha256:98eb2ded03c6bb717b5b19c5723f221b00e85c18352c042d0c8470a4fb32ea24
+# Tag: 1ccd40acabb46f43593a960f5d3e0a42df53fb90
+GO_COMPILE=mobylinux/go-compile@sha256:208c795a9b6572df09d9bf52ff3cfa97b9a07d109811ec9d28453a22c53f9d17
 
 default: sbin/vsudd
 
diff --git a/base/binfmt/Makefile b/base/binfmt/Makefile
index 25e9b1b20..94b73d0d3 100644
--- a/base/binfmt/Makefile
+++ b/base/binfmt/Makefile
@@ -3,8 +3,9 @@ QEMU_IMAGE=mobylinux/qemu-user-static@sha256:6c022f700dc6c263c9107c08aa29b4eae3b
 QEMU_FILES=qemu-arm qemu-aarch64 qemu-ppc64le
 QEMU_BINARIES=$(addprefix usr/bin/,$(QEMU_FILES))
 
-# Tag: 56f72369b2100961d418cd8a614a6019bb53dc9c
-GO_COMPILE=mobylinux/go-compile@sha256:98eb2ded03c6bb717b5b19c5723f221b00e85c18352c042d0c8470a4fb32ea24
+# Tag: 1ccd40acabb46f43593a960f5d3e0a42df53fb90
+GO_COMPILE=mobylinux/go-compile@sha256:208c795a9b6572df09d9bf52ff3cfa97b9a07d109811ec9d28453a22c53f9d17
+
 BINFMT_BINARY=usr/bin/binfmt
 
 # Tag: alpine:3.5
diff --git a/base/go-compile/compile.sh b/base/go-compile/compile.sh
index 6b4c44863..ab2f288bf 100755
--- a/base/go-compile/compile.sh
+++ b/base/go-compile/compile.sh
@@ -56,6 +56,6 @@ test -z $(find . -type f -name "*.go" -not -path "*/vendor/*" -not -name "*.pb.*
 
 >&2 echo "go build..."
 
-go build -o $out -buildmode pie --ldflags '-extldflags "-fno-PIC -static"' "$package"
+go build -o $out -buildmode pie --ldflags '-extldflags "-static"' "$package"
 
 tar cf - $out