diff --git a/.circleci/config.yml b/.circleci/config.yml
index 8e0723b49..4087e4062 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -10,7 +10,7 @@ jobs:
           command: clang-format -i -style=file src/*.{c,h} misc/*.{c,h} nasl/*.{c,h} && git diff --exit-code
   test_units:
     docker:
-      - image: greenbone/build-env-openvas-scanner-master-debian-stretch-gcc-core
+      - image: greenbone/build-env-openvas-scanner-master-debian-buster-gcc-core
     steps:
       - run:
           working_directory: ~/gvm-libs
@@ -26,7 +26,7 @@ jobs:
           command: mkdir build && cd build/ && cmake -DCMAKE_BUILD_TYPE=Release .. && make tests && CTEST_OUTPUT_ON_FAILURE=1 make test
   build_gcc_core:
     docker:
-      - image: greenbone/build-env-openvas-scanner-master-debian-stretch-gcc-core
+      - image: greenbone/build-env-openvas-scanner-master-debian-buster-gcc-core
     steps:
       - run:
           working_directory: ~/gvm-libs
@@ -42,7 +42,7 @@ jobs:
           command: mkdir build && cd build/ && cmake -DCMAKE_BUILD_TYPE=Release .. && make install
   scan_build:
     docker:
-      - image: greenbone/build-env-openvas-scanner-master-debian-stretch-clang-core
+      - image: greenbone/build-env-openvas-scanner-master-debian-buster-clang-core
     steps:
       - run:
           working_directory: ~/gvm-libs