diff --git a/.drone.star b/.drone.star
index 7ceb3c7cf..3929976af 100644
--- a/.drone.star
+++ b/.drone.star
@@ -6,7 +6,7 @@
 #
 
 _triggers = { "branch": [ "master", "develop" ] }
-_container_tag = 'ee78aa84c0231742deb853556da1d56f5a2b8148'
+_container_tag = '61b5b771ffefa8c04c43ddc9e023152461a8295f'
 _win_container_tag = 'e7bd656c3515263f9b3c69a2d73d045f6a0fed72'
 
 
diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml
index 126022e0c..a8e59d15a 100644
--- a/.github/workflows/coverage.yml
+++ b/.github/workflows/coverage.yml
@@ -18,12 +18,12 @@ jobs:
   coverage:
     runs-on: ubuntu-latest
     container:
-      image: ghcr.io/anarthal-containers/build-gcc13:ee78aa84c0231742deb853556da1d56f5a2b8148
+      image: ghcr.io/anarthal-containers/build-gcc13:61b5b771ffefa8c04c43ddc9e023152461a8295f
       volumes:
         - /var/run/mysqld:/var/run/mysqld
     services:
       mysql:
-        image: ghcr.io/anarthal-containers/ci-db:mysql-8.4.1-ee78aa84c0231742deb853556da1d56f5a2b8148
+        image: ghcr.io/anarthal-containers/ci-db:mysql-8.4.1-61b5b771ffefa8c04c43ddc9e023152461a8295f
         ports:
           - 3306:3306
         volumes:
diff --git a/.github/workflows/fuzz.yml b/.github/workflows/fuzz.yml
index 572b4c216..20606d748 100644
--- a/.github/workflows/fuzz.yml
+++ b/.github/workflows/fuzz.yml
@@ -20,12 +20,12 @@ jobs:
   fuzz:
     runs-on: ubuntu-latest
     container:
-      image: ghcr.io/anarthal-containers/build-clang18:ee78aa84c0231742deb853556da1d56f5a2b8148
+      image: ghcr.io/anarthal-containers/build-clang18:61b5b771ffefa8c04c43ddc9e023152461a8295f
       volumes:
         - /var/run/mysqld:/var/run/mysqld
     services:
       mysql:
-        image: ghcr.io/anarthal-containers/ci-db:mysql-8.4.1-ee78aa84c0231742deb853556da1d56f5a2b8148
+        image: ghcr.io/anarthal-containers/ci-db:mysql-8.4.1-61b5b771ffefa8c04c43ddc9e023152461a8295f
         ports:
           - 3306:3306
         volumes:
diff --git a/tools/docker/build-clang11.dockerfile b/tools/docker/build-clang11.dockerfile
index d51ebffdf..6f9940862 100644
--- a/tools/docker/build-clang11.dockerfile
+++ b/tools/docker/build-clang11.dockerfile
@@ -12,6 +12,7 @@ RUN \
     apt-get --no-install-recommends -y install \
         ca-certificates \
         clang-11 \
+        llvm-11 \
         libssl-dev \
         git \
         python3 \
diff --git a/tools/docker/build-clang14.dockerfile b/tools/docker/build-clang14.dockerfile
index 9a9784db7..7d25e5a48 100644
--- a/tools/docker/build-clang14.dockerfile
+++ b/tools/docker/build-clang14.dockerfile
@@ -12,6 +12,7 @@ RUN \
     apt-get --no-install-recommends -y install \
         ca-certificates \
         clang-14 \
+        llvm-14 \
         libc++-14-dev \
         libc++abi-14-dev \
         libssl-dev \
diff --git a/tools/docker/build-clang16-i386.dockerfile b/tools/docker/build-clang16-i386.dockerfile
index 53f7b0c0a..85eaf582a 100644
--- a/tools/docker/build-clang16-i386.dockerfile
+++ b/tools/docker/build-clang16-i386.dockerfile
@@ -14,6 +14,7 @@ RUN \
     apt-get --no-install-recommends -y install \
         ca-certificates \
         clang-16 \
+        llvm-16 \
         libclang-rt-16-dev:i386 \
         libc6-dev:i386 \
         libstdc++-13-dev:i386 \
diff --git a/tools/docker/build-clang16.dockerfile b/tools/docker/build-clang16.dockerfile
index c312cd6cd..a17310613 100644
--- a/tools/docker/build-clang16.dockerfile
+++ b/tools/docker/build-clang16.dockerfile
@@ -12,6 +12,7 @@ RUN \
     apt-get --no-install-recommends -y install \
         ca-certificates \
         clang-16 \
+        llvm-16 \
         libclang-rt-16-dev \
         libc++-16-dev \
         libc++abi-16-dev \
diff --git a/tools/docker/build-clang17.dockerfile b/tools/docker/build-clang17.dockerfile
index f64406cae..b47bb8bd0 100644
--- a/tools/docker/build-clang17.dockerfile
+++ b/tools/docker/build-clang17.dockerfile
@@ -12,6 +12,7 @@ RUN \
     apt-get --no-install-recommends -y install \
         ca-certificates \
         clang-17 \
+        llvm-17 \
         libclang-rt-17-dev \
         libc++-17-dev \
         libc++abi-17-dev \
diff --git a/tools/docker/build-clang18.dockerfile b/tools/docker/build-clang18.dockerfile
index c7e3a7303..8647a2af8 100644
--- a/tools/docker/build-clang18.dockerfile
+++ b/tools/docker/build-clang18.dockerfile
@@ -12,6 +12,7 @@ RUN \
     apt-get --no-install-recommends -y install \
         ca-certificates \
         clang-18 \
+        llvm-18 \
         libclang-rt-18-dev \
         libc++-18-dev \
         libc++abi-18-dev \
diff --git a/tools/docker/build-clang3_6.dockerfile b/tools/docker/build-clang3_6.dockerfile
index 5399b8da4..d66a8669f 100644
--- a/tools/docker/build-clang3_6.dockerfile
+++ b/tools/docker/build-clang3_6.dockerfile
@@ -11,6 +11,7 @@ RUN \
     apt-get update && \
     apt-get --no-install-recommends -y install \
         clang-3.6 \
+        llvm-3.6 \
         libssl-dev \
         git \
         ca-certificates \
diff --git a/tools/docker/build-clang7.dockerfile b/tools/docker/build-clang7.dockerfile
index ff87fa517..4b2b748b2 100644
--- a/tools/docker/build-clang7.dockerfile
+++ b/tools/docker/build-clang7.dockerfile
@@ -12,6 +12,7 @@ RUN \
     apt-get --no-install-recommends -y install \
         ca-certificates \
         clang-7 \
+        llvm-7 \
         libssl-dev \
         git \
         python3 \
diff --git a/tools/scripts/build_unix_local.sh b/tools/scripts/build_unix_local.sh
index 9d8fa8a58..2565c4746 100755
--- a/tools/scripts/build_unix_local.sh
+++ b/tools/scripts/build_unix_local.sh
@@ -10,9 +10,9 @@ set -e
 
 repo_base=$(realpath $(dirname $(realpath $0))/../..)
 
-BK=docs
-IMAGE=build-docs
-SHA=ee78aa84c0231742deb853556da1d56f5a2b8148
+BK=b2
+IMAGE=build-clang11
+SHA=61b5b771ffefa8c04c43ddc9e023152461a8295f
 CONTAINER=builder-$IMAGE
 FULL_IMAGE=ghcr.io/anarthal-containers/$IMAGE:$SHA
 DB=mysql-8.4.1
@@ -34,9 +34,9 @@ docker network connect my-net $CONTAINER || echo "Network already connected"
 db_args="--server-host=$DB"
 case $BK in
     b2) cmd="$db_args
-            --toolset=gcc
+            --toolset=clang
             --cxxstd=11
-            --variant=debug
+            --variant=release
             --stdlib=native
             --address-model=64
             --separate-compilation=1