diff --git a/examples/docker.yml b/examples/docker.yml
index 623c0ad39..49cc33a4a 100644
--- a/examples/docker.yml
+++ b/examples/docker.yml
@@ -8,7 +8,7 @@ init:
   - mobylinux/ca-certificates:eabc5a6e59f05aa91529d80e9a595b85b046f935
 onboot:
   - name: sysctl
-    image: "mobylinux/sysctl:2cf2f9d5b4d314ba1bfc22b2fe931924af666d8c"
+    image: "linuxkit/sysctl:1f5ec5d5e6f7a7a1b3d2ff9dd9e36fd6fb14756a"
     net: host
     pid: host
     ipc: host
@@ -18,7 +18,7 @@ onboot:
   - name: sysfs
     image: mobylinux/sysfs:6c1d06f28ddd9681799d3950cddf044b930b221c
   - name: binfmt
-    image: "mobylinux/binfmt:bdb754f25a5d851b4f5f8d185a43dfcbb3c22d01"
+    image: "linuxkit/binfmt:8881283ac627be1542811bd25c85e7782aebc692"
     binds:
      - /proc/sys/fs/binfmt_misc:/binfmt_misc
     readonly: true
diff --git a/examples/gcp.yml b/examples/gcp.yml
index cc889b629..1eeaf1fb9 100644
--- a/examples/gcp.yml
+++ b/examples/gcp.yml
@@ -8,7 +8,7 @@ init:
   - mobylinux/ca-certificates:eabc5a6e59f05aa91529d80e9a595b85b046f935
 onboot:
   - name: sysctl
-    image: "mobylinux/sysctl:2cf2f9d5b4d314ba1bfc22b2fe931924af666d8c"
+    image: "linuxkit/sysctl:1f5ec5d5e6f7a7a1b3d2ff9dd9e36fd6fb14756a"
     net: host
     pid: host
     ipc: host
@@ -27,7 +27,7 @@ onboot:
     net: host
     command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"]
   - name: metadata
-    image: "mobylinux/metadata:c5567e65e9125f0a4c4b8cb9d56a86377be62652"
+    image: "linuxkit/metadata:c5567e65e9125f0a4c4b8cb9d56a86377be62652"
     binds:
      - /dev:/dev
      - /var:/var
diff --git a/examples/packet.yml b/examples/packet.yml
index 1d218caa9..eb72e562b 100644
--- a/examples/packet.yml
+++ b/examples/packet.yml
@@ -8,7 +8,7 @@ init:
   - mobylinux/ca-certificates:eabc5a6e59f05aa91529d80e9a595b85b046f935
 onboot:
   - name: sysctl
-    image: "mobylinux/sysctl:2cf2f9d5b4d314ba1bfc22b2fe931924af666d8c"
+    image: "linuxkit/sysctl:1f5ec5d5e6f7a7a1b3d2ff9dd9e36fd6fb14756a"
     net: host
     pid: host
     ipc: host
diff --git a/linuxkit.yml b/linuxkit.yml
index b770410fa..8f721958c 100644
--- a/linuxkit.yml
+++ b/linuxkit.yml
@@ -16,7 +16,7 @@ onboot:
      - CAP_SYS_ADMIN
     readonly: true
   - name: binfmt
-    image: "mobylinux/binfmt:bdb754f25a5d851b4f5f8d185a43dfcbb3c22d01"
+    image: "linuxkit/binfmt:8881283ac627be1542811bd25c85e7782aebc692"
     binds:
      - /proc/sys/fs/binfmt_misc:/binfmt_misc
     readonly: true
diff --git a/pkg/binfmt/Makefile b/pkg/binfmt/Makefile
index 44040540d..35483706b 100644
--- a/pkg/binfmt/Makefile
+++ b/pkg/binfmt/Makefile
@@ -2,7 +2,7 @@ QEMU_IMAGE=linuxkit/qemu-user-static:da39a3ee5e6b4b0d3255bfef95601890afd80709@sh
 QEMU_FILES=qemu-arm qemu-aarch64 qemu-ppc64le
 QEMU_BINARIES=$(addprefix usr/bin/,$(QEMU_FILES))
 
-GO_COMPILE=linuxkit/go-compile:90607983001c2789911afabf420394d51f78ced8@sha256:8b6566c6fd9f3bca31191b919449248d3cb1ca3a562276fca7199e93451d6596
+GO_COMPILE=linuxkit/go-compile:4513068d9a7e919e4ec42e2d7ee879ff5b95b7f5@sha256:bdfadbe3e4ec699ca45b67453662321ec270f2d1a1dbdbf09625776d3ebd68c5
 
 BINFMT_BINARY=usr/bin/binfmt
 
diff --git a/pkg/metadata/Makefile b/pkg/metadata/Makefile
index d14ae4d22..4d560745a 100644
--- a/pkg/metadata/Makefile
+++ b/pkg/metadata/Makefile
@@ -1,4 +1,4 @@
-GO_COMPILE=linuxkit/go-compile:90607983001c2789911afabf420394d51f78ced8@sha256:8b6566c6fd9f3bca31191b919449248d3cb1ca3a562276fca7199e93451d6596
+GO_COMPILE=linuxkit/go-compile:4513068d9a7e919e4ec42e2d7ee879ff5b95b7f5@sha256:bdfadbe3e4ec699ca45b67453662321ec270f2d1a1dbdbf09625776d3ebd68c5
 
 SHA_IMAGE=alpine:3.5@sha256:dfbd4a3a8ebca874ebd2474f044a0b33600d4523d03b0df76e5c5986cb02d7e8
 
diff --git a/pkg/sysctl/Makefile b/pkg/sysctl/Makefile
index 34d7d19c3..9a7a4c9db 100644
--- a/pkg/sysctl/Makefile
+++ b/pkg/sysctl/Makefile
@@ -1,4 +1,4 @@
-GO_COMPILE=linuxkit/go-compile:90607983001c2789911afabf420394d51f78ced8@sha256:8b6566c6fd9f3bca31191b919449248d3cb1ca3a562276fca7199e93451d6596
+GO_COMPILE=linuxkit/go-compile:4513068d9a7e919e4ec42e2d7ee879ff5b95b7f5@sha256:bdfadbe3e4ec699ca45b67453662321ec270f2d1a1dbdbf09625776d3ebd68c5
 
 SHA_IMAGE=alpine:3.5@sha256:dfbd4a3a8ebca874ebd2474f044a0b33600d4523d03b0df76e5c5986cb02d7e8
 
diff --git a/pkg/sysfs/Makefile b/pkg/sysfs/Makefile
index 5bd223a8a..525741be2 100644
--- a/pkg/sysfs/Makefile
+++ b/pkg/sysfs/Makefile
@@ -1,4 +1,4 @@
-GO_COMPILE=linuxkit/go-compile:90607983001c2789911afabf420394d51f78ced8@sha256:8b6566c6fd9f3bca31191b919449248d3cb1ca3a562276fca7199e93451d6596
+GO_COMPILE=linuxkit/go-compile:4513068d9a7e919e4ec42e2d7ee879ff5b95b7f5@sha256:bdfadbe3e4ec699ca45b67453662321ec270f2d1a1dbdbf09625776d3ebd68c5
 
 SHA_IMAGE=alpine:3.5@sha256:dfbd4a3a8ebca874ebd2474f044a0b33600d4523d03b0df76e5c5986cb02d7e8
 
diff --git a/projects/demo/etcd/etcd.yml b/projects/demo/etcd/etcd.yml
index d9530d33c..3f8831255 100644
--- a/projects/demo/etcd/etcd.yml
+++ b/projects/demo/etcd/etcd.yml
@@ -43,7 +43,7 @@ onboot:
     net: host
     command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"]
   - name: metadata
-    image: "mobylinux/metadata:c5567e65e9125f0a4c4b8cb9d56a86377be62652"
+    image: "linuxkit/metadata:c5567e65e9125f0a4c4b8cb9d56a86377be62652"
     binds:
      - /dev:/dev
      - /var:/var
diff --git a/projects/kubernetes/kube-master.yml b/projects/kubernetes/kube-master.yml
index fd2defbdc..a5d80e29e 100644
--- a/projects/kubernetes/kube-master.yml
+++ b/projects/kubernetes/kube-master.yml
@@ -18,7 +18,7 @@ onboot:
   - name: sysfs
     image: mobylinux/sysfs:6c1d06f28ddd9681799d3950cddf044b930b221c
   - name: binfmt
-    image: "mobylinux/binfmt:bdb754f25a5d851b4f5f8d185a43dfcbb3c22d01"
+    image: "linuxkit/binfmt:8881283ac627be1542811bd25c85e7782aebc692"
     binds:
      - /proc/sys/fs/binfmt_misc:/binfmt_misc
     readonly: true
