diff --git a/clickhouse-24.9.yaml b/clickhouse-24.9.yaml
index c433046bd1d..9c4cbc9d9eb 100644
--- a/clickhouse-24.9.yaml
+++ b/clickhouse-24.9.yaml
@@ -1,7 +1,7 @@
 package:
   name: clickhouse-24.9
   version: 24.9.2.42
-  epoch: 0
+  epoch: 1
   description: ClickHouse is the fastest and most resource efficient open-source database for real-time apps and analytics.
   copyright:
     - license: Apache-2.0
@@ -32,6 +32,7 @@ environment:
       - llvm-lld-17-dev
       - nasm
       - ninja
+      - openssl-dev
       - perl
       - python3
       - yasm
@@ -46,19 +47,22 @@ pipeline:
   # The default build script is defensive and tries to protect against defining cflags.
   - uses: patch
     with:
-      patches: allow_cflags.patch
+      patches: allow_cflags.patch dynamically_link_openssl.patch
 
   - runs: |
       git submodule update --init
-      mkdir build
-      cd build
-      cmake \
+
+  - uses: cmake/configure
+    with:
+      output-dir: build
+      opts: |
+        -DCMAKE_C_FLAGS="-fPIC" \
+        -DCMAKE_CXX_FLAGS="-fPIC" \
         -DCOMPILER_CACHE=disabled \
         -DCMAKE_INSTALL_PREFIX=/usr \
         -DCMAKE_BUILD_TYPE=Release \
         -DNO_ARMV81_OR_HIGHER=1 \
-        -DCMAKE_INSTALL_LIBDIR=lib \
-        ..
+        -DCMAKE_INSTALL_LIBDIR=lib
 
   - runs: |
       cd build
@@ -66,7 +70,6 @@ pipeline:
       mkdir -p  ${{targets.destdir}}/var/lib/clickhouse
       mkdir -p  ${{targets.destdir}}/var/log/clickhouse-server
       DESTDIR=${{targets.destdir}} ninja install
-      rm -rf ${{targets.destdir}}/usr/lib/debug
 
   - uses: strip
 
@@ -76,6 +79,11 @@ subpackages:
     pipeline:
       - uses: split/dev
 
+  - name: "${{package.name}}-debug"
+    description: "headers for clickhouse"
+    pipeline:
+      - uses: split/debug
+
   - name: "${{package.name}}-bash-completion"
     description: "bash completion for clickhouse"
     pipeline:
diff --git a/clickhouse-24.9/dynamically_link_openssl.patch b/clickhouse-24.9/dynamically_link_openssl.patch
new file mode 100644
index 00000000000..042384afad4
--- /dev/null
+++ b/clickhouse-24.9/dynamically_link_openssl.patch
@@ -0,0 +1,22 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 6abf48a6..d9bea856 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -445,11 +445,12 @@ endif ()
+ 
+ enable_testing() # Enable for tests without binary
+ 
+-if (ARCH_S390X)
+-    set(ENABLE_OPENSSL_DYNAMIC_DEFAULT ON)
+-else ()
+-    set(ENABLE_OPENSSL_DYNAMIC_DEFAULT OFF)
+-endif ()
++# if (ARCH_S390X)
++#     set(ENABLE_OPENSSL_DYNAMIC_DEFAULT ON)
++# else ()
++#     set(ENABLE_OPENSSL_DYNAMIC_DEFAULT OFF)
++# endif ()
++set(ENABLE_OPENSSL_DYNAMIC_DEFAULT ON)
+ option(ENABLE_OPENSSL_DYNAMIC "This option removes SSL from ClickHouse and will link to the OpenSSL version supplied by OS." ${ENABLE_OPENSSL_DYNAMIC_DEFAULT})
+ 
+ # when installing to /usr - place configs to /etc but for /usr/local place to /usr/local/etc