diff --git a/dc/topo/BUILD.bazel b/dc/topo/BUILD.bazel
index c10300c..83673e3 100644
--- a/dc/topo/BUILD.bazel
+++ b/dc/topo/BUILD.bazel
@@ -9,13 +9,13 @@
     importpath = "code.hackerspace.pl/hscloud/dc/topo",
     visibility = ["//visibility:private"],
     deps = [
+        "//dc/proto:go_default_library",
         "//dc/topo/assets:go_default_library",
         "//dc/topo/graph:go_default_library",
         "//dc/topo/proto:go_default_library",
         "//dc/topo/state:go_default_library",
         "//go/mirko:go_default_library",
         "//go/statusz:go_default_library",
-        "//proto/infra:go_default_library",
         "@com_github_digitalocean_go_netbox//netbox:go_default_library",
         "@com_github_digitalocean_go_netbox//netbox/client:go_default_library",
         "@com_github_golang_glog//:go_default_library",
diff --git a/dc/topo/service.go b/dc/topo/service.go
index 8919939..84eda5d 100644
--- a/dc/topo/service.go
+++ b/dc/topo/service.go
@@ -11,8 +11,8 @@
 
 	"code.hackerspace.pl/hscloud/go/mirko"
 	"code.hackerspace.pl/hscloud/go/statusz"
-	ipb "code.hackerspace.pl/hscloud/proto/infra"
 
+	dpb "code.hackerspace.pl/hscloud/dc/proto"
 	"code.hackerspace.pl/hscloud/dc/topo/assets"
 	"code.hackerspace.pl/hscloud/dc/topo/graph"
 	"code.hackerspace.pl/hscloud/dc/topo/state"
@@ -152,22 +152,22 @@
 		for _, po := range sw.Ports {
 			state := "INVALID"
 			switch po.Proto.LinkState {
-			case ipb.SwitchPort_LINKSTATE_DOWN:
+			case dpb.SwitchPort_LINKSTATE_DOWN:
 				state = "DOWN"
-			case ipb.SwitchPort_LINKSTATE_UP:
+			case dpb.SwitchPort_LINKSTATE_UP:
 				state = "UP"
 			}
 			mode := "INVALID"
 			switch po.Proto.PortMode {
-			case ipb.SwitchPort_PORTMODE_SWITCHPORT_UNTAGGED:
+			case dpb.SwitchPort_PORTMODE_SWITCHPORT_UNTAGGED:
 				mode = fmt.Sprintf("UNTAGGED (%d)", po.Proto.VlanNative)
-			case ipb.SwitchPort_PORTMODE_SWITCHPORT_TAGGED:
+			case dpb.SwitchPort_PORTMODE_SWITCHPORT_TAGGED:
 				mode = fmt.Sprintf("TAGGED (%v)", po.Proto.VlanTagged)
-			case ipb.SwitchPort_PORTMODE_SWITCHPORT_GENERIC:
+			case dpb.SwitchPort_PORTMODE_SWITCHPORT_GENERIC:
 				mode = "GENERIC"
-			case ipb.SwitchPort_PORTMODE_ROUTED:
+			case dpb.SwitchPort_PORTMODE_ROUTED:
 				mode = "ROUTED"
-			case ipb.SwitchPort_PORTMODE_MANGLED:
+			case dpb.SwitchPort_PORTMODE_MANGLED:
 				mode = "MANGLED"
 			}
 
diff --git a/dc/topo/state/BUILD.bazel b/dc/topo/state/BUILD.bazel
index 892e302..fefb3ef 100644
--- a/dc/topo/state/BUILD.bazel
+++ b/dc/topo/state/BUILD.bazel
@@ -6,9 +6,9 @@
     importpath = "code.hackerspace.pl/hscloud/dc/topo/state",
     visibility = ["//visibility:public"],
     deps = [
+        "//dc/proto:go_default_library",
         "//dc/topo/proto:go_default_library",
         "//go/pki:go_default_library",
-        "//proto/infra:go_default_library",
         "@org_golang_google_grpc//:go_default_library",
     ],
 )
diff --git a/dc/topo/state/state.go b/dc/topo/state/state.go
index 116a55a..e264827 100644
--- a/dc/topo/state/state.go
+++ b/dc/topo/state/state.go
@@ -7,24 +7,24 @@
 
 	"google.golang.org/grpc"
 
+	dpb "code.hackerspace.pl/hscloud/dc/proto"
 	"code.hackerspace.pl/hscloud/go/pki"
-	ipb "code.hackerspace.pl/hscloud/proto/infra"
 
 	pb "code.hackerspace.pl/hscloud/dc/topo/proto"
 )
 
 type SwitchportState struct {
-	Proto *ipb.SwitchPort
+	Proto *dpb.SwitchPort
 }
 
 type SwitchState struct {
 	Name  string
 	Ports []*SwitchportState
-	Stub  ipb.SwitchControlClient
+	Stub  dpb.SwitchControlClient
 }
 
 func (s *SwitchState) Fetch(ctx context.Context) error {
-	req := ipb.GetPortsRequest{}
+	req := dpb.GetPortsRequest{}
 	res, err := s.Stub.GetPorts(ctx, &req)
 	if err != nil {
 		return fmt.Errorf("GetPorts: %v", err)
@@ -65,7 +65,7 @@
 
 		s.Switches[sw.Name] = &SwitchState{
 			Name: sw.Name,
-			Stub: ipb.NewSwitchControlClient(conn),
+			Stub: dpb.NewSwitchControlClient(conn),
 		}
 		err := s.Switches[sw.Name].Fetch(ctx)
 		if err != nil {