diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 23dff7f1..f028ac27 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -21,6 +21,7 @@ variables:
     - build*/*.tar*
     - build*/*_test
     - csa_results
+    - build*/SHA1SUMS
 
   script:
     - ./ci/build-gitlab.sh
@@ -76,6 +77,30 @@ Ubuntu Linux Xenial:
     - ./ci/ubuntu_prep.sh
     - ./ci/bootstrap_boost.sh
 
+Xenial OPTIMIZED:
+  <<: *linux_cfg
+  stage: build
+  image: ubuntu:xenial
+  variables:
+    FLAVOR: xenial
+    SIMD: 1
+
+  before_script:
+    - ./ci/ubuntu_prep.sh
+    - ./ci/bootstrap_boost.sh
+
+Artful OPTIMIZED:
+  <<: *linux_cfg
+  stage: build
+  image: ubuntu:artful
+  variables:
+    FLAVOR: artful
+    SIMD: 1
+
+  before_script:
+    - ./ci/ubuntu_prep.sh
+    - ./ci/bootstrap_boost.sh
+
 
 # DISABLED for now
 .Ubuntu Linux:ASAN:
diff --git a/ci/build-gitlab.sh b/ci/build-gitlab.sh
index 50f66486..fe699426 100755
--- a/ci/build-gitlab.sh
+++ b/ci/build-gitlab.sh
@@ -24,10 +24,13 @@ fi
 
 if [[ ${SIMD} -eq 1 ]]; then
     SIMD_CFG="-DRAIBLOCKS_SIMD_OPTIMIZATIONS=ON"
-    CRYPTOPP_CFG="-DCRYPTOPP_CUSTOM=ON"
+    CRYPTOPP_CFG=""
+    echo SIMD and other optimizations enabled
+    echo local CPU:
+    cat /proc/cpuinfo # TBD for macOS
 else
     SIMD_CFG=""
-    CRYPTOPP_CFG=""
+    CRYPTOPP_CFG="-DCRYPTOPP_CUSTOM=ON"
 fi
 
 if [[ ${ASAN_INT} -eq 1 ]]; then