diff --git a/.clang-format b/.clang-format
index 756e3ff9..6a2af9ee 100644
--- a/.clang-format
+++ b/.clang-format
@@ -6,7 +6,7 @@ AlignEscapedNewlines: Left
 AlignOperands: true
 AlignTrailingComments: false
 AllowAllParametersOfDeclarationOnNextLine: false
-AllowShortBlocksOnASingleLine: false
+AllowShortBlocksOnASingleLine: Never
 AllowShortCaseLabelsOnASingleLine: false
 AllowShortFunctionsOnASingleLine: None
 AllowShortIfStatementsOnASingleLine: true
diff --git a/applications/gui/gui_event.c b/applications/gui/gui_event.c
index 44b4d5fc..7c727206 100644
--- a/applications/gui/gui_event.c
+++ b/applications/gui/gui_event.c
@@ -41,20 +41,26 @@ GuiEvent* gui_event_alloc() {
 }
 
 void gui_event_free(GuiEvent* gui_event) {
+    osStatus_t status;
     assert(gui_event);
     gui_event_unlock(gui_event);
-    assert(osMessageQueueDelete(gui_event->mqueue) == osOK);
+    status = osMessageQueueDelete(gui_event->mqueue);
+    assert(status == osOK);
     free(gui_event);
 }
 
 void gui_event_lock(GuiEvent* gui_event) {
+    osStatus_t status;
     assert(gui_event);
-    assert(osMutexAcquire(gui_event->lock_mutex, osWaitForever) == osOK);
+    status = osMutexAcquire(gui_event->lock_mutex, osWaitForever);
+    assert(status == osOK);
 }
 
 void gui_event_unlock(GuiEvent* gui_event) {
+    osStatus_t status;
     assert(gui_event);
-    assert(osMutexRelease(gui_event->lock_mutex) == osOK);
+    status = osMutexRelease(gui_event->lock_mutex);
+    assert(status == osOK);
 }
 
 void gui_event_messsage_send(GuiEvent* gui_event, GuiMessage* message) {
@@ -64,10 +70,12 @@ void gui_event_messsage_send(GuiEvent* gui_event, GuiMessage* message) {
 }
 
 GuiMessage gui_event_message_next(GuiEvent* gui_event) {
+    osStatus_t status;
     assert(gui_event);
     GuiMessage message;
     gui_event_unlock(gui_event);
-    assert(osMessageQueueGet(gui_event->mqueue, &message, NULL, osWaitForever) == osOK);
+    status = osMessageQueueGet(gui_event->mqueue, &message, NULL, osWaitForever);
+    assert(status == osOK);
     gui_event_lock(gui_event);
     return message;
 }
diff --git a/applications/menu/menu_event.c b/applications/menu/menu_event.c
index 4470ffd6..af0f1227 100644
--- a/applications/menu/menu_event.c
+++ b/applications/menu/menu_event.c
@@ -35,8 +35,10 @@ MenuEvent* menu_event_alloc() {
 }
 
 void menu_event_free(MenuEvent* menu_event) {
+    osStatus_t status;
     assert(menu_event);
-    assert(osMessageQueueDelete(menu_event->mqueue) == osOK);
+    status = osMessageQueueDelete(menu_event->mqueue);
+    assert(status == osOK);
     free(menu_event);
 }
 
diff --git a/docker/Dockerfile b/docker/Dockerfile
index f5918029..22174fbc 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -4,6 +4,8 @@ ENV PATH /root/.cargo/bin:$PATH
 
 RUN apt update && \
     apt install -y --no-install-recommends \
+        software-properties-common \
+        gpg-agent \
         make \
         gcc-arm-none-eabi \
         binutils-arm-none-eabi \
@@ -19,11 +21,17 @@ RUN apt update && \
         python \
         python-pip \
         libstdc++-arm-none-eabi-newlib \
-        libclang-10-dev \
-        clang-format-10 \
         git \
         && apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
 
+RUN wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key| apt-key add - && add-apt-repository "deb http://apt.llvm.org/bionic/ llvm-toolchain-bionic main"
+
+RUN apt update && \
+    apt install -y --no-install-recommends \
+        libclang-12-dev \
+        clang-format-12 \
+        && apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
+
 RUN curl https://sh.rustup.rs -sSf | sh -s -- -y --profile=minimal --target thumbv7em-none-eabi thumbv7em-none-eabihf && \
     rustup component add rustfmt --toolchain stable-x86_64-unknown-linux-gnu
 
diff --git a/docker/syntax_check.sh b/docker/syntax_check.sh
index 0294b696..e7be6a8e 100755
--- a/docker/syntax_check.sh
+++ b/docker/syntax_check.sh
@@ -2,7 +2,7 @@
 
 # set -e
 
-CLANG_FORMAT_BIN="/usr/bin/clang-format-10"
+CLANG_FORMAT_BIN="/usr/bin/clang-format-12"
 PATH="$HOME/.cargo/bin:${PATH}"
 
 PROJECT_DIR=$(pwd)