diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 33195d769a..6cfa28a39c 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -28,104 +28,59 @@ include:
 
 workflow:
   rules:
-    - if: '$CI_WEIGHT == "forced" && $CI_COMMIT_REF_NAME =~ /^cvvdev\/.*/' #bypass workflow + cvvdev
+    - if: $CI_PIPELINE_SOURCE == "schedule"
       variables:
-        CORE_V_VERIF_BRANCH: $CI_COMMIT_REF_NAME
-    - if: '$CI_WEIGHT == "forced"' #bypass workflow
-    - if: '$CI_COMMIT_REF_NAME =~ /^master.*|^hotfix.*|^rc.*|^github-pr.*/'
+        CI_KIND: verif
+    - if: $CI_COMMIT_BRANCH =~ /.*_PR_.*/
       variables:
-        CI_WEIGHT: "full"
-    - if: '$CI_COMMIT_REF_NAME =~ /^dev.*|^feature.*/'
+        CI_KIND: regress
+    - if: $CI_PIPELINE_SOURCE == "push" && $CI_COMMIT_BRANCH =~ /^dev.*/
       variables:
-        CI_WEIGHT: "short"
-    - if: '$CI_COMMIT_REF_NAME =~ /^cvvdev\/master.*|^cvvdev\/hotfix.*|^cvvdev\/rc.*/'
-      variables:
-        CI_WEIGHT: "full"
-        CORE_V_VERIF_BRANCH: $CI_COMMIT_REF_NAME
-    - if: '$CI_COMMIT_REF_NAME =~ /^cvvdev\/dev.*|^cvvdev\/feature.*/'
-      variables:
-        CI_WEIGHT: "lite"
-        CORE_V_VERIF_BRANCH: $CI_COMMIT_REF_NAME
-    - when: never
+        CI_KIND: dev
+    - variables:
+        CI_KIND: none
 
 variables:
   GIT_SUBMODULE_STRATEGY: recursive
-  TAGS_RUNNER: $TAGS_RUNNER
-  DASHBOARD: "cva6"
-  WORKFLOW_EVENT: $CI_PIPELINE_SOURCE
-
-# macro: job that does not require cloning anythings
-.template_job_low_footprint:
-  variables:
-    GIT_STRATEGY: none
-
-# macro: job always launched (if pipeline is created)
-.template_job_full_ci:
-  tags: [$TAGS_RUNNER]
-  rules:
-    - when: on_success
+  DASHBOARD: cva6
 
-# macro: job launched only on main branches, other case set to manual (if pipeline is created)
-.template_job_short_ci:
+default:
   tags: [$TAGS_RUNNER]
-  rules:
-    - if: '$CI_WEIGHT == "forced"'
-      when: on_success
-    - if: '$CI_WEIGHT == "full"'
-      when: on_success
-    - when: manual
-      allow_failure: true
-
-# macro: job set to manual (if pipeline is created)
-.template_job_always_manual:
-  tags: [$TAGS_RUNNER]
-  rules:
-    - if: '$CI_WEIGHT == "forced"'
-      when: on_success
-    - when: manual
-      allow_failure: true
+  artifacts:
+    when: always
+    paths:
+      - artifacts/
 
 stages:
-  - build tools
+  - setup
   - smoke tests
   - verif tests
   - backend tests
   - find failures
   - report
 
-.verif_test:
-  stage: verif tests
-  before_script:
-    - mkdir -p tools
-    - mv artifacts/tools/spike tools
-    - rm -rf artifacts/
-    - mkdir -p artifacts/{reports,logs}
-    - python3 .gitlab-ci/scripts/report_fail.py
-    - echo $SYN_VCS_BASHRC; source $SYN_VCS_BASHRC
-  artifacts: &artifacts
-    when: always
-    paths:
-      - artifacts/
-
-.backend_test:
-  stage: backend tests
-  before_script:
-    - mkdir -p artifacts/{reports,logs}
-    - python3 .gitlab-ci/scripts/report_fail.py
-  artifacts: *artifacts
+.setup_job:
+  stage: setup
+  variables:
+    GIT_SUBMODULE_STRATEGY: none
+  rules: &on_dev
+    - if: $CI_KIND == "regress"
+    - if: $CI_KIND == "verif"
+    - if: $CI_KIND == "dev"
+    - when: manual
+      allow_failure: true
 
