diff --git a/docker-compose.yml b/docker-compose.yml
index b273dfdfc59..8b2c406b7a2 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -239,7 +239,7 @@ services:
     build:
       context: ./clickhouse
       args:
-        BASE_IMAGE: "altinity/clickhouse-server:25.8.33.10002.altinitystable"
+        BASE_IMAGE: "clickhouse/clickhouse-server:26.8.36.3@sha256:d426d2f612e1e189c90f9a3f8dcd85a03c6851273833817a296bb327e63aa7a7"
     ulimits:
       nofile:
         soft: 262144
diff --git a/install/upgrade-clickhouse.sh b/install/upgrade-clickhouse.sh
index 92e710f3373..36a29c183ed 100644
--- a/install/upgrade-clickhouse.sh
+++ b/install/upgrade-clickhouse.sh
@@ -23,6 +23,13 @@ if $ps_command | grep -q clickhouse; then
     echo "Upgrading clickhouse to 25.8"
     $dcb $build_arg BASE_IMAGE=altinity/clickhouse-server:25.8.33.10002.altinitystable clickhouse
     start_service_and_wait_ready clickhouse
+  elif [[ "$version" == "25.8.33.10002.altinitystable" ]]; then
+    echo "Detected clickhouse version $version"
+    $dc down clickhouse
+
+    echo "Upgrading clickhouse to 26.8"
+    $dcb $build_arg BASE_IMAGE=clickhouse/clickhouse-server:26.8.36.3 clickhouse
+    start_service_and_wait_ready clickhouse
   else
     echo "Detected clickhouse version $version. Skipping upgrades!"
   fi