diff --git a/examples/gcp.yml b/examples/gcp.yml
index df8be1712..89e407508 100644
--- a/examples/gcp.yml
+++ b/examples/gcp.yml
@@ -13,14 +13,7 @@ onboot:
     image: "linuxkit/dhcpcd:7d2f17a0e5d1ef9a75a527821a9ab0d753b22e7e"
     command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"]
   - name: metadata
-    image: "linuxkit/metadata:a810b68fec9c9282cf096eed50605ddd6b2f3142"
-    binds:
-     - /dev:/dev
-     - /var:/var
-     - /tmp/etc/resolv.conf:/etc/resolv.conf
-    net: host
-    capabilities:
-     - CAP_SYS_ADMIN
+    image: "linuxkit/metadata:b053fd6a945829bb626bb3546cad69aae0ff7803"
 services:
   - name: rngd
     image: "linuxkit/rngd:b67c3151a52b05db50e6207b40876900f2208d14"
diff --git a/projects/etcd/etcd.yml b/projects/etcd/etcd.yml
index 9b22cda81..fd2322fba 100644
--- a/projects/etcd/etcd.yml
+++ b/projects/etcd/etcd.yml
@@ -18,14 +18,7 @@ onboot:
     image: "linuxkit/dhcpcd:7d2f17a0e5d1ef9a75a527821a9ab0d753b22e7e"
     command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"]
   - name: metadata
-    image: "linuxkit/metadata:a810b68fec9c9282cf096eed50605ddd6b2f3142"
-    binds:
-     - /dev:/dev
-     - /var:/var
-     - /tmp/etc/resolv.conf:/etc/resolv.conf
-    net: host
-    capabilities:
-     - CAP_SYS_ADMIN
+    image: "linuxkit/metadata:b053fd6a945829bb626bb3546cad69aae0ff7803"
 services:
   - name: rngd
     image: "linuxkit/rngd:b67c3151a52b05db50e6207b40876900f2208d14"
@@ -47,15 +40,5 @@ services:
      - /var/lib/etcd:/var/lib/etcd
      - /var/config/etcd:/etc/etcd
 trust:
-  - images:
-    - linuxkit/kernel
-    - linuxkit/init
-    - linuxkit/runc
-    - linuxkit/containerd
-    - linuxkit/ca-certificates
-    - linuxkit/sysctl
-    - linuxkit/format
-    - linuxkit/mount
-    - linuxkit/dhcpcd
-    - linuxkit/rngd
-    - linuxkit/openntpd
+  org:
+    - linuxkit
diff --git a/projects/etcd/prom-us-central1-f.yml b/projects/etcd/prom-us-central1-f.yml
index c89fcc349..cc99ff673 100644
--- a/projects/etcd/prom-us-central1-f.yml
+++ b/projects/etcd/prom-us-central1-f.yml
@@ -13,14 +13,7 @@ onboot:
     image: "linuxkit/dhcpcd:7d2f17a0e5d1ef9a75a527821a9ab0d753b22e7e"
     command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"]
   - name: metadata
-    image: "linuxkit/metadata:a810b68fec9c9282cf096eed50605ddd6b2f3142"
-    binds:
-     - /dev:/dev
-     - /var:/var
-     - /tmp/etc/resolv.conf:/etc/resolv.conf
-    net: host
-    capabilities:
-     - CAP_SYS_ADMIN
+    image: "linuxkit/metadata:b053fd6a945829bb626bb3546cad69aae0ff7803"
 services:
   - name: rngd
     image: "mobylinux/rngd:3dad6dd43270fa632ac031e99d1947f20b22eec9"
diff --git a/projects/swarmd/swarmd.yml b/projects/swarmd/swarmd.yml
index 49899f56b..9e54c6229 100644
--- a/projects/swarmd/swarmd.yml
+++ b/projects/swarmd/swarmd.yml
@@ -18,14 +18,7 @@ onboot:
     image: "linuxkit/mount:15e20f27abe69d276f796e4026531833ec5ff345"
     command: ["/mount.sh", "/var/lib/swarmd"]
   - name: metadata
-    image: "linuxkit/metadata:a810b68fec9c9282cf096eed50605ddd6b2f3142"
-    binds:
-     - /dev:/dev
-     - /var:/var
-     - /tmp/etc/resolv.conf:/etc/resolv.conf
-    net: host
-    capabilities:
-     - CAP_SYS_ADMIN
+    image: "linuxkit/metadata:b053fd6a945829bb626bb3546cad69aae0ff7803"
 services:
   - name: rngd
     image: "linuxkit/rngd:b67c3151a52b05db50e6207b40876900f2208d14"