diff --git a/recipes-connectivity/networkmanager/networkmanager/am335x-nbhw16-fct/NetworkManager.conf b/recipes-connectivity/networkmanager/networkmanager-fct/am335x-nbhw16/NetworkManager.conf
similarity index 100%
rename from recipes-connectivity/networkmanager/networkmanager/am335x-nbhw16-fct/NetworkManager.conf
rename to recipes-connectivity/networkmanager/networkmanager-fct/am335x-nbhw16/NetworkManager.conf
diff --git a/recipes-connectivity/networkmanager/networkmanager-fct/am335x-nrhw20/system-connections.tar.gz b/recipes-connectivity/networkmanager/networkmanager-fct/am335x-nrhw20/system-connections.tar.gz
new file mode 100644
index 0000000..626a237
Binary files /dev/null and b/recipes-connectivity/networkmanager/networkmanager-fct/am335x-nrhw20/system-connections.tar.gz differ
diff --git a/recipes-connectivity/networkmanager/networkmanager-fct_1.4.4.bb b/recipes-connectivity/networkmanager/networkmanager-fct_1.4.4.bb
new file mode 100644
index 0000000..9338812
--- /dev/null
+++ b/recipes-connectivity/networkmanager/networkmanager-fct_1.4.4.bb
@@ -0,0 +1,6 @@
+require recipes-connectivity/networkmanager/networkmanager_1.4.4.bb
+
+FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+FILESEXTRAPATHS_append := ":${THISDIR}/networkmanager"
+
+PACKAGES = "${PN}-dbg ${PN}-staticdev ${PN}-dev ${PN}-doc ${PN}-locale ${PACKAGE_BEFORE_PN} ${PN}"
diff --git a/recipes-connectivity/networkmanager/networkmanager/am335x-nrhw20-fct/NetworkManager.conf b/recipes-connectivity/networkmanager/networkmanager/am335x-nrhw20-fct/NetworkManager.conf
deleted file mode 100644
index 0763348..0000000
--- a/recipes-connectivity/networkmanager/networkmanager/am335x-nrhw20-fct/NetworkManager.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-[device]
-wifi.scan-rand-mac-address=no
diff --git a/recipes-connectivity/networkmanager/networkmanager/am335x-nrhw20-fct/system-connections.tar.gz b/recipes-connectivity/networkmanager/networkmanager/am335x-nrhw20-fct/system-connections.tar.gz
deleted file mode 100644
index ea69609..0000000
Binary files a/recipes-connectivity/networkmanager/networkmanager/am335x-nrhw20-fct/system-connections.tar.gz and /dev/null differ
diff --git a/recipes-connectivity/networkmanager/networkmanager_1.4.4.bb b/recipes-connectivity/networkmanager/networkmanager_1.4.4.bb
index 09b3c2a..cf2889d 100644
--- a/recipes-connectivity/networkmanager/networkmanager_1.4.4.bb
+++ b/recipes-connectivity/networkmanager/networkmanager_1.4.4.bb
@@ -1,5 +1,3 @@
-FILESEXTRAPAHT_prepend := "${THISDIR}/${PN}/${MACHINE}:"
-
 SUMMARY = "NetworkManager"
 SECTION = "net/misc"