-pub_check_env:
-  stage: build tools
+check_env:
   extends:
-    - .template_job_low_footprint
-    - .template_job_full_ci
+    - .setup_job
+  variables:
+    GIT_STRATEGY: none
   script:
     - env
 
-pub_build_tools:
-  stage: build tools
+build_tools:
   extends:
-    - .template_job_full_ci
+    - .setup_job
   script:
     # ROOT_PROJECT is used by Spike installer and designates the toplevel of core-v-verif tree.
     - 'export ROOT_PROJECT=$(pwd)'
@@ -142,174 +97,181 @@ pub_build_tools:
     - '[ -f $(pwd)/tools/spike/bin/spike ] && strip $(pwd)/tools/spike/bin/spike* $(pwd)/tools/spike/lib/lib*.*'
     - mkdir -p artifacts/tools/
     - mv tools/spike artifacts/tools/
-  artifacts:
-    paths:
-      - artifacts/tools/spike/*
 
-pub_smoke:
+.smoke_test:
   stage: smoke tests
+  rules: *on_dev
+  before_script:
+    - mkdir -p tools
+    - mv artifacts/tools/spike tools
+    - rm -rf artifacts/
+    - mkdir -p artifacts/{reports,logs}
+    - python3 .gitlab-ci/scripts/report_fail.py
+    - echo $SYN_VCS_BASHRC; source $SYN_VCS_BASHRC
+
+smoke:
   extends:
-    - .template_job_full_ci
-  parallel:
-    matrix:
-      - DV_SIMULATORS: ["veri-testharness,spike","vcs-testharness,spike","vcs-uvm,spike" ]
+    - .smoke_test
   variables:
     DASHBOARD_JOB_TITLE: "Smoke test $DV_SIMULATORS"
     DASHBOARD_JOB_DESCRIPTION: "Short tests to challenge most architectures with most testbenchs configurations"
     DASHBOARD_SORT_INDEX: 0
     DASHBOARD_JOB_CATEGORY: "Basic"
-  before_script:
-    - !reference [.verif_test, before_script]
+  parallel:
+    matrix:
+      - DV_SIMULATORS:
+        - "veri-testharness,spike"
+        - "vcs-testharness,spike"
+        - "vcs-uvm,spike"
   script:
-    # In order to capture logs in case of test failure, the test script cannot fail.
-    - source verif/regress/smoke-tests.sh || true
-    # The list of files must NOT fail on various DV_SIMULATORS values, so use 'v*_sim' to match
-    # 'veri-testharness_sim', 'vcs-testharness_sim' and 'vcs-uvm_sim' (one of them always applies,
-    # at least until new RTL simulator configurations are added.)
+    - source verif/regress/smoke-tests.sh
+  after_script: &simu_after_script
     - for i in verif/sim/*/v*_sim/*.log.iss ; do head -10000 $i > artifacts/logs/$(basename $i).head ; done
     - python3 .gitlab-ci/scripts/report_simu.py verif/sim/logfile.log
-  artifacts: *artifacts
 
-pub_gen_smoke:
-  stage: smoke tests
+gen_smoke:
   extends:
-    - .template_job_full_ci
-  parallel:
-    matrix:
-      - DV_SIMULATORS: ["vcs-uvm,spike"]
+    - .smoke_test
   variables:
     DASHBOARD_JOB_TITLE: "Smoke Generated test $DV_SIMULATORS"
     DASHBOARD_JOB_DESCRIPTION: "Short generated tests to challenge the CVA6-DV on STEP1 configuration"
     DASHBOARD_SORT_INDEX: 0
     DASHBOARD_JOB_CATEGORY: "Basic"
-  before_script:
-    - !reference [.verif_test, before_script]
+    DV_SIMULATORS: "vcs-uvm,spike"
+  script: source verif/regress/smoke-gen_tests.sh
+  after_script: *simu_after_script
+
+coremark:
+  extends:
+    - .smoke_test
+  variables:
+    DASHBOARD_JOB_TITLE: "CoreMark"
+    DASHBOARD_JOB_DESCRIPTION: "Performance indicator"
+    DASHBOARD_SORT_INDEX: 5
+    DASHBOARD_JOB_CATEGORY: "Performance"
   script:
-    # In order to capture logs in case of test failure, the test script cannot fail.
-    - source verif/regress/smoke-gen_tests.sh || true
-    # The list of files must NOT fail on various DV_SIMULATORS values, so use 'v*_sim' to match
-    # 'veri-testharness_sim', 'vcs-testharness_sim' and 'vcs-uvm_sim' (one of them always applies,
-    # at least until new RTL simulator configurations are added.)
-    - for i in verif/sim/*/v*_sim/*.log.iss ; do head -10000 $i > artifacts/logs/$(basename $i).head ; done
-    - python3 .gitlab-ci/scripts/report_simu.py verif/sim/logfile.log
-  artifacts: *artifacts
+    - bash verif/regress/coremark.sh --no-print
+    - python3 .gitlab-ci/scripts/report_benchmark.py --coremark verif/sim/out_*/veri-testharness_sim/core_main.log
 
-pub_riscv_arch_test:
+dhrystone:
   extends:
-    - .verif_test
-    - .template_job_short_ci
-  parallel:
-    matrix:
-      - DV_TARGET: [cv64a6_imafdc_sv39, cv32a60x]
+    - .smoke_test
+  variables:
+    DASHBOARD_JOB_TITLE: "Dhrystone"
+    DASHBOARD_JOB_DESCRIPTION: "Performance indicator"
+    DASHBOARD_SORT_INDEX: 5
+    DASHBOARD_JOB_CATEGORY: "Performance"
+  script:
+    - bash verif/regress/dhrystone.sh
+    - python3 .gitlab-ci/scripts/report_benchmark.py --dhrystone verif/sim/out_*/veri-testharness_sim/dhrystone_main.log
+
+.regress_test:
+  stage: verif tests
+  before_script:
+    - !reference [.smoke_test, before_script]
+  rules: &on_regress
+    - if: $CI_KIND == "regress"
+    - if: $CI_KIND == "verif"
+    - when: manual
+      allow_failure: true
+
+riscv_arch_test:
+  extends:
+    - .regress_test
   variables:
-    DV_SIMULATORS: "veri-testharness,spike"
     DASHBOARD_JOB_TITLE: "arch_test $DV_TARGET"
     DASHBOARD_JOB_DESCRIPTION: "Compliance regression suite"
     DASHBOARD_SORT_INDEX: 0
     DASHBOARD_JOB_CATEGORY: "Test suites"
-  script:
-    - source verif/regress/dv-riscv-arch-test.sh
-    - python3 .gitlab-ci/scripts/report_simu.py verif/sim/logfile.log
+    DV_SIMULATORS: "veri-testharness,spike"
+  parallel:
+    matrix:
+      - DV_TARGET: [cv64a6_imafdc_sv39, cv32a60x]
+  script: source verif/regress/dv-riscv-arch-test.sh
+  after_script: *simu_after_script
 
 csr_test:
   extends:
-    - .verif_test
-    - .template_job_short_ci
-  parallel:
-    matrix:
-      - DV_TARGET: [cv32a60x]
+    - .regress_test
   variables:
-    DV_SIMULATORS: "veri-testharness,spike"
     DASHBOARD_JOB_TITLE: "csr_test $DV_TARGET"
     DASHBOARD_JOB_DESCRIPTION: "CSR regression suite"
     DASHBOARD_SORT_INDEX: 0
     DASHBOARD_JOB_CATEGORY: "Test suites"
-  script:
-    - source verif/regress/dv-riscv-csr-access-test.sh
-    - python3 .gitlab-ci/scripts/report_simu.py verif/sim/logfile.log
+    DV_SIMULATORS: "veri-testharness,spike"
+    DV_TARGET: cv32a60x
+  script: source verif/regress/dv-riscv-csr-access-test.sh
+  after_script: *simu_after_script
 
-pub_hwconfig:
+hwconfig:
   extends:
