diff --git a/Dockerfile b/Dockerfile
index d138eed..f15ddbc 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,8 +1,32 @@
 FROM ubuntu:bionic
 
-RUN apt-get update && apt-get install --no-install-recommends -y curl openjdk-11-jdk-headless cmake make gcc gcc-multilib-i686-linux-gnu gcc-multilib-arm-linux-gnueabihf gcc-aarch64-linux-gnu clang lld mingw-w64 lsb-release tar xz-utils
+RUN apt-get update && \
+        apt-get install --no-install-recommends -y \
+        curl \
+        openjdk-11-jdk-headless \
+        make \
+        gcc \
+        gcc-multilib-i686-linux-gnu \
+        gcc-multilib-arm-linux-gnueabihf \
+        gcc-aarch64-linux-gnu \
+        clang \
+        lld \
+        mingw-w64 \
+        lsb-release \
+        tar \
+        xz-utils \
+        apt-transport-https \
+        ca-certificates \
+        gnupg \
+        software-properties-common
 
-RUN curl -sL https://deb.nodesource.com/setup_14.x | bash - && apt-get install --no-install-recommends -y nodejs
+RUN curl -sL https://deb.nodesource.com/setup_14.x | bash - && \
+        apt-get install --no-install-recommends -y nodejs
+
+RUN curl -sL https://apt.kitware.com/keys/kitware-archive-latest.asc | apt-key add - && \
+        echo "deb https://apt.kitware.com/ubuntu/ $(lsb_release -cs) main" >> /etc/apt/sources.list && \
+        apt-get update && \
+        apt-get install cmake
 
 RUN apt-get clean
 
diff --git a/cmake/windows-x86-toolchain.cmake b/cmake/windows-x86-toolchain.cmake
index bec6e75..b349c30 100644
--- a/cmake/windows-x86-toolchain.cmake
+++ b/cmake/windows-x86-toolchain.cmake
@@ -1,14 +1,8 @@
 set(CMAKE_SYSTEM_NAME Windows)
 set(CMAKE_SYSTEM_PROCESSOR x86)
+
 set(TOOLCHAIN_PREFIX i686-w64-mingw32)
 
 set(CMAKE_C_COMPILER ${TOOLCHAIN_PREFIX}-gcc)
-set(CMAKE_CXX_COMPILER ${TOOLCHAIN_PREFIX}-g++)
-set(CMAKE_Fortran_COMPILER ${TOOLCHAIN_PREFIX}-gfortran)
-set(CMAKE_RC_COMPILER ${TOOLCHAIN_PREFIX}-windres)
 
-set(CMAKE_FIND_ROOT_PATH /usr/${TOOLCHAIN_PREFIX})
-
-set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
-set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
-set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
\ No newline at end of file
+set(CMAKE_SYSROOT "/usr/${TOOLCHAIN_PREFIX}")
\ No newline at end of file
diff --git a/cmake/windows-x86_64-toolchain.cmake b/cmake/windows-x86_64-toolchain.cmake
index a374eea..7daed36 100644
--- a/cmake/windows-x86_64-toolchain.cmake
+++ b/cmake/windows-x86_64-toolchain.cmake
@@ -1,14 +1,8 @@
 set(CMAKE_SYSTEM_NAME Windows)
 set(CMAKE_SYSTEM_PROCESSOR amd64)
+
 set(TOOLCHAIN_PREFIX x86_64-w64-mingw32)
 
 set(CMAKE_C_COMPILER ${TOOLCHAIN_PREFIX}-gcc)
-set(CMAKE_CXX_COMPILER ${TOOLCHAIN_PREFIX}-g++)
-set(CMAKE_Fortran_COMPILER ${TOOLCHAIN_PREFIX}-gfortran)
-set(CMAKE_RC_COMPILER ${TOOLCHAIN_PREFIX}-windres)
 
-set(CMAKE_FIND_ROOT_PATH /usr/${TOOLCHAIN_PREFIX})
-
-set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
-set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
-set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
\ No newline at end of file
+set(CMAKE_SYSROOT "/usr/${TOOLCHAIN_PREFIX}")
\ No newline at end of file
diff --git a/src/main/c/CMakeLists.txt b/src/main/c/CMakeLists.txt
index 2ad3f45..4963d10 100644
--- a/src/main/c/CMakeLists.txt
+++ b/src/main/c/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.10)
+cmake_minimum_required(VERSION 3.13)
 
 project(scriptcraft C)