diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 9ef72a1d1..8a64a18e0 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -3,7 +3,6 @@ stages:
   - rpmbuild
   - prepare-rhel-internal
   - test
-  - cleanup
   - finish
 
 .base:
@@ -765,19 +764,6 @@ Manifest-diff:
     paths:
       - manifests.diff
 
-SCHEDULED_CLOUD_CLEANER:
-  stage: cleanup
-  tags:
-    - terraform
-  variables:
-    RUNNER: aws/centos-stream-8-x86_64
-    INTERNAL_NETWORK: "true"
-  rules:
-    - if: '$CI_PIPELINE_SOURCE == "schedule" && $CLEANUP == "true"'
-  script:
-    - schutzbot/deploy.sh
-    - schutzbot/scheduled_cloud_cleaner.sh
-
 SonarQube:
   stage: test
   extends: .terraform
diff --git a/schutzbot/scheduled_cloud_cleaner.sh b/schutzbot/scheduled_cloud_cleaner.sh
deleted file mode 100755
index 075e89f47..000000000
--- a/schutzbot/scheduled_cloud_cleaner.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/bash
-git clone https://github.com/osbuild/cloud-cleaner.git
-
-
-./cloud-cleaner/cloud_cleaner.sh
\ No newline at end of file
diff --git a/test/README.md b/test/README.md
index 4ea7b57b0..220b06dab 100644
--- a/test/README.md
+++ b/test/README.md
@@ -260,13 +260,11 @@ the first line!
 
 ### Cloud cleaner
 
-Some tests deploy images to different clouds. After the tests run, these images
-get removed by cloud cleaner (`cmd/cloud-cleaner`). But if something fails during the tests, or the
-pipeline gets canceled, that image could get left behind in the cloud, wasting
-resources.
+[Cloud cleaner](https://github.com/osbuild/cloud-cleaner) is a tool designed to clean leftover cloud resources in order to reduce our costs.
 
-To deal with this problem, we have scheduled cloud cleaner (`schutzbot/scheduled_cloud_cleaner.sh`), that goes through all
-the clouds looking for testing resources that were not removed.
+Some tests deploy images to different clouds. After the tests run, these images get removed by the same tests. But if something fails during these, or a pipeline gets canceled, those images could get left behind in the cloud, wasting resources.
+
+Cloud cleaner is being executed every hour (on the CI of it's own repo), and it cleans resources that are not tagged with `persist=true`
 
 ## Integration testing