-    - .verif_test
-    - .template_job_short_ci
-  parallel:
-    matrix:
-      - DV_SIMULATORS: ["veri-testharness,spike"]
-        DV_HWCONFIG_OPTS:
-          - "--default_config=cv32a60x --isa=rv32imac"
+    - .regress_test
   variables:
     DASHBOARD_JOB_TITLE: "HW config $DV_SIMULATORS $DV_HWCONFIG_OPTS"
     DASHBOARD_JOB_DESCRIPTION: "Short tests to challenge target configurations"
     DASHBOARD_SORT_INDEX: 1
     DASHBOARD_JOB_CATEGORY: "Basic"
+    DV_SIMULATORS: "veri-testharness,spike"
+    DV_HWCONFIG_OPTS: "--default_config=cv32a60x --isa=rv32imac"
   script:
     - source verif/regress/hwconfig_tests.sh
     - python3 .gitlab-ci/scripts/report_pass.py
 
-pub_compliance:
+compliance:
   extends:
-    - .verif_test
-    - .template_job_short_ci
-  parallel:
-    matrix:
-      - DV_TARGET: [cv64a6_imafdc_sv39, cv32a60x]
+    - .regress_test
   variables:
-    DV_SIMULATORS: "veri-testharness,spike"
     DASHBOARD_JOB_TITLE: "Compliance $DV_TARGET"
     DASHBOARD_JOB_DESCRIPTION: "Compliance regression suite"
     DASHBOARD_SORT_INDEX: 2
     DASHBOARD_JOB_CATEGORY: "Test suites"
-  script:
-    - source verif/regress/dv-riscv-compliance.sh
-    - python3 .gitlab-ci/scripts/report_simu.py verif/sim/logfile.log
-
-pub_tests-v:
-  extends:
-    - .verif_test
-    - .template_job_short_ci
+    DV_SIMULATORS: "veri-testharness,spike"
   parallel:
     matrix:
-      - DV_TARGET: [cv64a6_imafdc_sv39]
+      - DV_TARGET: [cv64a6_imafdc_sv39, cv32a60x]
+  script: source verif/regress/dv-riscv-compliance.sh
+  after_script: *simu_after_script
+
+tests-v:
+  extends:
+    - .regress_test
   variables:
-    DV_SIMULATORS: "veri-testharness,spike"
-    DV_TESTLISTS: "../tests/testlist_riscv-tests-$DV_TARGET-v.yaml"
     DASHBOARD_JOB_TITLE: "Riscv-test $DV_TARGET (virtual)"
     DASHBOARD_JOB_DESCRIPTION: "Riscv-test regression suite (virtual)"
     DASHBOARD_SORT_INDEX: 3
     DASHBOARD_JOB_CATEGORY: "Test suites"
-  script:
-    - source verif/regress/dv-riscv-tests.sh
-    - python3 .gitlab-ci/scripts/report_simu.py verif/sim/logfile.log
+    DV_SIMULATORS: "veri-testharness,spike"
+    DV_TARGET: cv64a6_imafdc_sv39
+    DV_TESTLISTS: "../tests/testlist_riscv-tests-$DV_TARGET-v.yaml"
+  script: source verif/regress/dv-riscv-tests.sh
+  after_script: *simu_after_script
 
-pub_tests-p:
+tests-p:
   extends:
-    - .verif_test
-    - .template_job_short_ci
-  parallel:
-    matrix:
-      - DV_TARGET: [cv64a6_imafdc_sv39, cv32a60x]
+    - .regress_test
   variables:
-    DV_SIMULATORS: "veri-testharness,spike"
-    DV_TESTLISTS: "../tests/testlist_riscv-tests-$DV_TARGET-p.yaml"
     DASHBOARD_JOB_TITLE: "Riscv-test $DV_TARGET (physical)"
     DASHBOARD_JOB_DESCRIPTION: "Riscv-test regression suite (physical)"
     DASHBOARD_SORT_INDEX: 4
     DASHBOARD_JOB_CATEGORY: "Test suites"
-  script:
-    - source verif/regress/dv-riscv-tests.sh
-    - python3 .gitlab-ci/scripts/report_simu.py verif/sim/logfile.log
+    DV_SIMULATORS: "veri-testharness,spike"
+    DV_TESTLISTS: "../tests/testlist_riscv-tests-$DV_TARGET-p.yaml"
+  parallel:
+    matrix:
+      - DV_TARGET: [cv64a6_imafdc_sv39, cv32a60x]
+  script: source verif/regress/dv-riscv-tests.sh
+  after_script: *simu_after_script
 
