diff --git a/OpenShift.gitlab-ci.yml b/OpenShift.gitlab-ci.yml
index f9a9608465494ae9728473ec6c25f1cebccdc8b9..df19f2ebaa5982e3b208b0006d0bc366ef22d3a0 100644
--- a/OpenShift.gitlab-ci.yml
+++ b/OpenShift.gitlab-ci.yml
@@ -5,6 +5,7 @@ stages:
   - review
   - staging
   - production
+  - cleanup
 
 variables:
   OPENSHIFT_SERVER: openshift.default.svc.cluster.local
@@ -50,7 +51,7 @@ review:
 
 stop-review:
   <<: *deploy
-  stage: review
+  stage: cleanup
   script:
     - oc delete all -l "app=$APP"
   when: manual
diff --git a/autodeploy/Kubernetes.gitlab-ci.yml b/autodeploy/Kubernetes.gitlab-ci.yml
index 7298ea73bab9b082650eda7066ee8a66b52a631d..574f9365f14ce93e7bdf61dd4e8fc80778460b68 100644
--- a/autodeploy/Kubernetes.gitlab-ci.yml
+++ b/autodeploy/Kubernetes.gitlab-ci.yml
@@ -12,6 +12,7 @@ stages:
   - review
   - staging
   - production
+  - cleanup
 
 build:
   stage: build
@@ -61,7 +62,7 @@ review:
     - master
 
 stop_review:
-  stage: review
+  stage: cleanup
   variables:
     GIT_STRATEGY: none
   script:
diff --git a/autodeploy/OpenShift.gitlab-ci.yml b/autodeploy/OpenShift.gitlab-ci.yml
index 249adbc9f4ae93afa59cdab285f6a1616370b116..4d6f4e00ebb2c8eb468af1d023795949fb7c2b74 100644
--- a/autodeploy/OpenShift.gitlab-ci.yml
+++ b/autodeploy/OpenShift.gitlab-ci.yml
@@ -12,6 +12,7 @@ stages:
   - review
   - staging
   - production
+  - cleanup
 
 build:
   stage: build
@@ -61,7 +62,7 @@ review:
     - master
 
 stop_review:
-  stage: review
+  stage: cleanup
   variables:
     GIT_STRATEGY: none
   script: