diff --git a/.buildkite/daily.yml b/.buildkite/daily.yml
index f3a60b72df0..ef3f5fbdb92 100644
--- a/.buildkite/daily.yml
+++ b/.buildkite/daily.yml
@@ -10,7 +10,7 @@ steps:
       manual: true
     plugins:
       - docker#v3.5.0:
-          image: "zephyrprojectrtos/ci:v0.17.0"
+          image: "zephyrprojectrtos/ci:v0.17.1"
           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 2c9cc89ea1f..ebd38099d20 100644
--- a/.buildkite/pipeline.yml
+++ b/.buildkite/pipeline.yml
@@ -10,7 +10,7 @@ steps:
       manual: true
     plugins:
       - docker#v3.5.0:
-          image: "zephyrprojectrtos/ci:v0.17.0"
+          image: "zephyrprojectrtos/ci:v0.17.1"
           propagate-environment: true
           volumes:
             - "/var/lib/buildkite-agent/git-mirrors:/var/lib/buildkite-agent/git-mirrors"
diff --git a/.github/workflows/bsim.yaml b/.github/workflows/bsim.yaml
index 846eade6b68..e703c536725 100644
--- a/.github/workflows/bsim.yaml
+++ b/.github/workflows/bsim.yaml
@@ -22,7 +22,7 @@ jobs:
     runs-on: ubuntu-latest
     needs: bsim-build-cancel
     container:
-      image: zephyrprojectrtos/ci:v0.17.0-rc1
+      image: zephyrprojectrtos/ci:v0.17.1
       options: '--entrypoint /bin/bash'
     env:
       ZEPHYR_TOOLCHAIN_VARIANT: zephyr
diff --git a/.github/workflows/clang.yaml b/.github/workflows/clang.yaml
index 618c9b6caa3..5c32e0e3eef 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
+      image: zephyrprojectrtos/ci:v0.17.1
       options: '--entrypoint /bin/bash'
     strategy:
       fail-fast: false