-pub_synthesis_others:
+synthesis_others:
   timeout: 2 hours
   extends:
     - .verif_test
-    - .template_job_always_manual
   parallel:
     matrix:
-      - TARGET: [cv64a6_imafdc_sv39]
-        PERIOD: ["1.1"]
-      - TARGET: [cv32a60x]
-        PERIOD: ["0.95"]
+      - TARGET: cv64a6_imafdc_sv39
+        PERIOD: "1.1"
+      - TARGET: cv32a60x
+        PERIOD: "0.95"
   variables: &synth_vars
     INPUT_DELAY: "0.46"
     OUTPUT_DELAY: "0.11"
@@ -332,28 +294,30 @@ pub_synthesis_others:
     - make -C pd/synth cva6_synth
     - mv pd/synth/cva6_${TARGET}_synth_modified.v artifacts/cva6_${TARGET}_synth_modified.v
     - python3 .gitlab-ci/scripts/report_synth.py pd/synth/cva6_${TARGET}/reports/$PERIOD/cva6_$(echo $TECH_NAME)_synth_area.rpt pd/synth/synthesis_batch.log
-  rules:
-    - when: manual
-      allow_failure: true
 
-pub_synthesis:
+synthesis:
   timeout: 2 hours
   extends:
-    - .verif_test
-    - .template_job_always_manual
+    - .regress_test
   variables:
     <<: *synth_vars
     TARGET: cv32a6_embedded
     PERIOD: "0.85"
   script: *synth_script
 
-pub_smoke-gate:
+.backend_test:
+  stage: backend tests
+  before_script:
+    - mkdir -p artifacts/{reports,logs}
+    - python3 .gitlab-ci/scripts/report_fail.py
+
+smoke-gate:
   extends:
     - .backend_test
-    - .template_job_always_manual
   needs:
-    - pub_build_tools
-    - pub_synthesis
+    - build_tools
+    - synthesis
+  rules: *on_regress
   variables:
     DASHBOARD_JOB_TITLE: "Smoke Gate $TARGET"
     DASHBOARD_JOB_DESCRIPTION: "Simple test to check netlist from ASIC synthesis"
@@ -375,40 +339,12 @@ pub_smoke-gate:
     - cd verif/sim
     - make vcs_clean_all
     - python3 cva6.py --testlist=../tests/testlist_riscv-tests-cv32a60x-p.yaml --test rv32ui-p-lw --iss_yaml cva6.yaml --target $TARGET --iss=spike,vcs-gate $DV_OPTS
-    - cd -
-    - python3 .gitlab-ci/scripts/report_simu.py verif/sim/logfile.log
-
-pub_coremark:
-  extends:
-    - .verif_test
-    - .template_job_full_ci
-  variables:
-    DASHBOARD_JOB_TITLE: "CoreMark"
-    DASHBOARD_JOB_DESCRIPTION: "Performance indicator"
-    DASHBOARD_SORT_INDEX: 5
-    DASHBOARD_JOB_CATEGORY: "Performance"
-  script:
-    - bash verif/regress/coremark.sh --no-print
-    - python3 .gitlab-ci/scripts/report_benchmark.py --coremark verif/sim/out_*/veri-testharness_sim/core_main.log
-
-pub_dhrystone:
-  extends:
-    - .verif_test
-    - .template_job_full_ci
-  variables:
-    DASHBOARD_JOB_TITLE: "Dhrystone"
-    DASHBOARD_JOB_DESCRIPTION: "Performance indicator"
-    DASHBOARD_SORT_INDEX: 5
-    DASHBOARD_JOB_CATEGORY: "Performance"
-  script:
-    - bash verif/regress/dhrystone.sh
-    - python3 .gitlab-ci/scripts/report_benchmark.py --dhrystone verif/sim/out_*/veri-testharness_sim/dhrystone_main.log
+  after_script: *simu_after_script
 
-pub_fpga-build:
+fpga-build:
   timeout: 90 minutes
   extends:
-    - .verif_test
-    - .template_job_short_ci
+    - .regress_test
   variables:
     DASHBOARD_JOB_TITLE: "FPGA Build $TARGET"
     DASHBOARD_JOB_DESCRIPTION: "Test of FPGA build flow"
