diff --git a/CMakeLists.txt b/CMakeLists.txt
index ec290d0..2fb4445 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -37,7 +37,7 @@ if(NOT CMAKE_CONFIGURATION_TYPES)
 endif()
 
 include( ExternalProject )
-set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -pipe -Werror -Wparentheses -Wno-array-bounds -Wno-unused-result -std=gnu99 -D_DEFAULT_SOURCE")
+set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -pipe -Werror -Wno-error=cpp -Wparentheses -Wno-array-bounds -Wno-unused-result -std=gnu99 -D_DEFAULT_SOURCE")
 
 
 if(DEFINED ENABLE_CODE_COVERAGE)
diff --git a/Dockerfile b/Dockerfile
index 2338a19..98f49f2 100755
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,7 +1,7 @@
 #!/bin/echo run with: docker build . -f
 # -*- coding: utf-8 -*-
 
-FROM arm32v7/debian:stretch
+FROM arm32v7/debian:buster
 ENV target_debian_arch armhf
 
 LABEL maintainer="Philippe Coval <philippe.coval@silabs.com>"
@@ -10,8 +10,6 @@ ENV DEBIAN_FRONTEND noninteractive
 
 RUN echo "# log: Setup system"  \
   && set -x \
-  && sed -e 's|\(http://\)\(.*\)\(.debian.org\)|\1archive\3|g' -i /etc/apt/sources.list \
-  && sed -e 's|stretch-updates|stretch-proposed-updates|g' -i /etc/apt/sources.list \
   && apt-get update -y \
   && apt-get install -y sudo make \
   && date -u
@@ -22,7 +20,7 @@ WORKDIR ${workdir}
 COPY helper.mk ${workdir}
 RUN echo "# log: Install ${project}" \
   && set -x  \
-  && ./helper.mk setup/debian/stretch \
+  && ./helper.mk setup/debian/buster\
   && date -u
 
 COPY . ${workdir}
diff --git a/helper.mk b/helper.mk
index 464f2af..18ea056 100755
--- a/helper.mk
+++ b/helper.mk
@@ -86,7 +86,12 @@ setup/debian/stretch: /etc/apt/sources.list /etc/os-release
 	${sudo} apt-get update
 	${sudo} apt-get install -y ${packages}
 
-setup/debian: setup/debian/stretch
+setup/debian/buster: /etc/apt/sources.list /etc/os-release
+	grep 'VERSION="10 (buster)"' /etc/os-release
+	${sudo} apt-get update
+	${sudo} apt-get install -y ${packages}
+
+setup/debian: setup/debian/buster
 	echo "# $@"
 
 setup: setup/debian