diff --git a/net/atmel-rf-driver.lib b/net/atmel-rf-driver.lib
index 908631fd25..9df80ab62e 100644
--- a/net/atmel-rf-driver.lib
+++ b/net/atmel-rf-driver.lib
@@ -1 +1 @@
-https://github.com/ARMmbed/atmel-rf-driver-mirror/#05eacb6c7969b72462f86e9b715d256fda9ece3c
+https://github.com/ARMmbed/atmel-rf-driver/#1583e99e11640986f5c0de272a21bc9143b4a1a8
diff --git a/net/coap-service.lib b/net/coap-service.lib
index 379efec094..9ff5dd133b 100644
--- a/net/coap-service.lib
+++ b/net/coap-service.lib
@@ -1 +1 @@
-https://github.com/ARMmbed/coap-service-mirror.git/#0c7805098970
+https://github.com/ARMmbed/coap-service/#eae41d1df943af415af8f8cd61abc7bd915ddc6c
diff --git a/net/mbed-client-c.lib b/net/mbed-client-c.lib
index 0c0add2af3..f8eb87a538 100644
--- a/net/mbed-client-c.lib
+++ b/net/mbed-client-c.lib
@@ -1 +1 @@
-https://github.com/ARMmbed/mbed-client-c-mirror/#e0b67894c573eab871f156dd275705fcce81bb69
+https://github.com/ARMmbed/mbed-client-c/#fe178dfdf9d10cd514b2c5f82a6e6eac81ca5261
diff --git a/net/mbed-client-mbed-tls.lib b/net/mbed-client-mbed-tls.lib
new file mode 100644
index 0000000000..9e541e48ca
--- /dev/null
+++ b/net/mbed-client-mbed-tls.lib
@@ -0,0 +1 @@
+https://github.com/ARMmbed/mbed-client-mbed-tls/#8c436e5d110947e18a81be9500de81cf6869b927
diff --git a/net/mbed-client-mbedtls.lib b/net/mbed-client-mbedtls.lib
deleted file mode 100644
index 5f3982f455..0000000000
--- a/net/mbed-client-mbedtls.lib
+++ /dev/null
@@ -1 +0,0 @@
-https://github.com/ARMmbed/mbed-client-mbedtls-mirror/#1d7d223267f98c578fed190093a46c51284641ff
diff --git a/net/mbed-client-randlib.lib b/net/mbed-client-randlib.lib
index 3d3b819a94..4c569a4d69 100644
--- a/net/mbed-client-randlib.lib
+++ b/net/mbed-client-randlib.lib
@@ -1 +1 @@
-https://github.com/ARMmbed/mbed-client-randlib-mirror.git/#237b3fa0255f
+https://github.com/ARMmbed/mbed-client-randlib/#80f5c491dd4d7c8e30b94eb575cdb402e9a17e83
diff --git a/net/mbed-client.lib b/net/mbed-client.lib
index 5cc200cae0..360eb1c848 100644
--- a/net/mbed-client.lib
+++ b/net/mbed-client.lib
@@ -1 +1 @@
-https://github.com/ARMmbed/mbed-client-mirror/#0b66c1a11638949391c67775ec0b8a42e88a9dfe
+https://github.com/ARMmbed/mbed-client/#ba4f474cdfafae9a87fafab32b2b22b8102e1a5c
diff --git a/net/mbed-mesh-api.lib b/net/mbed-mesh-api.lib
index 07c7e26a3b..b822c1c44a 100644
--- a/net/mbed-mesh-api.lib
+++ b/net/mbed-mesh-api.lib
@@ -1 +1 @@
-https://github.com/ARMmbed/mbed-mesh-api-mirror/#8ceb56d87cd20d26d4db71aa42a2860cfaccaf9c
+https://github.com/ARMmbed/mbed-mesh-api/#4e23448eb01367ddaac015b2e40a5434ec8884d4
diff --git a/net/mbed-trace.lib b/net/mbed-trace.lib
index fcf973c4b5..0598dcbb21 100644
--- a/net/mbed-trace.lib
+++ b/net/mbed-trace.lib
@@ -1 +1 @@
-https://github.com/ARMmbed/mbed-trace-mirror.git/#f9a11fcaa2b5
+https://github.com/ARMmbed/mbed-trace/#07ce2714915d5ca7cf07ccd2928d8658d07815b4
diff --git a/net/nanostack-hal-mbed-cmsis-rtos.lib b/net/nanostack-hal-mbed-cmsis-rtos.lib
index 4a54aad23e..ff4aac605e 100644
--- a/net/nanostack-hal-mbed-cmsis-rtos.lib
+++ b/net/nanostack-hal-mbed-cmsis-rtos.lib
@@ -1 +1 @@
-https://github.com/ARMmbed/nanostack-hal-mbed-cmsis-rtos/#1d27e2613bf7a454f553e2363c115a1635fa9002
+https://github.com/ARMmbed/nanostack-hal-mbed-cmsis-rtos/#ec78d46cb31bacae765a478beca8769ada17a01a
diff --git a/net/nanostack-libservice.lib b/net/nanostack-libservice.lib
index dacd2c665f..96c48a4c31 100644
--- a/net/nanostack-libservice.lib
+++ b/net/nanostack-libservice.lib
@@ -1 +1 @@
-https://github.com/ARMmbed/nanostack-libservice-mirror/#5490767fc3f8b9f204be20f88456f63a84810d06
+https://github.com/ARMmbed/nanostack-libservice/#da6491edff09db8187624468ed03ea72f7107075
diff --git a/net/sal-stack-nanostack-eventloop.lib b/net/sal-stack-nanostack-eventloop.lib
index 84b804682d..b64ae36532 100644
--- a/net/sal-stack-nanostack-eventloop.lib
+++ b/net/sal-stack-nanostack-eventloop.lib
@@ -1 +1 @@
-https://github.com/ARMmbed/sal-stack-nanostack-eventloop-mirror/#dcbeaf4babf7d74d252e905fd15d1d63bbaaf9c2
+https://github.com/ARMmbed/sal-stack-nanostack-eventloop/#c163be9183b09d7513532c50f2bc9ac52d3e580c
diff --git a/net/sal-stack-nanostack-private.lib b/net/sal-stack-nanostack-private.lib
index 1f920f848b..dd5c7188b3 100644
--- a/net/sal-stack-nanostack-private.lib
+++ b/net/sal-stack-nanostack-private.lib
@@ -1 +1 @@
-https://github.com/ARMmbed/sal-stack-nanostack-private-mirror/#c83ddc4f776847d62ae3aa53d591157adc910b59
+https://github.com/ARMmbed/sal-stack-nanostack-private/#f8ce589ca32978b54734f54daa781e5637668eb7