diff --git a/configs/bb.org-debian-stretch-iot-v4.14.conf b/configs/bb.org-debian-stretch-iot-v4.14.conf
index 6aabce991403a1c2e0ffade5aac277330ec1f4f1..3a3c4010c6adb6cfb7934a6e80eea8ce22f5c5d4 100644
--- a/configs/bb.org-debian-stretch-iot-v4.14.conf
+++ b/configs/bb.org-debian-stretch-iot-v4.14.conf
@@ -151,12 +151,12 @@ repo_rcnee_pkg_list="	\
 	firmware-am57xx-opencl-monitor	\
 	gpiod	\
 	ipumm-dra7xx-installer	\
+	librobotcontrol	\
 	linux-image-4.14.53-ti-r62	\
 	mjpg-streamer	\
 	nodejs	\
 	pru-software-support-package	\
 	rcn-ee-archive-keyring	\
-	roboticscape	\
 	ti-pru-cgt-installer	\
 	tiomapconf	\
 	vpdma-dra7xx-installer	\
diff --git a/configs/bb.org-debian-stretch-iot-v4.4.conf b/configs/bb.org-debian-stretch-iot-v4.4.conf
index f25fb66569b0af98befafe6d37eda985e066fe4d..5be6c3abfc974243438714af349d037f018fd2d9 100644
--- a/configs/bb.org-debian-stretch-iot-v4.4.conf
+++ b/configs/bb.org-debian-stretch-iot-v4.4.conf
@@ -151,12 +151,12 @@ repo_rcnee_pkg_list="	\
 	firmware-am57xx-opencl-monitor	\
 	gpiod	\
 	ipumm-dra7xx-installer	\
+	librobotcontrol	\
 	linux-image-4.4.113-ti-r149	\
 	mjpg-streamer	\
 	nodejs	\
 	pru-software-support-package	\
 	rcn-ee-archive-keyring	\
-	roboticscape	\
 	ti-pru-cgt-installer	\
 	tiomapconf	\
 	vpdma-dra7xx-installer	\
diff --git a/configs/bb.org-debian-stretch-lxqt-v4.14.conf b/configs/bb.org-debian-stretch-lxqt-v4.14.conf
index fad45739eda5109596e7a25c92af14114a65819a..6fd93109fc066c4fad939903058f6ee5e42389b1 100644
--- a/configs/bb.org-debian-stretch-lxqt-v4.14.conf
+++ b/configs/bb.org-debian-stretch-lxqt-v4.14.conf
@@ -172,12 +172,12 @@ repo_rcnee_pkg_list="	\
 	firmware-am57xx-opencl-monitor	\
 	gpiod	\
 	ipumm-dra7xx-installer	\
+	librobotcontrol	\
 	linux-image-4.14.53-ti-r62	\
 	mjpg-streamer	\
 	nodejs	\
 	pru-software-support-package	\
 	rcn-ee-archive-keyring	\
-	roboticscape	\
 	ti-opencl	\
 	ti-pru-cgt-installer	\
 	tiomapconf	\
diff --git a/configs/bb.org-debian-stretch-lxqt-v4.4.conf b/configs/bb.org-debian-stretch-lxqt-v4.4.conf
index da1e96576a8252f1b6bb0555c71fb1663652446c..00056026d7b85c63656cc0a076459bd02f5b4a3e 100644
--- a/configs/bb.org-debian-stretch-lxqt-v4.4.conf
+++ b/configs/bb.org-debian-stretch-lxqt-v4.4.conf
@@ -172,12 +172,12 @@ repo_rcnee_pkg_list="	\
 	firmware-am57xx-opencl-monitor	\
 	gpiod	\
 	ipumm-dra7xx-installer	\
+	librobotcontrol	\
 	linux-image-4.4.113-ti-r149	\
 	mjpg-streamer	\
 	nodejs	\
 	pru-software-support-package	\
 	rcn-ee-archive-keyring	\
-	roboticscape	\
 	ti-pru-cgt-installer	\
 	tiomapconf	\
 	vpdma-dra7xx-installer	\
diff --git a/configs/bb.org-debian-stretch-wayland-v4.4.conf b/configs/bb.org-debian-stretch-wayland-v4.4.conf
index c748d73b7555cb94f32d375360441ac253377827..9effdf38e0662e6bd49e7226118aef1502c516ca 100644
--- a/configs/bb.org-debian-stretch-wayland-v4.4.conf
+++ b/configs/bb.org-debian-stretch-wayland-v4.4.conf
@@ -27,8 +27,8 @@ deb_include="	\
 	cpufrequtils	\
 	curl	\
 	device-tree-compiler	\
-	dosfstools	\
 	dnsmasq	\
+	dosfstools	\
 	evtest	\
 	fbset	\
 	firmware-atheros	\
@@ -139,6 +139,9 @@ repo_rcnee_pkg_list="	\
 	ardupilot-rover-3.3-bbbmini	\
 	ardupilot-rover-3.3-blue	\
 	ardupilot-rover-3.3-pocket	\
+	ardupilot-rover-3.4-bbbmini	\
+	ardupilot-rover-3.4-blue	\
+	ardupilot-rover-3.4-pocket	\
 	bb-cape-overlays	\
 	bb-customizations	\
 	bb-node-red-installer	\
@@ -152,12 +155,12 @@ repo_rcnee_pkg_list="	\
 	firmware-am57xx-opencl-monitor	\
 	gpiod	\
 	ipumm-dra7xx-installer	\
+	librobotcontrol	\
 	linux-image-4.4.113-ti-r149	\
 	mjpg-streamer	\
 	nodejs	\
 	pru-software-support-package	\
 	rcn-ee-archive-keyring	\
-	roboticscape	\
 	ti-pru-cgt-installer	\
 	tiomapconf	\
 	vpdma-dra7xx-installer	\