diff --git a/.drone.jsonnet b/.drone.jsonnet
index b11bd0c..7b51109 100644
--- a/.drone.jsonnet
+++ b/.drone.jsonnet
@@ -7,7 +7,7 @@ local triggers =
 	branch: [ "master", "develop", "feature/*" ]
 };
 
-local linux_pipeline(name, image, environment, arch = "amd64", sources = "", packages = "") =
+local linux_pipeline(name, image, environment, packages = "", sources = "", arch = "amd64") =
 {
 	name: name,
     kind: "pipeline",
@@ -26,13 +26,16 @@ local linux_pipeline(name, image, environment, arch = "amd64", sources = "", pac
 			"environment": environment,
 			"commands":
 			[
+				'set -e',
+
 				'SELF=system',
 
 				if sources != "" then "apt-add-repository " + sources else "",
 				if packages != "" then "apt-get install " + packages else "",
 
 				'DRONE_BUILD_DIR=$(pwd)',
-				'BOOST_BRANCH=develop && [ "$DRONE_BRANCH" == "master" ] && BOOST_BRANCH=master || true',
+				'BOOST_BRANCH=develop',
+				'if [ "$DRONE_BRANCH" = "master" ]; then BOOST_BRANCH=master; fi',
 				'cd ..',
 				'git clone -b $BOOST_BRANCH --depth 1 https://github.com/boostorg/boost.git boost-root',
 				'cd boost-root',
@@ -40,7 +43,7 @@ local linux_pipeline(name, image, environment, arch = "amd64", sources = "", pac
 				'cp -r $DRONE_BUILD_DIR/* libs/$SELF',
 				'python tools/boostdep/depinst/depinst.py $SELF',
 				'./bootstrap.sh',
-				'./b2 headers',
+				'./b2 -d0 headers',
 
 				'echo "using $TOOLSET : : $COMPILER ;" > ~/user-config.jam',
 				'./b2 -j3 libs/$SELF/test toolset=$TOOLSET cxxstd=$CXXSTD variant=debug,release ${ADDRMD:+address-model=$ADDRMD} ${UBSAN:+cxxflags=-fsanitize=undefined cxxflags=-fno-sanitize-recover=undefined linkflags=-fsanitize=undefined define=UBSAN=1 debug-symbols=on} ${LINKFLAGS:+linkflags=$LINKFLAGS}'
@@ -58,9 +61,31 @@ local windows_pipeline =
 };
 
 [
+	linux_pipeline(
+		"Linux 18.04 GCC 8",
+		"cppalliance/droneubuntu1804:1",
+		{ TOOLSET: 'gcc', COMPILER: 'g++', CXXSTD: '14', ADDRMD: '64' },
+		"gcc-8"
+	),
+
 	linux_pipeline(
 		"Linux 20.04 GCC 9",
 		"cppalliance/droneubuntu2004:1",
-		{ TOOLSET: 'gcc', COMPILER: 'g++', CXXSTD: '03,11,14,17,2a', ADDRMD: '32,64' }
+		{ TOOLSET: 'gcc', COMPILER: 'g++', CXXSTD: '17', ADDRMD: '64' }
+	),
+
+	linux_pipeline(
+		"Linux 20.04 GCC 9 ARM",
+		"cppalliance/droneubuntu2004:1",
+		{ TOOLSET: 'gcc', COMPILER: 'g++', CXXSTD: '17', ADDRMD: '64' },
+		arch="arm64"
+	),
+
+	linux_pipeline(
+		"Linux 20.04 Clang 13",
+		"cppalliance/droneubuntu2004:1",
+		{ TOOLSET: 'clang', COMPILER: 'clang++-13', CXXSTD: '17', ADDRMD: '64' },
+		"clang-13",
+		"deb http://apt.llvm.org/focal/ llvm-toolchain-focal-13 main"
 	),
 ]