diff --git a/.gitignore b/.gitignore
index 8d416f85..100e2580 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,11 +1,13 @@
 .idea/
 # CMake
-cmake-build-*/
-CMakeFiles/
+cmake-build-*
+cmake-*
+CMakeFiles
 **/CMakeCache.txt
 cmake_install.cmake
 Makefile
-build/
+build
+tools
 
 # Resulting binary files
 *.a
diff --git a/docker/build.sh b/docker/build.sh
index 48dd9f33..f35c2f3a 100755
--- a/docker/build.sh
+++ b/docker/build.sh
@@ -20,6 +20,9 @@ MACHINE="$(uname -m)"
 
 main() {
   local target="$1"
+
+  mkdir -p "$TOOLS_DIR"
+  
   [[ ! -d "$TOOLS_DIR/$GCC_ARM_VER" ]] && GetGcc
   [[ ! -d "$TOOLS_DIR/$NRF_SDK_VER" ]] && GetNrfSdk
   [[ ! -d "$TOOLS_DIR/mcuboot" ]] && GetMcuBoot