diff --git a/Dockerfile.dapper b/Dockerfile.dapper
index 475d2bb6..e0f62cdf 100644
--- a/Dockerfile.dapper
+++ b/Dockerfile.dapper
@@ -111,9 +111,9 @@ ENV BUILD_DOCKER_URL=BUILD_DOCKER_URL_${ARCH} \
     OS_RELEASES_YML=${OS_RELEASES_YML} \
     OS_REPO=${OS_REPO} \
     OS_SERVICES_REPO=${OS_SERVICES_REPO} \
-    PATH=${GOPATH}/bin:/usr/local/go/bin:$PATH \
     REPO_VERSION=master \
     SELINUX_POLICY_URL=${SELINUX_POLICY_URL}
+ENV PATH=${GOPATH}/bin:/usr/local/go/bin:$PATH
 
 RUN mkdir -p ${DOWNLOADS}
 
diff --git a/trash.conf b/trash.conf
index 3c33cd16..d96db347 100644
--- a/trash.conf
+++ b/trash.conf
@@ -36,7 +36,7 @@ github.com/opencontainers/specs f955d90e70a98ddfb886bd930ffd076da9b67998
 github.com/packethost/packngo 92012705236896736875186c9e49557897c6af90 https://github.com/ibuildthecloud/packngo.git
 github.com/pkg/errors d62207b3dc916c342cd6a7180fa861d898cf42ee
 github.com/pmezard/go-difflib d8ed2627bdf02c080bf22230dbb337003b7aba2d
-github.com/rancher/cniglue 424607e40a480b0cb52f6cd3ec187ae6d61febf1
+github.com/rancher/cniglue b56bd68e5df113ad3fcc59c58034c22afaede877
 github.com/rancher/docker-from-scratch 152ddfa8d618d83238d987e7b8ae7287fc69f327
 github.com/rancher/netconf ddd7e35a6aacd7e80991920774083dd4408ec018
 github.com/rcrowley/go-metrics eeba7bd0dd01ace6e690fa833b3f22aaec29af43
diff --git a/vendor/github.com/rancher/cniglue/cni.go b/vendor/github.com/rancher/cniglue/cni.go
index 2eca05a8..e0814cb1 100644
--- a/vendor/github.com/rancher/cniglue/cni.go
+++ b/vendor/github.com/rancher/cniglue/cni.go
@@ -61,7 +61,12 @@ func NewCNIExec(state *DockerPluginState) (*CNIExec, error) {
 		},
 	}
 
-	dir := fmt.Sprintf(cniDir, state.HostConfig.NetworkMode.NetworkName())
+	network := state.HostConfig.NetworkMode.NetworkName()
+	if network == "" {
+		network = "default"
+	}
+
+	dir := fmt.Sprintf(cniDir, network)
 	files, err := libcni.ConfFiles(dir)
 	if err != nil {
 		return nil, err
diff --git a/vendor/github.com/rancher/cniglue/trash.conf b/vendor/github.com/rancher/cniglue/trash.conf
new file mode 100644
index 00000000..99ed04d6
--- /dev/null
+++ b/vendor/github.com/rancher/cniglue/trash.conf
@@ -0,0 +1,7 @@
+github.com/containernetworking/cni b8e92ed030588120f9fda47dd359e17a3234142d
+github.com/docker/engine-api f90ecdb1e989f834dabbd91807e891094aa069fe
+github.com/docker/go-connections 990a1a1a70b0da4c4cb70e117971a4f0babfbf1a
+github.com/docker/go-units f2d77a61e3c169b43402a0a1e84f06daf29b8190
+github.com/opencontainers/specs b45aa77484bb771fc50498020063abcbc9b5f4c2
+github.com/pkg/errors d62207b3dc916c342cd6a7180fa861d898cf42ee
+github.com/Sirupsen/logrus 446d1c146faa8ed3f4218f056fcd165f6bcfda81
diff --git a/vendor/github.com/rancher/cniglue/trash.yml b/vendor/github.com/rancher/cniglue/trash.yml
deleted file mode 100644
index 1bc9ecc5..00000000
--- a/vendor/github.com/rancher/cniglue/trash.yml
+++ /dev/null
@@ -1,15 +0,0 @@
-import:
-- package: github.com/pkg/errors
-  version: d62207b3dc916c342cd6a7180fa861d898cf42ee
-- package: github.com/Sirupsen/logrus
-  version: 446d1c146faa8ed3f4218f056fcd165f6bcfda81
-- package: github.com/docker/go-connections
-  version: 990a1a1a70b0da4c4cb70e117971a4f0babfbf1a
-- package: github.com/docker/engine-api
-  version: f90ecdb1e989f834dabbd91807e891094aa069fe
-- package: github.com/docker/go-units
-  version: f2d77a61e3c169b43402a0a1e84f06daf29b8190
-- package: github.com/opencontainers/specs
-  version: b45aa77484bb771fc50498020063abcbc9b5f4c2
-- package: github.com/containernetworking/cni
-  version: b8e92ed030588120f9fda47dd359e17a3234142d