diff --git a/server/Makefile b/server/Makefile
index 7caff54a..32b0a2e2 100644
--- a/server/Makefile
+++ b/server/Makefile
@@ -96,6 +96,7 @@ stage-notest:
 
 .PHONY: stage-jdbc-drivers
 stage-jdbc-drivers:
+	rm -rfv build/stage/lib
 	./gradlew $(PXF_GRADLE_PROPERTIES) stageJdbcDrivers
 
 .PHONY: install
@@ -104,6 +105,7 @@ install-jdbc-drivers: stage-jdbc-drivers
 		echo "ERROR: PXF_HOME is not set"; exit 2; \
 	fi
 	mkdir -p "$(PXF_HOME)"/lib
+	rm -fv "$(PXF_HOME)"/lib/*.jar
 	cp -R build/stage/lib/* "$(PXF_HOME)"/lib
 
 clean:
diff --git a/server/pxf-jdbc-drivers/build.gradle b/server/pxf-jdbc-drivers/build.gradle
index 169a6cf7..102a861b 100644
--- a/server/pxf-jdbc-drivers/build.gradle
+++ b/server/pxf-jdbc-drivers/build.gradle
@@ -1,15 +1,28 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
 dependencies {
     // PostgreSQL driver is used by PXF itself. 
     // Its version is defined in server/build.gradle
 
     // Clickhouse
-    implementation('com.clickhouse:clickhouse-jdbc:0.6.5')
-    implementation('com.clickhouse:clickhouse-jdbc:0.6.5:http')
-    implementation('at.yawk.lz4:lz4-java')
-    implementation('org.apache.httpcomponents.client5:httpclient5:5.3.1')     { transitive = false }
-       implementation('org.apache.httpcomponents.core5:httpcore5:5.2.4')      { transitive = false }
-       implementation('org.apache.httpcomponents.core5:httpcore5-h2:5.2.4')   { transitive = false }
-
+    implementation('com.clickhouse:clickhouse-jdbc:0.9.8:all')                { transitive = false }
 
     // DB2
     implementation('net.sf.jt400:jt400:11.2')
diff --git a/version b/version
index 9aa27aef..cd53d1a2 100644
--- a/version
+++ b/version
@@ -1 +1 @@
-6.10.2-SNAPSHOT
+6.10.3-SNAPSHOT