diff --git a/projects/kubernetes/kube-node.yml b/projects/kubernetes/kube-node.yml
index 9908c972a..76e628203 100644
--- a/projects/kubernetes/kube-node.yml
+++ b/projects/kubernetes/kube-node.yml
@@ -18,7 +18,7 @@ onboot:
   - name: sysfs
     image: mobylinux/sysfs:6c1d06f28ddd9681799d3950cddf044b930b221c
   - name: binfmt
-    image: "mobylinux/binfmt:bdb754f25a5d851b4f5f8d185a43dfcbb3c22d01"
+    image: "linuxkit/binfmt:8881283ac627be1542811bd25c85e7782aebc692"
     binds:
      - /proc/sys/fs/binfmt_misc:/binfmt_misc
     readonly: true
diff --git a/projects/miragesdk/examples/mirage-dhcp.yml b/projects/miragesdk/examples/mirage-dhcp.yml
index b159c620b..727b5144c 100644
--- a/projects/miragesdk/examples/mirage-dhcp.yml
+++ b/projects/miragesdk/examples/mirage-dhcp.yml
@@ -8,7 +8,7 @@ init:
   - mobylinux/ca-certificates:eabc5a6e59f05aa91529d80e9a595b85b046f935
 onboot:
   - name: sysctl
-    image: mobylinux/sysctl:2cf2f9d5b4d314ba1bfc22b2fe931924af666d8c
+    image: linuxkit/sysctl:1f5ec5d5e6f7a7a1b3d2ff9dd9e36fd6fb14756a
     net: host
     pid: host
     ipc: host
@@ -16,7 +16,7 @@ onboot:
      - CAP_SYS_ADMIN
     readonly: true
   - name: binfmt
-    image: mobylinux/binfmt:bdb754f25a5d851b4f5f8d185a43dfcbb3c22d01
+    image: linuxkit/binfmt:8881283ac627be1542811bd25c85e7782aebc692
     binds:
      - /proc/sys/fs/binfmt_misc:/binfmt_misc
     readonly: true
diff --git a/test/docker-bench/test-docker-bench.yml b/test/docker-bench/test-docker-bench.yml
index bdcac83a9..02338f1d9 100644
--- a/test/docker-bench/test-docker-bench.yml
+++ b/test/docker-bench/test-docker-bench.yml
@@ -8,7 +8,7 @@ init:
   - mobylinux/ca-certificates:eabc5a6e59f05aa91529d80e9a595b85b046f935
 onboot:
   - name: sysctl
-    image: "mobylinux/sysctl:2cf2f9d5b4d314ba1bfc22b2fe931924af666d8c"
+    image: "linuxkit/sysctl:1f5ec5d5e6f7a7a1b3d2ff9dd9e36fd6fb14756a"
     net: host
     pid: host
     ipc: host
@@ -18,7 +18,7 @@ onboot:
   - name: sysfs
     image: mobylinux/sysfs:6c1d06f28ddd9681799d3950cddf044b930b221c
   - name: binfmt
-    image: "mobylinux/binfmt:bdb754f25a5d851b4f5f8d185a43dfcbb3c22d01"
+    image: "linuxkit/binfmt:8881283ac627be1542811bd25c85e7782aebc692"
     binds:
      - /proc/sys/fs/binfmt_misc:/binfmt_misc
     readonly: true
diff --git a/test/virtsock/Dockerfile.build b/test/virtsock/Dockerfile.build
index f128f79ed..463221e89 100644
--- a/test/virtsock/Dockerfile.build
+++ b/test/virtsock/Dockerfile.build
@@ -1,4 +1,4 @@
-FROM linuxkit/go-compile:90607983001c2789911afabf420394d51f78ced8@sha256:8b6566c6fd9f3bca31191b919449248d3cb1ca3a562276fca7199e93451d6596
+FROM linuxkit/go-compile:4513068d9a7e919e4ec42e2d7ee879ff5b95b7f5@sha256:bdfadbe3e4ec699ca45b67453662321ec270f2d1a1dbdbf09625776d3ebd68c5
 
 ENV VIRTSOCK_COMMIT=6b4dec728264e07c41e108caebd6bc2b72559a5f
 RUN mkdir -p $GOPATH/src/github.com/rneugeba && \