diff --git a/.builds/android.yml b/.builds/android.yml
index 7b64ab4..5e4c259 100644
--- a/.builds/android.yml
+++ b/.builds/android.yml
@@ -22,7 +22,7 @@ tasks:
     sudo docker run \
       -v /home/build:/home/build \
       -u $(id -u):$(id -g) \
-      thestr4ng3r/android:f064ea6 \
+      thestr4ng3r/android:b2853cc \
       /bin/bash -c "cd /home/build/chiaki/android && ./gradlew assembleRelease bundleRelease"
     cp chiaki/android/app/build/outputs/apk/release/app-release*.apk Chiaki.apk
     cp chiaki/android/app/build/outputs/bundle/release/app-release*.aab Chiaki.aab
diff --git a/.builds/common.yml b/.builds/common.yml
index b9ff1b7..4681f14 100644
--- a/.builds/common.yml
+++ b/.builds/common.yml
@@ -1,5 +1,5 @@
 
-image: alpine/latest
+image: alpine/edge # on edge for https://gitlab.alpinelinux.org/alpine/aports/-/issues/13287
 
 sources:
   - https://git.sr.ht/~thestr4ng3r/chiaki
diff --git a/.gitmodules b/.gitmodules
index ac87125..250f8fe 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -15,4 +15,4 @@
 	url = https://github.com/google/oboe
 [submodule "switch/borealis"]
 	path = switch/borealis
-	url = https://github.com/natinusala/borealis.git
+	url = https://git.sr.ht/~thestr4ng3r/borealis
diff --git a/cmake/switch.cmake b/cmake/switch.cmake
index 6046d67..7e600be 100644
--- a/cmake/switch.cmake
+++ b/cmake/switch.cmake
@@ -1,34 +1,15 @@
 
 # Find DEVKITPRO
 set(DEVKITPRO "$ENV{DEVKITPRO}" CACHE PATH "Path to DevKitPro")
-set(PORTLIBS_PREFIX "$ENV{PORTLIBS_PREFIX}" CACHE PATH "Path to portlibs inside DevKitPro")
-if(NOT DEVKITPRO OR NOT PORTLIBS_PREFIX)
-	message(FATAL_ERROR "Please set DEVKITPRO & PORTLIBS_PREFIX env before calling cmake. https://devkitpro.org/wiki/Getting_Started")
+if(NOT DEVKITPRO)
+	message(FATAL_ERROR "Please set DEVKITPRO env before calling cmake. https://devkitpro.org/wiki/Getting_Started")
 endif()
 
 # include devkitpro toolchain
-include("${DEVKITPRO}/switch.cmake")
+include("${DEVKITPRO}/cmake/Switch.cmake")
 
 set(NSWITCH TRUE)
 
-# Enable gcc -g, to use
-# /opt/devkitpro/devkitA64/bin/aarch64-none-elf-addr2line -e build_switch/switch/chiaki -f -p -C -a 0xCCB5C
-# set(CMAKE_BUILD_TYPE Debug)
-# set(CMAKE_POSITION_INDEPENDENT_CODE ON)
-# set(BUILD_SHARED_LIBS OFF CACHE INTERNAL "Shared libs not available" )
-
-# FIXME rework this file to use the toolchain only
-# https://github.com/diasurgical/devilutionX/pull/764
-set(ARCH "-march=armv8-a+crc+crypto -mtune=cortex-a57 -mtp=soft -ftls-model=local-exec")
-# set(CMAKE_C_FLAGS "-O2 -ffunction-sections ${ARCH}")
-set(CMAKE_CXX_FLAGS "${CMAKE_C_FLAGS}")
-# workaroud force -fPIE to avoid
-# aarch64-none-elf/bin/ld: read-only segment has dynamic relocations
-set(CMAKE_EXE_LINKER_FLAGS "-specs=${DEVKITPRO}/libnx/switch.specs ${ARCH} -fPIE -Wl,-Map,Output.map")
-
-# add portlibs to the list of include dir
-include_directories("${PORTLIBS_PREFIX}/include")
-
 # troubleshoot
 message(STATUS "CMAKE_FIND_ROOT_PATH = ${CMAKE_FIND_ROOT_PATH}")
 message(STATUS "PKG_CONFIG_EXECUTABLE = ${PKG_CONFIG_EXECUTABLE}")
@@ -79,4 +60,3 @@ function(add_nro_target output_name target title author version icon romfs)
 endfunction()
 
 set(CMAKE_USE_SYSTEM_ENVIRONMENT_PATH OFF)
