diff --git a/main-basop.yml b/main-basop.yml
index b22af906c81fc0eebeb76704b281b24112c4b5d1..94a039508c3e3ed93468d9ea6c6323ff4e609cd3 100644
--- a/main-basop.yml
+++ b/main-basop.yml
@@ -1,6 +1,19 @@
 include:
   - local: main.yml
 
+stages:
+  - .pre
+  - maintenance
+  - prevalidate
+  - build
+  # only in basop
+  - compare
+  # only in basop
+  - check-be
+  - test
+  - postvalidate
+  - deploy
+
 
 workflow:
   name: '$IVAS_PIPELINE_NAME'
diff --git a/main.yml b/main.yml
index 81295f08271ae99e3d91ad70adc215dcf99dfd00..df75d2cbabdf9e7d6565ca8fa042e83e02956203 100644
--- a/main.yml
+++ b/main.yml
@@ -8,17 +8,13 @@ default:
   # by default, we want all jobs to be interruptible, and we need to configure this explicitly
   interruptible: true
 
-# we can define all stages centrally
+  # Note: currently only used for float
 stages:
   - .pre
-  # only in float
   - maintenance
   - prevalidate
   - build
-  # only in basop
-  - compare
-  # only in basop
-  - check-be
   - test
+  - compare
   - postvalidate
   - deploy