diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 0828bb79dc113e9521bb0b2883d1f23fc981989d..22c1d1f346770080df2964740f3ebbbbb483dcd7 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -6,14 +6,17 @@ workflow:
 
 stages:
     - core
-    - extra
-    - final
+    - bio
+    - pad
+    - fusion
+    # - docs
 
-# what used to be core packages
-bob/bob.extension:
+# core packages
+
+bob/bob:
     stage: core
     trigger:
-        project: bob/bob.extension
+        project: bob/bob
         ref: develop
         strategy: depend
 
@@ -23,6 +26,7 @@ bob/bob.io.base:
         project: bob/bob.io.base
         ref: develop
         strategy: depend
+    needs: ['bob/bob']
 
 bob/core:
     parallel:
@@ -33,24 +37,22 @@ bob/core:
         project: $PROJECT
         ref: develop
         strategy: depend
+    needs: ['bob/bob.io.base']
 
-    needs: ['bob/bob.extension', 'bob/bob.io.base']
-
-# what used to be extra packages
+# bio packages
 bob/bob.bio.base:
-    stage: extra
+    stage: bio
     trigger:
         project: bob/bob.bio.base
         ref: develop
         strategy: depend
-
     needs: ['bob/core']
 
 bob/bob.bio:
     parallel:
         matrix:
             - PROJECT: ["bob/bob.bio.face", "bob/bob.bio.vein", "bob/bob.bio.spear"]
-    stage: extra
+    stage: bio
     trigger:
         project: $PROJECT
         ref: develop
@@ -59,15 +61,16 @@ bob/bob.bio:
     needs: ['bob/bob.bio.base']
 
 bob/bob.bio.video:
-    stage: extra
+    stage: bio
     trigger:
         project: bob/bob.bio.video
         ref: develop
         strategy: depend
     needs: ['bob/bob.bio']
 
+# pad packages
 bob/bob.pad.base:
-    stage: extra
+    stage: pad
     trigger:
         project: bob/bob.pad.base
         ref: develop
@@ -76,7 +79,7 @@ bob/bob.pad.base:
     needs: ['bob/bob.bio.base']
 
 bob/bob.pad.face:
-    stage: extra
+    stage: pad
     trigger:
         project: bob/bob.pad.face
         ref: develop
@@ -85,7 +88,7 @@ bob/bob.pad.face:
     needs: ['bob/bob.pad.base', 'bob/bob.bio.video']
 
 bob/bob.fusion.base:
-    stage: extra
+    stage: fusion
     trigger:
         project: bob/bob.fusion.base
         ref: develop
@@ -93,10 +96,5 @@ bob/bob.fusion.base:
 
     needs: ['bob/bob.bio.base', 'bob/bob.pad.base']
 
-# test bob itself
-bob/bob:
-    stage: final
-    trigger:
-        project: bob/bob
-        ref: develop
-        strategy: depend
+# docs
+# TODO