diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index f539636491be0e4c3c319bb216f60e210fa7ad1f..34957100c32d964725d3a0443fac7d37a81d8949 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -3,33 +3,11 @@ image: "debian"
 build:
     stage: build
     before_script:
-        - apt update -qq && apt install -y -qq gcc-arm-none-eabi python3-pip
+        - apt update -qq && apt install -y -qq gcc-arm-none-eabi python3-pip meson
         - pip3 install crc16
     script:
         - cd bootloader
         - make
         - cd ..
-        - cd Hello_World
-        - ./build_image
-        - cd ..
-        - cd Hello_World_FreeRTOS
-        - ./build_image
-        - cd ..
-        - cd ble
-        - ./build_image
-        - cd ..
-        - cd bmatest
-        - ./build_image
-        - cd ..
-        - cd bmetest
-        - ./build_image
-        - cd ..
-        - cd ecgtest
-        - ./build_image
-        - cd ..
-        - cd imutest
-        - ./build_image
-        - cd ..
-        - cd ips
-        - ./build_image
-        - cd ..
+        - meson --cross-file card10-cross.ini build/
+        - ninja -C build/
diff --git a/bootloader/Makefile b/bootloader/Makefile
index e188eecda12065a3b3b53ddd150dc8c3c2c62806..88447371d199d24cbf38dd4a92a6de755be76ebc 100644
--- a/bootloader/Makefile
+++ b/bootloader/Makefile
@@ -59,7 +59,7 @@ endif
 
 # This is the path to the CMSIS root directory
 ifeq "$(MAXIM_PATH)" ""
-LIBS_DIR=../sdk/Libraries
+LIBS_DIR=../lib/sdk/Libraries
 else
 LIBS_DIR=/$(subst \,/,$(subst :,,$(MAXIM_PATH))/Firmware/$(TARGET_UC)/Libraries)
 endif