diff --git a/ogscm/cli.py b/ogscm/cli.py
index ac1275a3b006e6499d2b107b53df2f14950806c2..586cb2c07e7080914a89eef615ff45b0ff239b0f 100644
--- a/ogscm/cli.py
+++ b/ogscm/cli.py
@@ -84,6 +84,9 @@ def main():  # pragma: no cover
                       'Ignoring!')
 
         info = container_info(build, args)
+        if args.cleanup:
+            info.cleanup()
+            exit(0)
         info.make_dirs()
 
         # Create definition