diff --git a/userspace/base_setup.sh b/userspace/base_setup.sh
index d414b1c..8a923d3 100755
--- a/userspace/base_setup.sh
+++ b/userspace/base_setup.sh
@@ -124,16 +124,11 @@ echo "comma ALL=(ALL) NOPASSWD: ALL" >> /etc/sudoers
 # setup /bin/sh symlink
 ln -sf /bin/bash /bin/sh
 
-# Add bionic repo to sources
-echo "" >> /etc/apt/sources.list
-echo "deb http://ports.ubuntu.com/ubuntu-ports/ bionic main restricted" >> /etc/apt/sources.list
-echo "deb http://ports.ubuntu.com/ubuntu-ports/ bionic universe" >> /etc/apt/sources.list
-
 # Install necessary libs
 apt-get update -yq
 apt-get install --no-install-recommends -yq \
     libacl1:armhf \
-    libasan2-armhf-cross \
+    libasan5-armhf-cross \
     libatomic1-armhf-cross \
     libattr1:armhf \
     libaudit1:armhf \
@@ -147,11 +142,11 @@ apt-get install --no-install-recommends -yq \
     libdrm2:armhf \
     libevdev2:armhf \
     libexpat1:armhf \
-    libffi6:armhf \
+    libffi7:armhf \
     libfontconfig1:armhf \
     libfreetype6:armhf \
     libgbm1:armhf \
-    libgcc-5-dev-armhf-cross \
+    libgcc-9-dev-armhf-cross \
     libgcc1:armhf \
     libglib2.0-0:armhf \
     libgomp1-armhf-cross \
@@ -174,7 +169,7 @@ apt-get install --no-install-recommends -yq \
     libselinux1:armhf \
     libstdc++6:armhf \
     libstdc++6-armhf-cross \
-    libubsan0-armhf-cross \
+    libubsan1-armhf-cross \
     libudev-dev:armhf \
     libudev1:armhf \
     libuuid1:armhf \
@@ -209,5 +204,4 @@ apt-get install --no-install-recommends -yq \
     wpasupplicant \
     hostapd \
     libgtk2.0-dev \
-    libcap2:armhf \
     libxml2:armhf \
diff --git a/userspace/libs32/libffi.so.6 b/userspace/libs32/libffi.so.6
new file mode 120000
index 0000000..c6cc6fd
--- /dev/null
+++ b/userspace/libs32/libffi.so.6
@@ -0,0 +1 @@
+libffi.so.6.0.4
\ No newline at end of file
diff --git a/userspace/libs32/libffi.so.6.0.4 b/userspace/libs32/libffi.so.6.0.4
new file mode 100755
index 0000000..ce7181d
Binary files /dev/null and b/userspace/libs32/libffi.so.6.0.4 differ