diff --git a/.cicd/platforms.json b/.cicd/platforms.json
index 08910862ec..69f7a69afb 100644
--- a/.cicd/platforms.json
+++ b/.cicd/platforms.json
@@ -7,5 +7,8 @@
    },
    "ubuntu22": {
       "dockerfile": ".cicd/platforms/ubuntu22.Dockerfile"
+   },
+   "ubuntu22-llvm": {
+      "dockerfile": ".cicd/platforms/ubuntu22-llvm.Dockerfile"
    }
 }
diff --git a/.cicd/platforms/ubuntu22-llvm.Dockerfile b/.cicd/platforms/ubuntu22-llvm.Dockerfile
new file mode 100644
index 0000000000..ff54bc3c98
--- /dev/null
+++ b/.cicd/platforms/ubuntu22-llvm.Dockerfile
@@ -0,0 +1,23 @@
+FROM ubuntu:jammy
+
+RUN apt-get update && apt-get upgrade -y && \
+    DEBIAN_FRONTEND=noninteractive apt-get install -y build-essential \
+                                                      cmake \
+                                                      wget \
+                                                      git \
+                                                      ninja-build \
+                                                      python3 \
+                                                      pkg-config \
+                                                      libboost-all-dev \
+                                                      libcurl4-gnutls-dev \
+                                                      lsb-release \
+                                                      software-properties-common \
+                                                      gnupg \
+                                                      clang-tidy
+
+RUN wget https://apt.llvm.org/llvm.sh
+RUN chmod +x llvm.sh
+RUN ./llvm.sh 16
+
+ENV CC=clang-16
+ENV CXX=clang++-16
\ No newline at end of file
diff --git a/.cicd/platforms/ubuntu22.Dockerfile b/.cicd/platforms/ubuntu22.Dockerfile
index 67b04586a1..ca38aad5cd 100644
--- a/.cicd/platforms/ubuntu22.Dockerfile
+++ b/.cicd/platforms/ubuntu22.Dockerfile
@@ -9,4 +9,4 @@ RUN apt-get update && apt-get upgrade -y && \
                                                       pkg-config \
                                                       libboost-all-dev \
                                                       libcurl4-gnutls-dev \
-                                                      clang-tidy
+                                                      clang-tidy
\ No newline at end of file
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 5345c2bfe1..fd75357002 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -60,7 +60,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        platform: [ubuntu18, ubuntu20, ubuntu22]
+        platform: [ubuntu18, ubuntu20, ubuntu22, ubuntu22-llvm]
     runs-on: ["self-hosted", "enf-x86-beefy"]
     container: ${{fromJSON(needs.d.outputs.p)[matrix.platform].image}}
     steps: