diff --git a/test/pkg/containerd/Dockerfile b/test/pkg/containerd/Dockerfile
index 79c5cfc63..547d31afe 100644
--- a/test/pkg/containerd/Dockerfile
+++ b/test/pkg/containerd/Dockerfile
@@ -29,4 +29,3 @@ WORKDIR $GOPATH/src/github.com/containerd/containerd
 ADD run.sh ./run.sh
 
 ENTRYPOINT ["/bin/sh", "run.sh"]
-LABEL org.mobyproject.config='{"capabilities": ["all"], "tmpfs": ["/tmp"], "binds": ["/dev:/dev", "/var/lib:/var/lib", "/etc/resolv.conf:/etc/resolv.conf", "/usr/bin/runc:/usr/bin/runc", "/usr/bin/containerd:/usr/bin/containerd", "/usr/bin/containerd-shim:/usr/bin/containerd-shim"], "mounts": [{"type": "cgroup", "options": ["rw","nosuid","noexec","nodev","relatime"]}],}'
diff --git a/test/pkg/containerd/build.yml b/test/pkg/containerd/build.yml
index fb2956359..52b324254 100644
--- a/test/pkg/containerd/build.yml
+++ b/test/pkg/containerd/build.yml
@@ -1 +1,16 @@
 image: test-containerd
+config:
+  capabilities:
+    - all
+  tmpfs:
+    - /tmp
+  binds:
+    - /dev:/dev
+    - /var/lib:/var/lib
+    - /etc/resolv.conf:/etc/resolv.conf
+    - /usr/bin/runc:/usr/bin/runc
+    - /usr/bin/containerd:/usr/bin/containerd
+    - /usr/bin/containerd-shim:/usr/bin/containerd-shim
+  mounts:
+    - type: cgroup
+      options: ["rw","nosuid","noexec","nodev","relatime"]