diff --git a/Jenkinsfile b/Jenkinsfile
index 14f05e4..5c739a7 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -37,7 +37,7 @@ node {
 	sh "rm -rvf ${rel_dir}"
 	sh "mkdir -p ${rel_dir}"
 	def _msg = "Built images:"
-	def platforms = ['debian', 'osx', 'windows', 'windows32', 'android', 'pi', 'ubuntu']
+	def platforms = ['debian', 'debian11', 'osx', 'windows', 'windows32', 'android', 'pi', 'ubuntu']
 	for (int i = 0; i < platforms.size(); ++i) {
 		if (_envmap["BUILD_${platforms[i]}"] == "1") {
 			stage("${platforms[i]}-shstk") {
diff --git a/docker/android-shstk/Dockerfile b/docker/android-shstk/Dockerfile
index 5a86577..6e93cfa 100644
--- a/docker/android-shstk/Dockerfile
+++ b/docker/android-shstk/Dockerfile
@@ -13,8 +13,8 @@ WORKDIR /soft
 RUN git clone -b release --single-branch --depth 1 --recursive https://git.shs.tools/SHS/shstk.git
 
 WORKDIR /soft/shstk_build_host
-RUN cmake -DICU=0 -DCROSSTOOLS=1 -DBUILD_NUMBER=${LIBS_BUILD_NUMBER} ../shstk \
- && make install -j${JOBS_COUNT} \
+RUN cmake -G Ninja -DICU=0 -DCROSSTOOLS=1 -DBUILD_NUMBER=${LIBS_BUILD_NUMBER} ../shstk \
+ && cmake --build ./ --target install -j${JOBS_COUNT} \
  && rm -rf * \
  && ldconfig
 
@@ -22,23 +22,23 @@ WORKDIR /soft/shstk_build_anroid
 ENV _ANDROID_TOOLCHAIN=/usr/lib/android-sdk/ndk-bundle/build/cmake/android.toolchain.cmake
 
 ENV _CUR_ABI=armeabi-v7a
-RUN cmake -DCMAKE_INSTALL_PREFIX=/soft/android/${_CUR_ABI} -DICU=0 -DLOCAL=1 -DQGLENGINE=0 -DQGLVIEW=0 -DBUILD_NUMBER=${LIBS_BUILD_NUMBER} -DCMAKE_TOOLCHAIN_FILE=${_ANDROID_TOOLCHAIN} -DQt5_DIR=/soft/android/qt/lib/cmake/Qt5 -DANDROID_PLATFORM=${NDK_PLATFORM} -DANDROID_ABI=${_CUR_ABI} ../shstk/ \
- && make install -j${JOBS_COUNT} && rm -rf *
+RUN cmake -G Ninja -DCMAKE_INSTALL_PREFIX=/soft/android/${_CUR_ABI} -DICU=0 -DLOCAL=1 -DQGLENGINE=0 -DQGLVIEW=0 -DBUILD_NUMBER=${LIBS_BUILD_NUMBER} -DCMAKE_TOOLCHAIN_FILE=${_ANDROID_TOOLCHAIN} -DQt5_DIR=/soft/android/qt/lib/cmake/Qt5 -DANDROID_PLATFORM=${NDK_PLATFORM} -DANDROID_ABI=${_CUR_ABI} ../shstk/ \
+ && cmake --build ./ --target install -j${JOBS_COUNT} && rm -rf *
 
 ENV _CUR_ABI=arm64-v8a
 WORKDIR /soft/shstk_build_android_${_CUR_ABI}
-RUN cmake -DCMAKE_INSTALL_PREFIX=/soft/android/${_CUR_ABI} -DICU=0 -DLOCAL=1 -DQGLENGINE=0 -DQGLVIEW=0 -DBUILD_NUMBER=${LIBS_BUILD_NUMBER} -DCMAKE_TOOLCHAIN_FILE=${_ANDROID_TOOLCHAIN} -DQt5_DIR=/soft/android/qt/lib/cmake/Qt5 -DANDROID_PLATFORM=${NDK_PLATFORM} -DANDROID_ABI=${_CUR_ABI} ../shstk/ \
- && make install -j${JOBS_COUNT} && rm -rf *
+RUN cmake -G Ninja -DCMAKE_INSTALL_PREFIX=/soft/android/${_CUR_ABI} -DICU=0 -DLOCAL=1 -DQGLENGINE=0 -DQGLVIEW=0 -DBUILD_NUMBER=${LIBS_BUILD_NUMBER} -DCMAKE_TOOLCHAIN_FILE=${_ANDROID_TOOLCHAIN} -DQt5_DIR=/soft/android/qt/lib/cmake/Qt5 -DANDROID_PLATFORM=${NDK_PLATFORM} -DANDROID_ABI=${_CUR_ABI} ../shstk/ \
+ && cmake --build ./ --target install -j${JOBS_COUNT} && rm -rf *
 
 ENV _CUR_ABI=x86
 WORKDIR /soft/shstk_build_android_${_CUR_ABI}
-RUN cmake -DCMAKE_INSTALL_PREFIX=/soft/android/${_CUR_ABI} -DICU=0 -DLOCAL=1 -DQGLENGINE=0 -DQGLVIEW=0 -DBUILD_NUMBER=${LIBS_BUILD_NUMBER} -DCMAKE_TOOLCHAIN_FILE=${_ANDROID_TOOLCHAIN} -DQt5_DIR=/soft/android/qt/lib/cmake/Qt5 -DANDROID_PLATFORM=${NDK_PLATFORM} -DANDROID_ABI=${_CUR_ABI} ../shstk/ \
- && make install -j${JOBS_COUNT} && rm -rf *
+RUN cmake -G Ninja -DCMAKE_INSTALL_PREFIX=/soft/android/${_CUR_ABI} -DICU=0 -DLOCAL=1 -DQGLENGINE=0 -DQGLVIEW=0 -DBUILD_NUMBER=${LIBS_BUILD_NUMBER} -DCMAKE_TOOLCHAIN_FILE=${_ANDROID_TOOLCHAIN} -DQt5_DIR=/soft/android/qt/lib/cmake/Qt5 -DANDROID_PLATFORM=${NDK_PLATFORM} -DANDROID_ABI=${_CUR_ABI} ../shstk/ \
+ && cmake --build ./ --target install -j${JOBS_COUNT} && rm -rf *
 
 ENV _CUR_ABI=x86_64
 WORKDIR /soft/shstk_build_android_${_CUR_ABI}
-RUN cmake -DCMAKE_INSTALL_PREFIX=/soft/android/${_CUR_ABI} -DICU=0 -DLOCAL=1 -DQGLENGINE=0 -DQGLVIEW=0 -DBUILD_NUMBER=${LIBS_BUILD_NUMBER} -DCMAKE_TOOLCHAIN_FILE=${_ANDROID_TOOLCHAIN} -DQt5_DIR=/soft/android/qt/lib/cmake/Qt5 -DANDROID_PLATFORM=${NDK_PLATFORM} -DANDROID_ABI=${_CUR_ABI} ../shstk/ \
- && make install -j${JOBS_COUNT} && rm -rf *
+RUN cmake -G Ninja -DCMAKE_INSTALL_PREFIX=/soft/android/${_CUR_ABI} -DICU=0 -DLOCAL=1 -DQGLENGINE=0 -DQGLVIEW=0 -DBUILD_NUMBER=${LIBS_BUILD_NUMBER} -DCMAKE_TOOLCHAIN_FILE=${_ANDROID_TOOLCHAIN} -DQt5_DIR=/soft/android/qt/lib/cmake/Qt5 -DANDROID_PLATFORM=${NDK_PLATFORM} -DANDROID_ABI=${_CUR_ABI} ../shstk/ \
+ && cmake --build ./ --target install -j${JOBS_COUNT} && rm -rf *
 
 RUN mkdir -p /soft/shstk/release
 
diff --git a/docker/debian-shstk/Dockerfile b/docker/debian-shstk/Dockerfile
index 71ab924..fbce5bd 100644
--- a/docker/debian-shstk/Dockerfile
+++ b/docker/debian-shstk/Dockerfile
@@ -9,9 +9,9 @@ WORKDIR /soft
 RUN git clone -b master --single-branch --depth 1 --recursive https://git.shs.tools/SHS/shstk.git
 
 WORKDIR /soft/shstk_build_debian
-RUN cmake -DICU=0 -DLOCAL=0 -DQGLENGINE=1 -DQGLVIEW=1 -DHAS_GL=0 -DBUILD_NUMBER=${LIBS_BUILD_NUMBER} ../shstk \
- && make install -j${JOBS_COUNT} \
- && make deploy -j${JOBS_COUNT} \
+RUN cmake -G Ninja -DICU=0 -DLOCAL=0 -DQGLENGINE=1 -DQGLVIEW=1 -DHAS_GL=0 -DBUILD_NUMBER=${LIBS_BUILD_NUMBER} ../shstk \
+ && cmake --build ./ --target install -j${JOBS_COUNT} \
+ && cmake --build ./ --target deploy -j${JOBS_COUNT} \
  && rm -rf * \
  && ldconfig
  
diff --git a/docker/debian11-shstk/Dockerfile b/docker/debian11-shstk/Dockerfile
new file mode 100644
index 0000000..5c2e8ed
--- /dev/null
+++ b/docker/debian11-shstk/Dockerfile
@@ -0,0 +1,18 @@
+ARG DOCKER_PREFIX=wapmobil/
+FROM ${DOCKER_PREFIX}debian11
+
+ARG LIBS_BUILD_NUMBER=9999
+ARG JOBS_COUNT=4
+ENV PATH=/opt/cmake/bin:$PATH 
+
+WORKDIR /soft
+RUN git clone -b master --single-branch --depth 1 --recursive https://git.shs.tools/SHS/shstk.git
+
+WORKDIR /soft/shstk_build_debian
+RUN cmake -G Ninja -DICU=0 -DLOCAL=0 -DQGLENGINE=1 -DQGLVIEW=1 -DHAS_GL=0 -DBUILD_NUMBER=${LIBS_BUILD_NUMBER} ../shstk \
+ && cmake --build ./ --target install -j${JOBS_COUNT} \
+ && cmake --build ./ --target deploy -j${JOBS_COUNT} \
+ && rm -rf * \
+ && ldconfig
+ 
+WORKDIR /soft/src
diff --git a/docker/osx-shstk/Dockerfile b/docker/osx-shstk/Dockerfile
index 989eadd..89cae55 100644
--- a/docker/osx-shstk/Dockerfile
+++ b/docker/osx-shstk/Dockerfile
@@ -9,15 +9,15 @@ WORKDIR /soft
 RUN git clone -b release --single-branch --depth 1 --recursive https://git.shs.tools/SHS/shstk.git
 
 WORKDIR /soft/shstk_build_host
-RUN cmake -DICU=0 -DCROSSTOOLS=1 -DBUILD_NUMBER=${LIBS_BUILD_NUMBER} ../shstk \
- && make install -j${JOBS_COUNT} \
+RUN cmake -G Ninja -DICU=0 -DCROSSTOOLS=1 -DBUILD_NUMBER=${LIBS_BUILD_NUMBER} ../shstk \
+ && cmake --build ./ --target install -j${JOBS_COUNT} \
  && rm -rf * \
  && ldconfig
 
 WORKDIR /soft/shstk_build_osx
-RUN cmake -DCMAKE_INSTALL_PREFIX=/soft/osx -DICU=0 -DLOCAL=1 -DQGLENGINE=1 -DQGLVIEW=1 -DBUILD_NUMBER=${LIBS_BUILD_NUMBER} -DCMAKE_TOOLCHAIN_FILE=/soft/toolchain-Darwin.cmake ../shstk/ \
- && make install -j${JOBS_COUNT} \
- && make deploy -j${JOBS_COUNT} \
+RUN cmake -G Ninja -DCMAKE_INSTALL_PREFIX=/soft/osx -DICU=0 -DLOCAL=1 -DQGLENGINE=1 -DQGLVIEW=1 -DBUILD_NUMBER=${LIBS_BUILD_NUMBER} -DCMAKE_TOOLCHAIN_FILE=/soft/toolchain-Darwin.cmake ../shstk/ \
+ && cmake --build ./ --target install -j${JOBS_COUNT} \
+ && cmake --build ./ --target deploy -j${JOBS_COUNT} \
  && rm -rf *
 
 WORKDIR /soft/src
diff --git a/docker/pi-shstk/Dockerfile b/docker/pi-shstk/Dockerfile
index 57a82b5..946b26c 100644
--- a/docker/pi-shstk/Dockerfile
+++ b/docker/pi-shstk/Dockerfile
@@ -9,15 +9,15 @@ WORKDIR /soft
 RUN git clone -b release --single-branch --depth 1 --recursive https://git.shs.tools/SHS/shstk.git
 
 WORKDIR /soft/shstk_build_host
-RUN cmake -DICU=0 -DCROSSTOOLS=1 -DBUILD_NUMBER=${LIBS_BUILD_NUMBER} ../shstk \
- && make install -j${JOBS_COUNT} \
+RUN cmake -G Ninja -DICU=0 -DCROSSTOOLS=1 -DBUILD_NUMBER=${LIBS_BUILD_NUMBER} ../shstk \
+ && cmake --build ./ --target install -j${JOBS_COUNT} \
  && rm -rf * \
  && ldconfig
 
 WORKDIR /soft/shstk_build_pi
-RUN cmake -DCMAKE_INSTALL_PREFIX=/soft/pi/usr -DICU=0 -DLOCAL=1 -DQGLENGINE=0 -DQGLVIEW=0 -DHAS_GL=0 -DBUILD_NUMBER=${LIBS_BUILD_NUMBER} -DCMAKE_TOOLCHAIN_FILE=/soft/toolchain-RPi.cmake ../shstk/ \
- && make install -j${JOBS_COUNT} \
- && make deploy -j${JOBS_COUNT} \
+RUN cmake -G Ninja -DCMAKE_INSTALL_PREFIX=/soft/pi/usr -DICU=0 -DLOCAL=1 -DQGLENGINE=0 -DQGLVIEW=0 -DHAS_GL=0 -DBUILD_NUMBER=${LIBS_BUILD_NUMBER} -DCMAKE_TOOLCHAIN_FILE=/soft/toolchain-RPi.cmake ../shstk/ \
+ && cmake --build ./ --target install -j${JOBS_COUNT} \
+ && cmake --build ./ --target deploy -j${JOBS_COUNT} \
  && rm -rf *
 
 WORKDIR /soft/src
diff --git a/docker/ubuntu-shstk/Dockerfile b/docker/ubuntu-shstk/Dockerfile
index 15d0c76..2f759f5 100644
--- a/docker/ubuntu-shstk/Dockerfile
+++ b/docker/ubuntu-shstk/Dockerfile
@@ -9,9 +9,9 @@ WORKDIR /soft
 RUN git clone -b master --single-branch --depth 1 --recursive https://git.shs.tools/SHS/shstk.git
 
 WORKDIR /soft/shstk_build_ubuntu
-RUN cmake -DICU=0 -DLOCAL=0 -DQGLENGINE=1 -DQGLVIEW=1 -DHAS_GL=0 -DBUILD_NUMBER=${LIBS_BUILD_NUMBER} ../shstk \
- && make install -j${JOBS_COUNT} \
- && make deploy -j${JOBS_COUNT} \
+RUN cmake -G Ninja -DICU=0 -DLOCAL=0 -DQGLENGINE=1 -DQGLVIEW=1 -DHAS_GL=0 -DBUILD_NUMBER=${LIBS_BUILD_NUMBER} ../shstk \
+ && cmake --build ./ --target install -j${JOBS_COUNT} \
+ && cmake --build ./ --target deploy -j${JOBS_COUNT} \
  && rm -rf * \
  && ldconfig
  
diff --git a/docker/windows-shstk/Dockerfile b/docker/windows-shstk/Dockerfile
index c43be7e..187e8a6 100644
--- a/docker/windows-shstk/Dockerfile
+++ b/docker/windows-shstk/Dockerfile
@@ -9,15 +9,15 @@ WORKDIR /soft
 RUN git clone -b release --single-branch --depth 1 --recursive https://git.shs.tools/SHS/shstk.git
 
 WORKDIR /soft/shstk_build_host
-RUN cmake -DICU=0 -DCROSSTOOLS=1 -DBUILD_NUMBER=${LIBS_BUILD_NUMBER} ../shstk \
- && make install -j${JOBS_COUNT} \
+RUN cmake -G Ninja -DICU=0 -DCROSSTOOLS=1 -DBUILD_NUMBER=${LIBS_BUILD_NUMBER} ../shstk \
+ && cmake --build ./ --target install -j${JOBS_COUNT} \
  && rm -rf * \
  && ldconfig
 
 WORKDIR /soft/shstk_build_windows
-RUN cmake -DCMAKE_INSTALL_PREFIX=/soft/windows -DICU=0 -DLOCAL=1 -DQGLENGINE=1 -DQGLVIEW=1 -DBUILD_NUMBER=${LIBS_BUILD_NUMBER} -DCMAKE_TOOLCHAIN_FILE=/soft/toolchain-Windows.cmake ../shstk/ \
- && make install -j${JOBS_COUNT} \
- && make deploy -j${JOBS_COUNT} \
+RUN cmake -G Ninja -DCMAKE_INSTALL_PREFIX=/soft/windows -DICU=0 -DLOCAL=1 -DQGLENGINE=1 -DQGLVIEW=1 -DBUILD_NUMBER=${LIBS_BUILD_NUMBER} -DCMAKE_TOOLCHAIN_FILE=/soft/toolchain-Windows.cmake ../shstk/ \
+ && cmake --build ./ --target install -j${JOBS_COUNT} \
+ && cmake --build ./ --target deploy -j${JOBS_COUNT} \
  && rm -rf *
  
 WORKDIR /soft/src
diff --git a/docker/windows32-shstk/Dockerfile b/docker/windows32-shstk/Dockerfile
index 65549cb..0c6291e 100644
--- a/docker/windows32-shstk/Dockerfile
+++ b/docker/windows32-shstk/Dockerfile
@@ -9,15 +9,15 @@ WORKDIR /soft
 RUN git clone -b release --single-branch --depth 1 --recursive https://git.shs.tools/SHS/shstk.git
 
 WORKDIR /soft/shstk_build_host
-RUN cmake -DICU=0 -DCROSSTOOLS=1 -DBUILD_NUMBER=${LIBS_BUILD_NUMBER} ../shstk \
- && make install -j${JOBS_COUNT} \
+RUN cmake -G Ninja -DICU=0 -DCROSSTOOLS=1 -DBUILD_NUMBER=${LIBS_BUILD_NUMBER} ../shstk \
+ && cmake --build ./ --target install -j${JOBS_COUNT} \
  && rm -rf * \
  && ldconfig
 
 WORKDIR /soft/shstk_build_windows32
-RUN cmake -DCMAKE_INSTALL_PREFIX=/soft/windows32 -DICU=0 -DLOCAL=1 -DQGLENGINE=1 -DQGLVIEW=1 -DBUILD_NUMBER=${LIBS_BUILD_NUMBER} -DCMAKE_TOOLCHAIN_FILE=/soft/toolchain-Windows32.cmake ../shstk/ \
- && make install -j${JOBS_COUNT} \
- && make deploy -j${JOBS_COUNT} \
+RUN cmake -G Ninja -DCMAKE_INSTALL_PREFIX=/soft/windows32 -DICU=0 -DLOCAL=1 -DQGLENGINE=1 -DQGLVIEW=1 -DBUILD_NUMBER=${LIBS_BUILD_NUMBER} -DCMAKE_TOOLCHAIN_FILE=/soft/toolchain-Windows32.cmake ../shstk/ \
+ && cmake --build ./ --target install -j${JOBS_COUNT} \
+ && cmake --build ./ --target deploy -j${JOBS_COUNT} \
  && rm -rf *
  
 WORKDIR /soft/src