diff --git a/bob/devtools/data/gitlab-ci/nightlies.yaml b/bob/devtools/data/gitlab-ci/nightlies.yaml
index 57693946496ec837ed86144ebbacbb61c35f723e..a707c5c9537307381bc94069c4d915f494399d0e 100644
--- a/bob/devtools/data/gitlab-ci/nightlies.yaml
+++ b/bob/devtools/data/gitlab-ci/nightlies.yaml
@@ -10,28 +10,8 @@ variables:
 
 # Definition of our build pipeline order
 stages:
-  - cleanup
   - build
-
-
-# Periodic cleanup of beta packages
-cleanup:
-  stage: cleanup
-  tags:
-    - docker
-  image: continuumio/conda-concourse-ci
-  script:
-    - curl --silent "${BOOTSTRAP}" --output "bootstrap.py"
-    - python3 bootstrap.py -vv channel base
-    - source ${CONDA_ROOT}/etc/profile.d/conda.sh
-    - conda activate base
-    - bdt ci clean-betas -vv --dry-run
-  cache: &test_caches
-    key: "linux-cache"
-    paths:
-      - miniconda.sh
-      - ${CONDA_ROOT}/pkgs/*.tar.bz2
-      - ${CONDA_ROOT}/pkgs/urls.txt
+  - cleanup
 
 
 # Build targets
@@ -64,3 +44,24 @@ macosx:
   extends: .build_template
   tags:
     - macosx
+
+
+# Periodic cleanup of beta packages
+cleanup:
+  stage: cleanup
+  tags:
+    - docker
+  image: continuumio/conda-concourse-ci
+  when: always
+  script:
+    - curl --silent "${BOOTSTRAP}" --output "bootstrap.py"
+    - python3 bootstrap.py -vv channel base
+    - source ${CONDA_ROOT}/etc/profile.d/conda.sh
+    - conda activate base
+    - bdt ci clean-betas -vv --dry-run
+  cache: &test_caches
+    key: "linux-cache"
+    paths:
+      - miniconda.sh
+      - ${CONDA_ROOT}/pkgs/*.tar.bz2
+      - ${CONDA_ROOT}/pkgs/urls.txt