diff --git a/applications/rtdt-manager/main.go b/applications/rtdt-manager/main.go
index 4d46a3e41c4daccb48316801fac5e19b22e519e5..77e6026e397a21de0fe2fd52c9d0b48153ddd3b1 100644
--- a/applications/rtdt-manager/main.go
+++ b/applications/rtdt-manager/main.go
@@ -62,6 +62,11 @@ func main() {
 		fmt.Printf("Error occured while trying to construct topology in realnet: %v\n", err)
 		return
 	}
+    err = realnet.CreateDevices()
+    if err != nil {
+        fmt.Printf("Error: Couldn't create devices!")
+        return
+    }
 	err = realnet.UploadTopology()
 	if err != nil {
 		fmt.Printf("Error occured while trying to upload realnet topology to DB: %v\n", err)
diff --git a/applications/rtdt-manager/venv/venv.go b/applications/rtdt-manager/venv/venv.go
index 3a22bdda0a99f6e51a6b8b4326673b8e499bf83a..e266ee34e087ddcb7fdcaa884accb76cdb1a57d7 100644
--- a/applications/rtdt-manager/venv/venv.go
+++ b/applications/rtdt-manager/venv/venv.go
@@ -260,16 +260,20 @@ func (v *VEnv) DeriveTopologyFromClabData() error {
 	}
 	return nil
 }
-
 func (v *VEnv) UploadTopology() error {
 	conn := v.auth.GetConn()
 	topoService := topoPb.NewTopologyServiceClient(conn)
 	for _, link := range v.topology.Links {
-
 		ctx := v.auth.CreateContextWithAuthorization()
+
+		l := link.Convert()
+		l.Name = l.SourceNode.Name + ":" + l.TargetNode.Name
+		l.SourcePort.Configuration = &topoPb.Configuration{Ip: "192.168.178.2", PrefixLength: 24}
+		l.TargetPort.Configuration = &topoPb.Configuration{Ip: "192.168.178.3", PrefixLength: 24}
+
 		addLinkRequest := &topoPb.AddLinkRequest{
 			Timestamp: util.Now(),
-			Link:      link.Convert(),
+			Link:      l,
 		}
 		fmt.Println("AddLink is:", addLinkRequest.String())
 		topoResponse, err := topoService.AddLink(ctx, addLinkRequest)