diff --git a/.github/workflows/ci-workflow.yml b/.github/workflows/ci-workflow.yml
index d7e26e4fd5..8c7f6f854f 100644
--- a/.github/workflows/ci-workflow.yml
+++ b/.github/workflows/ci-workflow.yml
@@ -138,8 +138,8 @@ jobs:
     env:
       NUM_THREADS: 32
       TEST_JOBS: 16
-      CC: clang-14
-      CXX: clang++-14
+      CC: clang
+      CXX: clang++
     steps:
       - uses: actions/checkout@v3
 
@@ -216,7 +216,7 @@ jobs:
 
   header-include-guard-check:
     name: header include guard check
-    runs-on: kuzu-self-hosted-testing
+    runs-on: ubuntu-22.04
     steps:
       - uses: actions/checkout@v3
 
@@ -225,8 +225,13 @@ jobs:
 
   clang-formatting-check:
     name: clang-format check
-    runs-on: kuzu-self-hosted-testing
+    runs-on: ubuntu-22.04
     steps:
+      - name: Install clang-format
+        run: |
+          sudo apt-get update
+          sudo apt-get install -y clang-format-11
+
       - uses: actions/checkout@v3
 
       - name: Check source format
@@ -237,11 +242,14 @@ jobs:
 
   rustfmt-check:
     name: rustfmt check
-    runs-on: kuzu-self-hosted-testing
+    runs-on: ubuntu-22.04
     steps:
+      - name: Update Rust
+        run: rustup update
+
       - uses: actions/checkout@v3
 
-      - name: Check api format
+      - name: Check Rust API format
         working-directory: tools/rust_api
         run: cargo fmt --check
 
diff --git a/scripts/dockerized-ci-tests-runner/Dockerfile b/scripts/dockerized-ci-tests-runner/Dockerfile
index 2f4a34da0f..102e21aab6 100644
--- a/scripts/dockerized-ci-tests-runner/Dockerfile
+++ b/scripts/dockerized-ci-tests-runner/Dockerfile
@@ -10,15 +10,12 @@ RUN curl -fsSL https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key | gpg -
 RUN echo "deb [signed-by=/etc/apt/keyrings/nodesource.gpg] https://deb.nodesource.com/node_20.x nodistro main" | tee /etc/apt/sources.list.d/nodesource.list
 
 RUN apt-get update && apt-get install -y \
+    build-essential \
     ccache \
-    clang-14 \
-    clang-format-11 \
-    clang-tidy \
     cmake \
     curl \
-    g++ \
-    gcc \
     git \
+    gnupg \
     jq \
     lcov \
     libcurl4-openssl-dev \
@@ -30,9 +27,17 @@ RUN apt-get update && apt-get install -y \
     python-is-python3 \
     python3-dev \
     python3-pip \
-    sudo \
+    software-properties-common \
     wget
 
+RUN wget https://apt.llvm.org/llvm.sh && \
+    chmod +x llvm.sh && \
+    yes | ./llvm.sh 17 all && \
+    rm llvm.sh && \
+    ln /usr/bin/clang++-17 /usr/bin/clang++ && \
+    ln /usr/bin/clang-17 /usr/bin/clang && \
+    ln /usr/bin/run-clang-tidy-17 /usr/bin/run-clang-tidy
+
 ENV JAVA_HOME=/usr/lib/jvm/java-17-openjdk-amd64
 RUN useradd --create-home runner
 USER runner