diff --git a/ieee1905/Makefile b/ieee1905/Makefile
index ae045eb59..efc080bcc 100644
--- a/ieee1905/Makefile
+++ b/ieee1905/Makefile
@@ -11,7 +11,7 @@ LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_VERSION:=1717f97c054c232d393c91fa7e95a571bf893680
-PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/ieee1905.git
+PKG_SOURCE_URL:=https://dev.iopsys.eu/multi-ap/ieee1905.git
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)_$(PKG_SOURCE_VERSION).tar.xz
 PKG_MIRROR_HASH:=skip
 endif
diff --git a/map-agent/Makefile b/map-agent/Makefile
index 36965465b..70388834a 100644
--- a/map-agent/Makefile
+++ b/map-agent/Makefile
@@ -16,7 +16,7 @@ PKG_LICENSE_FILES:=LICENSE
 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/map-agent
+PKG_SOURCE_URL:=https://dev.iopsys.eu/multi-ap/map-agent
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)_$(PKG_SOURCE_VERSION).tar.xz
 PKG_MIRROR_HASH:=skip
 endif
diff --git a/map-controller/Makefile b/map-controller/Makefile
index 4838daee9..07c7b6169 100644
--- a/map-controller/Makefile
+++ b/map-controller/Makefile
@@ -12,7 +12,7 @@ PKG_SOURCE_VERSION:=fb600940ac54456bcde650ccee7055f7c9bb785b
 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/map-controller
+PKG_SOURCE_URL:=https://dev.iopsys.eu/multi-ap/map-controller
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)_$(PKG_SOURCE_VERSION).tar.xz
 PKG_MIRROR_HASH:=skip
 endif
diff --git a/map-topology/Makefile b/map-topology/Makefile
index 8f0322c4e..e620a12d3 100644
--- a/map-topology/Makefile
+++ b/map-topology/Makefile
@@ -12,7 +12,7 @@ LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_VERSION:=77ba77bbbcd481e41befc30b3bb141e36c01828e
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/map-topology.git
+PKG_SOURCE_URL:=https://dev.iopsys.eu/multi-ap/map-topology.git
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.xz
 PKG_MIRROR_HASH:=skip
 endif
diff --git a/wfa-capi/Makefile b/wfa-capi/Makefile
index 92dd51026..c775364de 100644
--- a/wfa-capi/Makefile
+++ b/wfa-capi/Makefile
@@ -11,7 +11,7 @@ LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_VERSION:=3e671db8f567b19c109fc13b25bc571c4c73a962
-PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/wfa-capi.git
+PKG_SOURCE_URL:=https://dev.iopsys.eu/multi-ap/wfa-capi.git
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)_$(PKG_SOURCE_VERSION).tar.xz
 PKG_MIRROR_HASH:=skip
 endif