diff --git a/deps/Makefile b/deps/Makefile
index 710e070b0..b6bb58ada 100644
--- a/deps/Makefile
+++ b/deps/Makefile
@@ -39,20 +39,20 @@ endif
 
 
 # determine good compiler version for stdc++17
-IS_CXX17 := 0
-ifeq ($(CXX),clang++)
-	CLANG_VERSION := $(shell clang -dumpversion | tr '.' ' ' | awk '{ printf("%04d.%04d.%04d", $$1, $$2, $$3) }')
-	CLANG_MIN_VER := $(shell echo 14.0 | tr '.' ' ' | awk '{ printf("%04d.%04d.%04d", $$1, $$2, $$3) }')
-ifeq ($(CLANG_MIN_VER),$(firstword $(sort $(CLANG_VERSION) $(CLANG_MIN_VER))))
-	IS_CXX17 := 1
-endif
-else
-	GCC_VERSION := $(shell gcc -dumpfullversion 2>/dev/null || gcc -dumpversion | tr '.' ' ' | awk '{ printf("%04d.%04d.%04d", $$1, $$2, $$3) }')
-	GCC_MIN_VER := $(shell echo 8.2.0 | tr '.' ' ' | awk '{ printf("%04d.%04d.%04d", $$1, $$2, $$3) }')
-ifeq ($(GCC_MIN_VER),$(firstword $(sort $(GCC_VERSION) $(GCC_MIN_VER))))
-	IS_CXX17 := 1
-endif
-endif
+#IS_CXX17 := 0
+#ifeq ($(CXX),clang++)
+#	CLANG_VERSION := $(shell clang -dumpversion | tr '.' ' ' | awk '{ printf("%04d.%04d.%04d", $$1, $$2, $$3) }')
+#	CLANG_MIN_VER := $(shell echo 14.0 | tr '.' ' ' | awk '{ printf("%04d.%04d.%04d", $$1, $$2, $$3) }')
+#ifeq ($(CLANG_MIN_VER),$(firstword $(sort $(CLANG_VERSION) $(CLANG_MIN_VER))))
+#	IS_CXX17 := 1
+#endif
+#else
+#	GCC_VERSION := $(shell gcc -dumpfullversion 2>/dev/null || gcc -dumpversion | tr '.' ' ' | awk '{ printf("%04d.%04d.%04d", $$1, $$2, $$3) }')
+#	GCC_MIN_VER := $(shell echo 8.2.0 | tr '.' ' ' | awk '{ printf("%04d.%04d.%04d", $$1, $$2, $$3) }')
+#ifeq ($(GCC_MIN_VER),$(firstword $(sort $(GCC_VERSION) $(GCC_MIN_VER))))
+#	IS_CXX17 := 1
+#endif
+#endif
 
 
 PROXYSQLCLICKHOUSE := $(shell echo $(PROXYSQLCLICKHOUSE))
@@ -191,17 +191,17 @@ lz4: lz4/lz4/lib/liblz4.a
 
 clickhouse-cpp/clickhouse-cpp/clickhouse/libclickhouse-cpp-lib-static.a:
 	cd clickhouse-cpp && rm -rf clickhouse-cpp-*/ || true
-ifeq ($(IS_CXX17), 1)
-	echo ">>> Clickhouse CXX17"
+#ifeq ($(IS_CXX17), 1)
+#	echo ">>> Clickhouse CXX17"
 	cd clickhouse-cpp && ln -fs clickhouse-cpp-2.3.0 clickhouse-cpp
 	cd clickhouse-cpp && tar -zxf v2.3.0.tar.gz && sync
 	cd clickhouse-cpp/clickhouse-cpp && patch clickhouse/base/wire_format.h < ../wire_format.patch
