diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 4b96ea1d349ecf95a6c85a64f9937cc06c39cab1..d5eeb2a3c0252d4598d649385af3f825c35ca3b3 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -10,6 +10,7 @@ cache:
 stages:
   - build
   - publish
+  - cleanup
 
 
 # ===========================================================================
@@ -91,3 +92,14 @@ docker-push-tag:
   script:
     - docker load -i build/image.tar
     - docker push $DOCKER_NAMESPACE/$PROJECT_NAME:$CI_COMMIT_TAG
+
+cleanup:
+  stage: cleanup
+  image: docker:git
+  tags:
+    - cache
+  script:
+    - docker system prune -a -f || true 
+    - rm -rf build/ || true
+  when: always
+  allow_failure: true