@@ -423,8 +359,16 @@ pub_fpga-build:
     - mv corev_apu/fpga/work-fpga/ariane_xilinx.bit artifacts/ariane_xilinx_$TARGET.bit
     - python3 .gitlab-ci/scripts/report_fpga.py corev_apu/fpga/reports/ariane.utilization.rpt
 
-pub_generated_tests:
-  tags: [$TAGS_RUNNER]
+.verif_test:
+  extends:
+    - .regress_test
+  rules: &on_verif
+    - if: $CI_KIND == "verif"
+    - when: manual
+      allow_failure: true
+  timeout: 4h
+
+generated_tests:
   extends:
     - .verif_test
   variables:
@@ -456,15 +400,8 @@ pub_generated_tests:
     - mv verif/sim/vcs_results/default/vcs.d/simv.vdb artifacts/coverage
     - mv verif/sim/seedlist.yaml artifacts/coverage
     - python3 .gitlab-ci/scripts/report_pass.py
-  rules:
-    - when: manual
-      allow_failure: true
-  timeout: 4h
-  artifacts:
-    expire_in: 3 week
 
-pub_generated_xif_tests:
-  tags: [$TAGS_RUNNER]
+generated_xif_tests:
   extends:
     - .verif_test
   variables:
@@ -481,15 +418,8 @@ pub_generated_xif_tests:
     - mv verif/sim/vcs_results/default/vcs.d/simv.vdb artifacts/coverage
     - mv verif/sim/seedlist.yaml artifacts/coverage
     - python3 .gitlab-ci/scripts/report_pass.py
-  rules:
-    - when: manual
-      allow_failure: true
-  timeout: 4h
-  artifacts:
-    expire_in: 3 week
 
-pub_directed_isacov-tests:
-  tags: [$TAGS_RUNNER]
+directed_isacov-tests:
   extends:
     - .verif_test
   variables:
@@ -505,15 +435,8 @@ pub_directed_isacov-tests:
     - source verif/regress/dv-generated-tests.sh
     - mv verif/sim/vcs_results/default/vcs.d/simv.vdb artifacts/coverage
     - python3 .gitlab-ci/scripts/report_pass.py
-  rules:
-    - when: manual
-      allow_failure: true
-  timeout: 4h
-  artifacts:
-    expire_in: 3 week
 
-pub_directed_xif-tests:
-  tags: [$TAGS_RUNNER]
+directed_xif-tests:
   extends:
     - .verif_test
   variables:
@@ -529,27 +452,22 @@ pub_directed_xif-tests:
     - source verif/regress/dv-generated-xif-tests.sh
     - mv verif/sim/vcs_results/default/vcs.d/simv.vdb artifacts/coverage
     - python3 .gitlab-ci/scripts/report_pass.py
-  rules:
-    - when: manual
-      allow_failure: true
-  timeout: 4h
-  artifacts:
-    expire_in: 3 week
 
-pub_fpga-boot:
-  tags: [fpga,shell]
+fpga-boot:
   extends:
     - .backend_test
+  tags: [fpga,shell]
   needs:
-    - pub_build_tools
-    - pub_fpga-build
+    - build_tools
+    - fpga-build
+  rules: *on_regress
   variables:
-    VERILATOR_INSTALL_DIR: "NO" # Skip install and checks of verilator
-    SPIKE_ROOT: "NO"  # Skip install and checks of spike
     DASHBOARD_JOB_TITLE: "FPGA Linux32 Boot "
     DASHBOARD_JOB_DESCRIPTION: "Test of Linux 32 bits boot on FPGA Genesys2"
     DASHBOARD_SORT_INDEX: 10
     DASHBOARD_JOB_CATEGORY: "Synthesis"
+    VERILATOR_INSTALL_DIR: "NO" # Skip install and checks of verilator
+    SPIKE_ROOT: "NO"  # Skip install and checks of spike
   script:
     - source verif/regress/install-cva6.sh
     - source $VIVADO2022_SETUP
@@ -561,14 +479,14 @@ pub_fpga-boot:
     - python3 .gitlab-ci/scripts/report_fpga_boot.py corev_apu/fpga/scripts/fpga_boot.rpt
 
 code_coverage-report:
