diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 15cb7a656978a37059e6cfb8d115ca7da909f2dc..1c93880b38ddf86cabc27a878fac6f07b55eb529 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -2297,7 +2297,7 @@ complexity-stereo-in-ext-out:
     - *complexity-measurements-prepare-artifacts
     - exit $ret_val
 
-complexity-ism-in-binaural_room_reverb-out:
+complexity-ism-in-binaural-out:
   extends:
     - .complexity-template
   rules:
@@ -2306,7 +2306,22 @@ complexity-ism-in-binaural_room_reverb-out:
       start_in: 1 hour
   script:
     - in_format=ISM
-    - out_format=BINAURAL_ROOM_REVERB
+    - out_format=BINAURAL
+    - ret_val=0
+    - bash ci/complexity_measurements/getWmops.sh "ISM+1 ISM+2 ISM+3 ISM+4" "$out_format" || ret_val=$?
+    - *complexity-measurements-prepare-artifacts
+    - exit $ret_val
+
+complexity-ism-in-binaural_room_ir-out:
+  extends:
+    - .complexity-template
+  rules:
+    - if: $MEASURE_COMPLEXITY_LINUX
+      when: delayed
+      start_in: 2 hours
+  script:
+    - in_format=ISM
+    - out_format=BINAURAL_ROOM_IR
     - ret_val=0
     - bash ci/complexity_measurements/getWmops.sh "ISM+1 ISM+2 ISM+3 ISM+4" "$out_format" || ret_val=$?
     - *complexity-measurements-prepare-artifacts
@@ -2318,7 +2333,7 @@ complexity-ism-in-ext-out:
   rules:
     - if: $MEASURE_COMPLEXITY_LINUX
       when: delayed
-      start_in: 3 hour
+      start_in: 3 hours
   script:
     - in_format=ISM
     - out_format=EXT
@@ -2342,13 +2357,28 @@ complexity-sba-hoa3-in-ext-out:
     - *complexity-measurements-prepare-artifacts
     - exit $ret_val
 
-complexity-sba-hoa3-in-binaural_room_ir-out:
+complexity-sba-hoa3-in-binaural-out:
   extends:
     - .complexity-template
   rules:
     - if: $MEASURE_COMPLEXITY_LINUX
       when: delayed
       start_in: 5 hours
+  script:
+    - in_format=HOA3
+    - out_format=BINAURAL
+    - ret_val=0
+    - bash ci/complexity_measurements/getWmops.sh "$in_format" "$out_format" || ret_val=$?
+    - *complexity-measurements-prepare-artifacts
+    - exit $ret_val
+
+complexity-sba-hoa3-in-binaural_room_ir-out:
+  extends:
+    - .complexity-template
+  rules:
+    - if: $MEASURE_COMPLEXITY_LINUX
+      when: delayed
+      start_in: 6 hours
   script:
     - in_format=HOA3
     - out_format=BINAURAL_ROOM_IR
@@ -2363,7 +2393,7 @@ complexity-mc-in-ext-out:
   rules:
     - if: $MEASURE_COMPLEXITY_LINUX
       when: delayed
-      start_in: 6 hours
+      start_in: 7 hours
   script:
     - in_format=MC
     - out_format=EXT
@@ -2372,13 +2402,28 @@ complexity-mc-in-ext-out:
     - *complexity-measurements-prepare-artifacts
     - exit $ret_val
 
+complexity-mc-in-binaural-out:
+  extends:
+    - .complexity-template
+  rules:
+    - if: $MEASURE_COMPLEXITY_LINUX
+      when: delayed
+      start_in: 8 hours
+  script:
+    - in_format=MC
+    - out_format=BINAURAL
+    - ret_val=0
+    - bash ci/complexity_measurements/getWmops.sh "$in_format" "$out_format" || ret_val=$?
+    - *complexity-measurements-prepare-artifacts
+    - exit $ret_val
+
 complexity-mc-in-binaural_room_ir-out:
   extends:
     - .complexity-template
   rules:
     - if: $MEASURE_COMPLEXITY_LINUX
       when: delayed
-      start_in: 7 hours
+      start_in: 9 hours
   script:
     - in_format=MC
     - out_format=BINAURAL_ROOM_IR
@@ -2393,7 +2438,7 @@ complexity-masa-in-ext-out:
   rules:
     - if: $MEASURE_COMPLEXITY_LINUX
       when: delayed
-      start_in: 8 hours
+      start_in: 10 hours
   script:
     - in_format=MASA
     - out_format=EXT
@@ -2408,7 +2453,7 @@ complexity-masa-in-binaural-out:
   rules:
     - if: $MEASURE_COMPLEXITY_LINUX
       when: delayed
-      start_in: 9 hours
+      start_in: 11 hours
   script:
     - in_format=MASA
     - out_format=BINAURAL
@@ -2423,7 +2468,7 @@ complexity-masa-in-hoa3-out:
   rules:
     - if: $MEASURE_COMPLEXITY_LINUX
       when: delayed
-      start_in: 10 hours
+      start_in: 12 hours
   script:
     - in_format=MASA
     - out_format=HOA3
@@ -2438,7 +2483,7 @@ complexity-omasa-in-ext-out:
   rules:
     - if: $MEASURE_COMPLEXITY_LINUX
       when: delayed
