diff --git a/cmd/kops/create_cluster.go b/cmd/kops/create_cluster.go
index 89af3b4748..92cd6b69cd 100644
--- a/cmd/kops/create_cluster.go
+++ b/cmd/kops/create_cluster.go
@@ -536,7 +536,7 @@ func parseZoneList(s string) []string {
 func supportsPrivateTopology(n *api.NetworkingSpec) bool {
 
 
-	if n.CNI != nil && n.Kopeio != nil && n.Weave != nil {
+	if n.CNI != nil || n.Kopeio != nil || n.Weave != nil {
 		return true
 	}
 	return false
diff --git a/hack/dev-build.sh b/hack/dev-build.sh
index 75dd6bc6dd..f6825d74b8 100755
--- a/hack/dev-build.sh
+++ b/hack/dev-build.sh
@@ -56,7 +56,7 @@ MASTER_SIZE=${MASTER_SIZE:-m4.large}
 
 # NETWORK
 TOPOLOGY=${TOPOLOGY:-private}
-NETWORKING=${NETWORKING:-cni}
+NETWORKING=${NETWORKING:-weave}
 
 VERBOSITY=${VERBOSITY:-2}
 
@@ -96,6 +96,7 @@ NODEUP_URL=${NODEUP_URL} kops create cluster \
   --topology $TOPOLOGY \
   --networking $NETWORKING \
   -v $VERBOSITY \
+  --image "k8s-1.4-debian-jessie-amd64-hvm-ebs-2016-11-16" \
   --yes
 
 echo ==========
diff --git a/upup/pkg/fi/cloudup/bootstrapchannelbuilder.go b/upup/pkg/fi/cloudup/bootstrapchannelbuilder.go
index 106ab2c220..7f09d0875a 100644
--- a/upup/pkg/fi/cloudup/bootstrapchannelbuilder.go
+++ b/upup/pkg/fi/cloudup/bootstrapchannelbuilder.go
@@ -89,7 +89,7 @@ func (b *BootstrapChannelBuilder) buildManifest() (*channelsapi.Addons, map[stri
 	}
 
 	if b.cluster.Spec.Networking.Weave != nil {
-		key := "networking.weave.io"
+		key := "networking.weave"
 		version := "1.8.0.20161116"
 
 		// TODO: Create configuration object for cni providers (maybe create it but orphan it)?
diff --git a/upup/pkg/fi/cloudup/tagbuilder.go b/upup/pkg/fi/cloudup/tagbuilder.go
index 30e4f17087..480ee9944c 100644
--- a/upup/pkg/fi/cloudup/tagbuilder.go
+++ b/upup/pkg/fi/cloudup/tagbuilder.go
@@ -140,7 +140,7 @@ func buildNodeupTags(role api.InstanceGroupRole, cluster *api.Cluster, clusterTa
 		return nil, fmt.Errorf("Networking is not set, and should not be nil here")
 	}
 
-	if networking.CNI != nil {
+	if networking.CNI != nil || networking.Weave != nil {
 		// external is based on cni, weave, flannel, etc
 		tags = append(tags, "_networking_cni")
 	}