diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index bce4b944be9d0b32b1338d2b5e064fe11a6cb48c..3d1f7de2f31b2f63edb4c0b5c04ef6af9a1a4dc2 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -10,6 +10,7 @@ stages:
   - pre-build
   - build
   - test
+  - cleanup
   - example-build
   - example-test
   - example-cleanup
@@ -240,6 +241,13 @@ psql_image_test:
   tags:
     - public-runner-docker    
 
+buildkit_cache_cleanup:
+  stage: cleanup
+  extends: .buildkit_cleanup_job_template
+  needs: []
+  variables:
+    CACHE_REPOSITORIES: "benchmark-test-runner/cache,docker-builder/cache,docker-dind/cache,python-scripts/cache,tox-test-runner/cache"
+
 example_docker_image_builder_job:
   extends: .docker_image_builder_job_template
   stage: example-build