-      start_in: 11 hours
+      start_in: 13 hours
   script:
     - in_format=OMASA
     - out_format=EXT
@@ -2453,7 +2498,7 @@ complexity-omasa-in-binaural-out:
   rules:
     - if: $MEASURE_COMPLEXITY_LINUX
       when: delayed
-      start_in: 12 hours
+      start_in: 14 hours
   script:
     - in_format=OMASA
     - out_format=BINAURAL
@@ -2462,13 +2507,28 @@ complexity-omasa-in-binaural-out:
     - *complexity-measurements-prepare-artifacts
     - exit $ret_val
 
+complexity-omasa-in-hoa3-out:
+  extends:
+    - .complexity-template
+  rules:
+    - if: $MEASURE_COMPLEXITY_LINUX
+      when: delayed
+      start_in: 15 hours
+  script:
+    - in_format=OMASA
+    - out_format=HOA3
+    - ret_val=0
+    - bash ci/complexity_measurements/getWmops.sh "$in_format" "$out_format" || ret_val=$?
+    - *complexity-measurements-prepare-artifacts
+    - exit $ret_val
+
 complexity-StereoDmxEVS-stereo-in-mono-out:
   extends:
     - .complexity-template
   rules:
     - if: $MEASURE_COMPLEXITY_LINUX
       when: delayed
-      start_in: 13 hours
+      start_in: 16 hours
   script:
     - in_format=StereoDmxEVS
     - out_format=mono
@@ -2483,7 +2543,7 @@ complexity-osba-in-ext-out:
   rules:
     - if: $MEASURE_COMPLEXITY_LINUX
       when: delayed
-      start_in: 14 hours
+      start_in: 17 hours
   script:
     - in_format=OSBA
     - out_format=EXT
@@ -2492,13 +2552,28 @@ complexity-osba-in-ext-out:
     - *complexity-measurements-prepare-artifacts
     - exit $ret_val
 
+complexity-osba-in-binaural-out:
+  extends:
+    - .complexity-template
+  rules:
+    - if: $MEASURE_COMPLEXITY_LINUX
+      when: delayed
+      start_in: 18 hours
+  script:
+    - in_format=OSBA
+    - out_format=BINAURAL
+    - ret_val=0
+    - bash ci/complexity_measurements/getWmops.sh "$in_format" "$out_format" || ret_val=$?
+    - *complexity-measurements-prepare-artifacts
+    - exit $ret_val
+
 complexity-osba-in-binaural_room_ir-out:
   extends:
     - .complexity-template
   rules:
     - if: $MEASURE_COMPLEXITY_LINUX
       when: delayed
-      start_in: 15 hours
+      start_in: 19 hours
   script:
     - in_format=OSBA
     - out_format=BINAURAL_ROOM_IR
diff --git a/ci/setup_pages.py b/ci/setup_pages.py
index e810047c908d5697638274fc78fa6502fe7bb8f1..01c16fcb679c0f2e071f596c1cf16ede536b7bd5 100755
--- a/ci/setup_pages.py
+++ b/ci/setup_pages.py
@@ -20,18 +20,23 @@ JOBS_FLOAT_REPO = {
     # "complexity-masa-in-7_1_4-out": "[OLD] Masa in, 7_1_4 out",
     # current ones
     "complexity-stereo-in-ext-out": "Stereo in, EXT out",
-    "complexity-ism-in-binaural_room_reverb-out": "ISM in, BINAURAL_ROOM_REVERB out",
+    "complexity-ism-in-binaural-out": "ISM in, BINAURAL out",
+    "complexity-ism-in-binaural_room_ir-out": "ISM in, BINAURAL_ROOM_IR out",
     "complexity-ism-in-ext-out": "ISM in, EXT out",
     "complexity-sba-hoa3-in-ext-out": "HOA3 in, EXT out",
+    "complexity-sba-hoa3-in-binaural-out": "HOA3 in, BINAURAL out",
     "complexity-sba-hoa3-in-binaural_room_ir-out": "HOA3 in, BINAURAL_ROOM_IR out",
     "complexity-mc-in-ext-out": "MC in, EXT out",
+    "complexity-mc-in-binaural-out": "MC in, BINAURAL out",
     "complexity-mc-in-binaural_room_ir-out": "MC in, BINAURAL_ROOM_IR out",
     "complexity-masa-in-ext-out": "MASA in, EXT out",
     "complexity-masa-in-binaural-out": "MASA in, BINAURAL out",
     "complexity-masa-in-hoa3-out": "MASA in, HOA3 out",
     "complexity-omasa-in-ext-out": "OMASA in, EXT out",
     "complexity-omasa-in-binaural-out": "OMASA in, BINAURAL out",
+    "complexity-omasa-in-hoa3-out": "OMASA in, HOA3 out",
     "complexity-osba-in-ext-out": "OSBA in, EXT out",
+    "complexity-osba-in-binaural-out": "OSBA in, BINAURAL out",
     "complexity-osba-in-binaural_room_ir-out": "OSBA in, BINAURAL_ROOM_IR out",
     "complexity-StereoDmxEVS-stereo-in-mono-out": "StereoDmxEVS, Stereo in, Mono out",
     # "timeless" jobs (not complexity)