-  tags: [$TAGS_RUNNER]
   extends:
     - .backend_test
+  rules: *on_verif
   needs:
-    - pub_generated_tests
-    - pub_directed_isacov-tests
-    - pub_generated_xif_tests
-    - pub_directed_xif-tests
+    - generated_tests
+    - directed_isacov-tests
+    - generated_xif_tests
+    - directed_xif-tests
   variables:
     DASHBOARD_JOB_TITLE: "Report merge coverage"
     DASHBOARD_JOB_DESCRIPTION: "Report merge coverage of generated tests"
@@ -583,38 +501,30 @@ code_coverage-report:
     - make -C verif/sim generate_cov_dash
     - mv verif/sim/urgReport artifacts/cov_reports/
     - python3 .gitlab-ci/scripts/report_pass.py
-  rules:
-    - when: on_success
-  artifacts:
-    expire_in: 3 week
 
 check gitlab jobs status:
   stage: find failures
-  tags: [$TAGS_RUNNER]
   rules:
-    - if: '$DASHBOARD_URL'
+    - if: $CI_KIND == "regress" || $CI_KIND == "verif"
       when: on_failure
-    - when: never
   variables:
     DASHBOARD_JOB_TITLE: "Environment check"
     DASHBOARD_JOB_DESCRIPTION: "Detect environment issues"
     DASHBOARD_SORT_INDEX: 0
     DASHBOARD_JOB_CATEGORY: "Environment"
+    GIT_SUBMODULE_STRATEGY: none
   script:
     - rm -rf artifacts/
     - mkdir -p artifacts/reports
     - python3 .gitlab-ci/scripts/report_envfail.py
-  artifacts: *artifacts
 
 merge reports:
   stage: report
-  tags: [$TAGS_RUNNER]
   variables:
     GIT_SUBMODULE_STRATEGY: none
   rules:
-    - if: '$DASHBOARD_URL'
+    - if: $DASHBOARD_URL && $CI_KIND != "none"
       when: always
-    - when: never
   script:
     - mkdir -p artifacts/reports
     - ls -al artifacts/reports
diff --git a/.gitlab-ci/scripts/merge_job_reports.py b/.gitlab-ci/scripts/merge_job_reports.py
index e6afdf686b..3cf9015c11 100644
--- a/.gitlab-ci/scripts/merge_job_reports.py
+++ b/.gitlab-ci/scripts/merge_job_reports.py
@@ -33,7 +33,7 @@
 except KeyError:
     workflow_type = "gitlab"
 
-workflow_action = os.environ['WORKFLOW_EVENT'].strip('\'\"')
+workflow_action = os.environ['CI_PIPELINE_SOURCE'].strip('\'\"')
 
 if workflow_type == 'github':  # (from wrapper)
     
diff --git a/verif/regress/riscv-isa-sim.patch b/verif/regress/riscv-isa-sim.patch
deleted file mode 100644
index 26cc20c6be..0000000000
--- a/verif/regress/riscv-isa-sim.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff --git a/arch_test_target/spike/model_test.h b/arch_test_target/spike/model_test.h
-index e968e43a..7628af51 100644
---- a/arch_test_target/spike/model_test.h
-+++ b/arch_test_target/spike/model_test.h
-@@ -23,6 +23,7 @@
-   li x1, 1;                                                                   \
-   write_tohost:                                                               \
-     sw x1, tohost, t1;                                                        \
-+  ecall
-   self_loop:  j self_loop;
- 
- #define RVMODEL_BOOT
--- 
-2.39.0
-
diff --git a/verif/regress/smoke-gen_tests.sh b/verif/regress/smoke-gen_tests.sh
index d6d5ba94b5..5657f67854 100644
--- a/verif/regress/smoke-gen_tests.sh
+++ b/verif/regress/smoke-gen_tests.sh
@@ -16,7 +16,6 @@ fi
 # install the required tools
 source verif/regress/install-cva6.sh
 source verif/regress/install-riscv-dv.sh
-source verif/regress/install-riscv-isa-sim.sh
 
 if ! [ -n "$DV_TARGET" ]; then
   DV_TARGET=cv32a60x