diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 43d75787..640e05c8 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,6 +1,6 @@
 ## Raiblocks CI config
 
-image: ubuntu:zesty
+image: ubuntu:xenial
 
 stages:
   - build
@@ -11,6 +11,7 @@ variables:
 
 .linux_template: &linux_cfg
   variables:
+    BOOST_ROOT: /usr/local/boost
     CC: clang
     CXX: clang++
 
@@ -24,9 +25,6 @@ variables:
   script:
     - ./ci/build.sh
 
-  after_script:
-    - ./ci/test.sh
-
 
 Arch Linux:
   <<: *linux_cfg
@@ -46,29 +44,40 @@ Ubuntu Linux Trusty:
   stage: build
   image: ubuntu:trusty
   variables:
-    BOOST_ROOT: /usr/local/boost
     CC: gcc
     CXX: g++
-    NO_SIMD: 1
-    FLAVOR: trusty_no_simd
+    FLAVOR: trusty
 
   before_script:
     - ./ci/ubuntu_prep.sh
     - ./ci/bootstrap_boost.sh
 
 
-Ubuntu Linux Zesty:
+Ubuntu Linux Artful:
   <<: *linux_cfg
   stage: build
-  image: ubuntu:zesty
+  image: ubuntu:artful
   variables:
-    FLAVOR: zesty
+    FLAVOR: artful
 
   before_script:
     - ./ci/ubuntu_prep.sh
+    - ./ci/bootstrap_boost.sh
+
+Ubuntu Linux Xenial:
+  <<: *linux_cfg
+  stage: build
+  image: ubuntu:xenial
+  variables:
+    FLAVOR: xenial
+
+  before_script:
+    - ./ci/ubuntu_prep.sh
+    - ./ci/bootstrap_boost.sh
 
 
-Ubuntu Linux:ASAN:
+# DISABLED for now
+.Ubuntu Linux:ASAN:
   <<: *linux_cfg
   stage: build
   variables:
@@ -77,10 +86,12 @@ Ubuntu Linux:ASAN:
 
   before_script:
     - ./ci/ubuntu_prep.sh
+    - ./ci/bootstrap_boost.sh
 
 
 
-Ubuntu Linux:TSAN:
+# DISABLED for now
+.Ubuntu Linux:TSAN:
   <<: *linux_cfg
   stage: build
   variables:
diff --git a/ci/build.sh b/ci/build.sh
index 99c8bd88..82d834f7 100755
--- a/ci/build.sh
+++ b/ci/build.sh
@@ -1,9 +1,11 @@
 #!/usr/bin/env bash
 
+set -o xtrace
+
 DISTRO_CFG=""
 if [[ "$OSTYPE" == "linux-gnu" ]]; then
     CPACK_TYPE="TBZ2"
-    distro=$(lsb_release -i -s)
+    distro=$(lsb_release -i -c -s|tr '\n' '_')
     DISTRO_CFG="-DRAIBLOCKS_DISTRO_NAME=${distro}"
 elif [[ "$OSTYPE" == "darwin"* ]]; then
     CPACK_TYPE="DragNDrop"
@@ -20,11 +22,11 @@ else
     CPACK_TYPE="TBZ2"
 fi
 
-if [[ ${NO_SIMD} -eq 1 ]]; then
-    NOSIMD_CFG="-DRAIBLOCKS_SIMD_OPTIMIZATIONS=OFF"
+if [[ ${SIMD} -eq 1 ]]; then
+    SIMD_CFG="-DRAIBLOCKS_SIMD_OPTIMIZATIONS=ON"
     CRYPTOPP_CFG="-DCRYPTOPP_CUSTOM=ON"
 else
-    NOSIMD_CFG=""
+    SIMD_CFG=""
     CRYPTOPP_CFG=""
 fi
 
@@ -38,7 +40,7 @@ else
     SANITIZERS=""
 fi
 
-if [[ ${BOOST_ROOT} -ne "" ]]; then
+if [[ "${BOOST_ROOT}" -ne "" ]]; then
     BOOST_CFG="-DBOOST_ROOT='${BOOST_ROOT}'"
 else
     BOOST_CFG=""
@@ -57,15 +59,14 @@ run_build() {
     mkdir ${build_dir}
     cd ${build_dir}
     cmake -GNinja \
-       -DACTIVE_NETWORK=rai_test_network \
-       -DRAIBLOCKS_TEST=ON \
        -DRAIBLOCKS_GUI=ON \
-       -DCMAKE_BUILD_TYPE=Debug \
+       -DCMAKE_BUILD_TYPE=Release \
        -DCMAKE_VERBOSE_MAKEFILE=ON \
        -DCMAKE_INSTALL_PREFIX="../install" \
        ${CRYPTOPP_CFG} \
        ${DISTRO_CFG} \
-       ${NOSIMD_CFG} \
+       ${SIMD_CFG} \
+       -DBOOST_ROOT=/usr/local/boost \
        ${BOOST_CFG} \
        ${SANITIZERS} \
        ..