diff --git a/theforeman.org/pipelines/release/foreman-x-develop-release.groovy b/theforeman.org/pipelines/release/foreman-x-develop-release.groovy
index b23dd4a8..cecf568b 100644
--- a/theforeman.org/pipelines/release/foreman-x-develop-release.groovy
+++ b/theforeman.org/pipelines/release/foreman-x-develop-release.groovy
@@ -60,6 +60,11 @@ pipeline {
                             }
                         }
                     }
+                    post {
+                        cleanup {
+                            deleteDir()
+                        }
+                    }
                 }
                 stage('Build Copr RPM') {
                     agent { label 'rpmbuild' }
@@ -105,6 +110,11 @@ pipeline {
                             }
                         }
                     }
+                    post {
+                        cleanup {
+                            deleteDir()
+                        }
+                    }
                 }
                 stage('Build DEB') {
                     agent { label 'debian' }
@@ -177,9 +187,5 @@ pipeline {
         failure {
             notifyDiscourse(env, "${project_name} package release pipeline failed:", currentBuild.description)
         }
-        cleanup {
-            echo "Cleaning up workspace"
-            deleteDir()
-        }
     }
 }