-else
-	echo ">>> Clickhouse CXX11"
-	cd clickhouse-cpp && ln -fs clickhouse-cpp-1.0.0 clickhouse-cpp
-	cd clickhouse-cpp && tar -zxf v1.0.0.tar.gz && sync
-	cd clickhouse-cpp && sed -i -e 's/SET (CMAKE_CXX_STANDARD_REQUIRED ON)//' clickhouse-cpp/cmake/cpp17.cmake
-endif
+#else
+#	echo ">>> Clickhouse CXX11"
+#	cd clickhouse-cpp && ln -fs clickhouse-cpp-1.0.0 clickhouse-cpp
+#	cd clickhouse-cpp && tar -zxf v1.0.0.tar.gz && sync
+#	cd clickhouse-cpp && sed -i -e 's/SET (CMAKE_CXX_STANDARD_REQUIRED ON)//' clickhouse-cpp/cmake/cpp17.cmake
+#endif
 	cd clickhouse-cpp/clickhouse-cpp && cmake -DCMAKE_BUILD_TYPE=RelWithDebInfo .
 	cd clickhouse-cpp/clickhouse-cpp && CC=${CC} CXX=${CXX} ${MAKE}
 
diff --git a/deps/clickhouse-cpp/v1.0.0.tar.gz b/deps/clickhouse-cpp/v1.0.0.tar.gz
deleted file mode 100644
index d50894db6..000000000
Binary files a/deps/clickhouse-cpp/v1.0.0.tar.gz and /dev/null differ
diff --git a/docker-compose.yml b/docker-compose.yml
index 650a2d9a6..0ec26bf95 100755
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -47,7 +47,6 @@ services:
       - ./:/opt/proxysql/
     environment:
       - PKG_RELEASE=centos7
-      - PROXYSQL_BUILD_TYPE=clickhouse
 
   centos7_dbg_build:
     extends:
@@ -76,7 +75,6 @@ services:
     image: proxysql/packaging:build-clang-centos8
     environment:
       - PKG_RELEASE=centos8-clang
-      - PROXYSQL_BUILD_TYPE=clickhouse
 
   centos8_dbg_build:
     extends:
@@ -170,7 +168,6 @@ services:
     image: proxysql/packaging:build-clang-fedora34
     environment:
       - PKG_RELEASE=fedora34-clang
-      - PROXYSQL_BUILD_TYPE=clickhouse
 
   fedora34_dbg_build:
     image: proxysql/packaging:build-fedora34
@@ -298,7 +295,6 @@ services:
       - ./:/opt/proxysql/
     environment:
       - PKG_RELEASE=debian9
-      - PROXYSQL_BUILD_TYPE=clickhouse
 
   debian9_dbg_build:
     extends:
@@ -346,7 +342,6 @@ services:
     image: proxysql/packaging:build-clang-debian11
     environment:
       - PKG_RELEASE=debian11-clang
-      - PROXYSQL_BUILD_TYPE=clickhouse
 
   debian11_dbg_build:
     extends:
@@ -415,7 +410,6 @@ services:
       - ./:/opt/proxysql/
     environment:
       - PKG_RELEASE=ubuntu16
-      - PROXYSQL_BUILD_TYPE=clickhouse
 
   ubuntu16_dbg_build:
     extends:
@@ -463,7 +457,6 @@ services:
     image: proxysql/packaging:build-clang-ubuntu20
     environment:
       - PKG_RELEASE=ubuntu20-clang
-      - PROXYSQL_BUILD_TYPE=clickhouse
 
   ubuntu20_dbg_build:
     extends:
@@ -522,7 +515,6 @@ services:
     image: proxysql/packaging:build-clang-opensuse15
     environment:
       - PKG_RELEASE=opensuse15-clang
-      - PROXYSQL_BUILD_TYPE=clickhouse
 
   opensuse15_dbg_build:
     extends:
@@ -553,7 +545,6 @@ services:
     image: proxysql/packaging:build-clang-almalinux8
     environment:
       - PKG_RELEASE=almalinux8-clang
-      - PROXYSQL_BUILD_TYPE=clickhouse
 
   almalinux8_dbg_build:
     extends: