diff --git a/.gitlab/ci/jobs/packaging/opam_package.yml b/.gitlab/ci/jobs/packaging/opam_package.yml
index d597c7a467dc52a801d4a8e0ebff9e1dbe47231a..0064c39e5eaccce090df488afd4171948780905a 100644
--- a/.gitlab/ci/jobs/packaging/opam_package.yml
+++ b/.gitlab/ci/jobs/packaging/opam_package.yml
@@ -20,9 +20,10 @@
         - "**/dune-project"
         - "**/dune-workspace"
         - "**/*.opam"
-        - .gitlab/ci/opam-ci.yml
-        - .gitlab/ci/packaging.yml
+        - .gitlab/ci/jobs/packaging/opam_prepare.yml
+        - .gitlab/ci/jobs/packaging/opam_package.yml
         - manifest/manifest.ml
+        - manifest/main.ml
         - scripts/opam-prepare-repo.sh
         - scripts/version.sh
       when: delayed
@@ -48,9 +49,10 @@
         - "**/dune-project"
         - "**/dune-workspace"
         - "**/*.opam"
-        - .gitlab/ci/opam-ci.yml
-        - .gitlab/ci/packaging.yml
+        - .gitlab/ci/jobs/packaging/opam_prepare.yml
+        - .gitlab/ci/jobs/packaging/opam_package.yml
         - manifest/manifest.ml
+        - manifest/main.ml
         - scripts/opam-prepare-repo.sh
         - scripts/version.sh
       when: delayed
@@ -76,9 +78,10 @@
         - "**/dune-project"
         - "**/dune-workspace"
         - "**/*.opam"
-        - .gitlab/ci/opam-ci.yml
-        - .gitlab/ci/packaging.yml
+        - .gitlab/ci/jobs/packaging/opam_prepare.yml
+        - .gitlab/ci/jobs/packaging/opam_package.yml
         - manifest/manifest.ml
+        - manifest/main.ml
         - scripts/opam-prepare-repo.sh
         - scripts/version.sh
       when: delayed
@@ -104,9 +107,10 @@
         - "**/dune-project"
         - "**/dune-workspace"
         - "**/*.opam"
-        - .gitlab/ci/opam-ci.yml
-        - .gitlab/ci/packaging.yml
+        - .gitlab/ci/jobs/packaging/opam_prepare.yml
+        - .gitlab/ci/jobs/packaging/opam_package.yml
         - manifest/manifest.ml
+        - manifest/main.ml
         - scripts/opam-prepare-repo.sh
         - scripts/version.sh
       when: delayed
@@ -132,9 +136,10 @@
         - "**/dune-project"
         - "**/dune-workspace"
         - "**/*.opam"
-        - .gitlab/ci/opam-ci.yml
-        - .gitlab/ci/packaging.yml
+        - .gitlab/ci/jobs/packaging/opam_prepare.yml
+        - .gitlab/ci/jobs/packaging/opam_package.yml
         - manifest/manifest.ml
+        - manifest/main.ml
         - scripts/opam-prepare-repo.sh
         - scripts/version.sh
       when: delayed
@@ -160,9 +165,10 @@
         - "**/dune-project"
         - "**/dune-workspace"
         - "**/*.opam"
-        - .gitlab/ci/opam-ci.yml
-        - .gitlab/ci/packaging.yml
+        - .gitlab/ci/jobs/packaging/opam_prepare.yml
+        - .gitlab/ci/jobs/packaging/opam_package.yml
         - manifest/manifest.ml
+        - manifest/main.ml
         - scripts/opam-prepare-repo.sh
         - scripts/version.sh
       when: delayed
@@ -188,9 +194,10 @@
         - "**/dune-project"
         - "**/dune-workspace"
         - "**/*.opam"
-        - .gitlab/ci/opam-ci.yml
-        - .gitlab/ci/packaging.yml
+        - .gitlab/ci/jobs/packaging/opam_prepare.yml
+        - .gitlab/ci/jobs/packaging/opam_package.yml
         - manifest/manifest.ml
+        - manifest/main.ml
         - scripts/opam-prepare-repo.sh
         - scripts/version.sh
       when: delayed
diff --git a/manifest/main.ml b/manifest/main.ml
index b656998c3d5348f92525312cf2bf7bfec3ebc0fe..0d26e08ec0ecfc691ec5746f5204ebcb5d9e6454 100644
--- a/manifest/main.ml
+++ b/manifest/main.ml
@@ -5453,14 +5453,13 @@ let hash = Protocol.hash
     in
     let test_helpers =
       only_if active @@ fun () ->
+      let name = sf "tezos-%s-test-helpers" name_dash in
       public_lib
-        (sf "tezos-%s-test-helpers" name_dash)
+        name
         ~path:
           (if active then path // "lib_protocol/test/helpers"
           else path // "lib_protocol")
-        ~opam:
-          (if active then sf "tezos-%s-test-helpers" name_dash
-          else sf "tezos-%s-test-helpers" name_dash)
+        ~opam:name
         ~internal_name:(sf "tezos_%s_test_helpers" name_underscore)
         ~synopsis:"Tezos/Protocol: protocol testing framework"
         ~opam_only_deps:[octez_protocol_environment; parameters |> if_some]
diff --git a/manifest/manifest.ml b/manifest/manifest.ml
index 49a8ca9d10efc4dd6590164e06ed94d0c7cd7979..de200597f439e7523071101588404fb28267ec44 100644
--- a/manifest/manifest.ml
+++ b/manifest/manifest.ml
@@ -3329,9 +3329,10 @@ let generate_opam_ci opam_release_graph =
         - "**/dune-project"
         - "**/dune-workspace"
         - "**/*.opam"
-        - .gitlab/ci/opam-ci.yml
-        - .gitlab/ci/packaging.yml
+        - .gitlab/ci/jobs/packaging/opam_prepare.yml
+        - .gitlab/ci/jobs/packaging/opam_package.yml
         - manifest/manifest.ml
+        - manifest/main.ml
         - scripts/opam-prepare-repo.sh
         - scripts/version.sh
       when: delayed