diff --git a/.gitmodules b/.gitmodules
index 7a73a8fd..49b5bef4 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -28,9 +28,9 @@
 [submodule "vendor/github.com/purpleidea/distribution"]
 	path = vendor/github.com/docker/distribution
 	url = https://github.com/purpleidea/distribution
-[submodule "vendor/github.com/purpleidea/go-connections"]
-	path = vendor/github.com/docker/go-connections
-	url = https://github.com/docker/go-connections
 [submodule "vendor/github.com/hashicorp/go-multierror"]
 	path = vendor/github.com/hashicorp/go-multierror
 	url = https://github.com/hashicorp/go-multierror
+[submodule "vendor/github.com/containerd/containerd"]
+	path = vendor/github.com/containerd/containerd
+	url = https://github.com/purpleidea/containerd
diff --git a/engine/resources/docker_container.go b/engine/resources/docker_container.go
index a25d5d77..1d11c55a 100644
--- a/engine/resources/docker_container.go
+++ b/engine/resources/docker_container.go
@@ -310,7 +310,7 @@ func (obj *DockerContainerRes) CheckApply(apply bool) (bool, error) {
 			}
 		}
 
-		c, err := obj.client.ContainerCreate(ctx, containerConfig, hostConfig, nil, obj.Name())
+		c, err := obj.client.ContainerCreate(ctx, containerConfig, hostConfig, nil, nil, obj.Name())
 		if err != nil {
 			return false, errwrap.Wrapf(err, "error creating container")
 		}
diff --git a/engine/resources/docker_container_test.go b/engine/resources/docker_container_test.go
index f4ac803e..8b8bb0ee 100644
--- a/engine/resources/docker_container_test.go
+++ b/engine/resources/docker_container_test.go
@@ -165,6 +165,7 @@ func setup() error {
 		},
 		&container.HostConfig{},
 		nil,
+		nil,
 		"mgmt-test",
 	)
 	if err != nil {
diff --git a/vendor/github.com/containerd/containerd b/vendor/github.com/containerd/containerd
new file mode 160000
index 00000000..231d09c8
--- /dev/null
+++ b/vendor/github.com/containerd/containerd
@@ -0,0 +1 @@
+Subproject commit 231d09c8988e17f10853232bdee2441a4b4f3541
diff --git a/vendor/github.com/docker/distribution b/vendor/github.com/docker/distribution
index 05e97590..a778dab7 160000
--- a/vendor/github.com/docker/distribution
+++ b/vendor/github.com/docker/distribution
@@ -1 +1 @@
-Subproject commit 05e9759077b787f60951a2ea12136d6f4933296e
+Subproject commit a778dab7d0f94fcd7950a8eb439fa1accb445839
diff --git a/vendor/github.com/docker/docker b/vendor/github.com/docker/docker
index 44519733..6c6f9d8c 160000
--- a/vendor/github.com/docker/docker
+++ b/vendor/github.com/docker/docker
@@ -1 +1 @@
-Subproject commit 445197336ebfc341fe1c922410324422b5722328
+Subproject commit 6c6f9d8cf0bae08f7c91c6794906eba3ebac9205
diff --git a/vendor/github.com/docker/go-connections b/vendor/github.com/docker/go-connections
deleted file mode 160000
index 97c2040d..00000000
--- a/vendor/github.com/docker/go-connections
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 97c2040d34dfae1d1b1275fa3a78dbdd2f41cf7e