diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index e91764af..5da9f087 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -72,11 +72,11 @@ Scan-Build/Debian:
   image: $CI_REGISTRY/$BUILD_IMAGES_PROJECT:$DEBIAN_BUILD
   script:
     - export CFLAGS="$CFLAGS_DEFAULT"
-    - export CC="clang-3.8"
     - ./bootstrap
     - scan-build --use-cc=clang-3.8 ./configure $CONFIGURE_BASE_FLAGS --enable-build-type=debug --disable-sanitizers
-    - scan-build --use-cc="ccache clang-3.8" -v -enable-checker security,nullability --status-bugs -o scan-build make -j$(nproc)
-    - scan-build --use-cc="ccache clang-3.8" -v -enable-checker security,nullability --status-bugs -o scan-build make -k check
+    - ln -s "$(which ccache)" "$(pwd)/clang-3.8"
+    - scan-build --use-cc="$(pwd)/clang-3.8" -v --exclude "$(pwd)/src/include" -enable-checker security,nullability --status-bugs -o scan-build make -j$(nproc)
+    - scan-build --use-cc="$(pwd)/clang-3.8" -v --exclude "$(pwd)/src/include" -enable-checker security,nullability --status-bugs -o scan-build make -k check
   except:
     - tags
   artifacts:
@@ -85,14 +85,15 @@ Scan-Build/Debian:
     paths:
       - scan-build/*
 
-MinGW/Debian:
-  image: $CI_REGISTRY/$BUILD_IMAGES_PROJECT:$MINGW_BUILD
-  script:
-    - export CFLAGS="$CFLAGS_DEFAULT"
-    - export CC="ccache $PREFIX-gcc"
-    - ./bootstrap
-    - ./configure $CONFIGURE_BASE_FLAGS --build=x86_64-pc-linux-gnu --host=$PREFIX --enable-build-type=release
-    - make -j$(nproc)
+# ! Cross-compiling is broken currently due to options-generator
+#MinGW/Debian:
+#  image: $CI_REGISTRY/$BUILD_IMAGES_PROJECT:$MINGW_BUILD
+#  script:
+#    - export CFLAGS="$CFLAGS_DEFAULT"
+#    - export CC="ccache $PREFIX-gcc"
+#    - ./bootstrap
+#    - ./configure $CONFIGURE_BASE_FLAGS --build=x86_64-pc-linux-gnu --host=$PREFIX --enable-build-type=release
+#    - make -j$(nproc)
 
 dist/Stretch:
   image: $CI_REGISTRY/$BUILD_IMAGES_PROJECT:$DEBIAN_BUILD