-set(CMAKE_PREFIX_PATH "/")
diff --git a/scripts/Dockerfile.bionic b/scripts/Dockerfile.bionic
new file mode 100644
index 0000000..2548a2d
--- /dev/null
+++ b/scripts/Dockerfile.bionic
@@ -0,0 +1,16 @@
+
+FROM ubuntu:bionic
+
+RUN apt-get update
+RUN apt-get install -y software-properties-common gpg wget
+RUN add-apt-repository ppa:beineri/opt-qt-5.12.10-bionic
+COPY kitware-archive-latest.asc /kitware-archive-latest.asc
+RUN cat /kitware-archive-latest.asc | gpg --dearmor > /usr/share/keyrings/kitware-archive-keyring.gpg
+RUN echo 'deb [signed-by=/usr/share/keyrings/kitware-archive-keyring.gpg] https://apt.kitware.com/ubuntu/ bionic main' > /etc/apt/sources.list.d/kitware.list
+RUN apt-get update
+RUN apt-get -y install git g++ cmake ninja-build curl pkg-config unzip python3-pip \
+	libssl-dev libopus-dev qt512base qt512multimedia qt512svg \
+	libgl1-mesa-dev nasm libudev-dev libva-dev fuse libevdev-dev libudev-dev
+
+CMD []
+
diff --git a/scripts/Dockerfile.xenial b/scripts/Dockerfile.xenial
deleted file mode 100644
index dd92581..0000000
--- a/scripts/Dockerfile.xenial
+++ /dev/null
@@ -1,13 +0,0 @@
-
-FROM ubuntu:xenial
-
-RUN apt-get update
-RUN apt-get install -y software-properties-common
-RUN add-apt-repository ppa:beineri/opt-qt-5.12.3-xenial
-RUN apt-get update
-RUN apt-get -y install git g++ cmake ninja-build curl pkg-config unzip python3-pip \
-	libssl-dev libopus-dev qt512base qt512multimedia qt512svg \
-	libgl1-mesa-dev nasm libudev-dev libva-dev fuse libevdev-dev libudev-dev
-
-CMD []
-
diff --git a/scripts/kitware-archive-latest.asc b/scripts/kitware-archive-latest.asc
new file mode 100644
index 0000000..6b3a357
--- /dev/null
+++ b/scripts/kitware-archive-latest.asc
@@ -0,0 +1,64 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+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
+=cUKW
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/scripts/run-docker-build-appimage.sh b/scripts/run-docker-build-appimage.sh
index 931499c..b8625c8 100755
--- a/scripts/run-docker-build-appimage.sh
+++ b/scripts/run-docker-build-appimage.sh
@@ -3,13 +3,13 @@
 set -xe
 cd "`dirname $(readlink -f ${0})`"
 
-docker build -t chiaki-xenial . -f Dockerfile.xenial
+docker build -t chiaki-bionic . -f Dockerfile.bionic
 cd ..
 docker run --rm \
 	-v "`pwd`:/build/chiaki" \
 	-w "/build/chiaki" \
 	--device /dev/fuse \
 	--cap-add SYS_ADMIN \
-	-t chiaki-xenial \
+	-t chiaki-bionic \
 	/bin/bash -c "scripts/build-appimage.sh"
 
diff --git a/scripts/switch/build.sh b/scripts/switch/build.sh
index 1e03a2a..f04f4b2 100755
--- a/scripts/switch/build.sh
+++ b/scripts/switch/build.sh
@@ -5,10 +5,7 @@ set -xveo pipefail
 arg1=$1
 build="./build"
 if [ "$arg1" != "linux" ]; then
-	# source /opt/devkitpro/switchvars.sh
-	# toolchain="${DEVKITPRO}/switch.cmake"
 	toolchain="cmake/switch.cmake"
-	export PORTLIBS_PREFIX="$(${DEVKITPRO}/portlibs_prefix.sh switch)"
 	build="./build_switch"
 fi
 
diff --git a/scripts/switch/run-docker-build-chiaki.sh b/scripts/switch/run-docker-build-chiaki.sh
index c81c788..c52933b 100755
--- a/scripts/switch/run-docker-build-chiaki.sh
+++ b/scripts/switch/run-docker-build-chiaki.sh
@@ -6,6 +6,6 @@ docker run \
 	-v "`pwd`:/build/chiaki" \
 	-w "/build/chiaki" \
 	-t \
-	thestr4ng3r/chiaki-build-switch \
+	thestr4ng3r/chiaki-build-switch:35829cc \
 	-c "scripts/switch/build.sh"
 
diff --git a/switch/borealis b/switch/borealis
index cbdc1b6..eae1371 160000
--- a/switch/borealis
+++ b/switch/borealis
@@ -1 +1 @@
-Subproject commit cbdc1b65314d1eeb2799deae5cf6f113d6d67b46
+Subproject commit eae1371831d6cebf11b8ebd4c611069bccc6fb9b