diff --git a/.buildkite/daily.yml b/.buildkite/daily.yml
index c5fc99e8e1f..f3a60b72df0 100644
--- a/.buildkite/daily.yml
+++ b/.buildkite/daily.yml
@@ -3,14 +3,14 @@ steps:
     - .buildkite/run.sh
     env:
       ZEPHYR_TOOLCHAIN_VARIANT: "zephyr"
-      ZEPHYR_SDK_INSTALL_DIR: "/opt/sdk/zephyr-sdk-0.12.4"
+      ZEPHYR_SDK_INSTALL_DIR: "/opt/toolchains/zephyr-sdk-0.12.4"
     parallelism: 400
     timeout_in_minutes: 210
     retry:
       manual: true
     plugins:
       - docker#v3.5.0:
-          image: "zephyrprojectrtos/ci:v0.11.16"
+          image: "zephyrprojectrtos/ci:v0.17.0"
           propagate-environment: true
           volumes:
             - "/var/lib/buildkite-agent/git-mirrors:/var/lib/buildkite-agent/git-mirrors"
diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
index 1f9be61d1a3..2c9cc89ea1f 100644
--- a/.buildkite/pipeline.yml
+++ b/.buildkite/pipeline.yml
@@ -3,14 +3,14 @@ steps:
     - .buildkite/run.sh
     env:
       ZEPHYR_TOOLCHAIN_VARIANT: "zephyr"
-      ZEPHYR_SDK_INSTALL_DIR: "/opt/sdk/zephyr-sdk-0.12.4"
+      ZEPHYR_SDK_INSTALL_DIR: "/opt/toolchains/zephyr-sdk-0.12.4"
     parallelism: 20
     timeout_in_minutes: 180
     retry:
       manual: true
     plugins:
       - docker#v3.5.0:
-          image: "zephyrprojectrtos/ci:v0.11.16"
+          image: "zephyrprojectrtos/ci:v0.17.0"
           propagate-environment: true
           volumes:
             - "/var/lib/buildkite-agent/git-mirrors:/var/lib/buildkite-agent/git-mirrors"
diff --git a/.github/workflows/clang.yaml b/.github/workflows/clang.yaml
index 06b3780c69d..618c9b6caa3 100644
--- a/.github/workflows/clang.yaml
+++ b/.github/workflows/clang.yaml
@@ -14,7 +14,7 @@ jobs:
     runs-on: ubuntu-latest
     needs: clang-build-cancel
     container:
-      image: zephyrprojectrtos/ci:v0.17.0-rc1
+      image: zephyrprojectrtos/ci:v0.17.0
       options: '--entrypoint /bin/bash'
     strategy:
       fail-fast: false