diff --git a/.gitlab/ci/pipelines/before_merging.yml b/.gitlab/ci/pipelines/before_merging.yml
index 381112afc765ec87e1e82526d90b1ca7df49f2a4..e3f193b2b88ff942dc56e7a1a111ee0aaa0774a1 100644
--- a/.gitlab/ci/pipelines/before_merging.yml
+++ b/.gitlab/ci/pipelines/before_merging.yml
@@ -8314,7 +8314,7 @@ oc.docker:arm64:
   when: manual
 
 oc.build:dpkg:amd64:
-  image: debian:bookworm
+  image: $DISTRIBUTION
   stage: manual
   tags:
   - gcp
@@ -8325,6 +8325,7 @@ oc.build:dpkg:amd64:
   dependencies: []
   before_script:
   - . ./scripts/version.sh
+  - export DEBIAN_FRONTEND=noninteractive
   - apt update
   - apt-get install -y rsync git m4 build-essential patch unzip wget opam jq bc autoconf
     cmake libev-dev libffi-dev libgmp-dev libhidapi-dev pkg-config zlib1g-dev libprotobuf-dev
@@ -8340,8 +8341,10 @@ oc.build:dpkg:amd64:
   - make build-deps
   - eval $(opam env)
   - make $TARGET
-  - mkdir $DISTRIBUTION
-  - mv octez-*.* $DISTRIBUTION/
+  - DISTRO=$(echo "$DISTRIBUTION" | cut -d':' -f1)
+  - RELEASE=$(echo "$DISTRIBUTION" | cut -d':' -f2)
+  - mkdir -p packages/$DISTRO/$RELEASE
+  - mv octez-*.* packages/$DISTRO/$RELEASE/
   variables:
     TARGET: dpkg
     OCTEZ_PKGMAINTAINER: nomadic-labs
@@ -8351,16 +8354,17 @@ oc.build:dpkg:amd64:
     name: ${TARGET}-$ARCH-$CI_COMMIT_REF_SLUG
     expire_in: 1 day
     paths:
-    - $DISTRIBUTION/octez-*.deb
+    - packages/
     when: on_success
   parallel:
     matrix:
     - DISTRIBUTION:
       - debian:bookworm
       - ubuntu:focal
+      - ubuntu:jammy
 
 oc.build:rpm:amd64:
-  image: fedora:39
+  image: $DISTRIBUTION
   stage: manual
   tags:
   - gcp
@@ -8383,8 +8387,10 @@ oc.build:rpm:amd64:
   - make build-deps
   - eval $(opam env)
   - make $TARGET
-  - mkdir $DISTRIBUTION
-  - mv octez-*.* $DISTRIBUTION/
+  - DISTRO=$(echo "$DISTRIBUTION" | cut -d':' -f1)
+  - RELEASE=$(echo "$DISTRIBUTION" | cut -d':' -f2)
+  - mkdir -p packages/$DISTRO/$RELEASE
+  - mv octez-*.* packages/$DISTRO/$RELEASE/
   variables:
     TARGET: rpm
     OCTEZ_PKGMAINTAINER: nomadic-labs
@@ -8394,7 +8400,7 @@ oc.build:rpm:amd64:
     name: ${TARGET}-$ARCH-$CI_COMMIT_REF_SLUG
     expire_in: 1 day
     paths:
-    - $DISTRIBUTION/octez-*.rpm
+    - packages/
     when: on_success
   parallel:
     matrix:
diff --git a/.gitlab/ci/pipelines/non_release_tag.yml b/.gitlab/ci/pipelines/non_release_tag.yml
index 3f54021a63a849266b0edfe1fc60f8b996fb0423..95dc73d228aa8ffeab3cece0339ccb71cd29259d 100644
--- a/.gitlab/ci/pipelines/non_release_tag.yml
+++ b/.gitlab/ci/pipelines/non_release_tag.yml
@@ -80,7 +80,7 @@ oc.docker:arm64:
     rust_toolchain_image_tag: is-never-pulled
 
 oc.build:dpkg:amd64:
-  image: debian:bookworm
+  image: $DISTRIBUTION
   stage: build
   tags:
   - gcp
@@ -88,6 +88,7 @@ oc.build:dpkg:amd64:
   dependencies: []
   before_script:
   - . ./scripts/version.sh
+  - export DEBIAN_FRONTEND=noninteractive
   - apt update
   - apt-get install -y rsync git m4 build-essential patch unzip wget opam jq bc autoconf
     cmake libev-dev libffi-dev libgmp-dev libhidapi-dev pkg-config zlib1g-dev libprotobuf-dev
@@ -103,8 +104,10 @@ oc.build:dpkg:amd64:
   - make build-deps
   - eval $(opam env)
   - make $TARGET
-  - mkdir $DISTRIBUTION
-  - mv octez-*.* $DISTRIBUTION/
+  - DISTRO=$(echo "$DISTRIBUTION" | cut -d':' -f1)
+  - RELEASE=$(echo "$DISTRIBUTION" | cut -d':' -f2)
+  - mkdir -p packages/$DISTRO/$RELEASE
+  - mv octez-*.* packages/$DISTRO/$RELEASE/
   variables:
     TARGET: dpkg
     OCTEZ_PKGMAINTAINER: nomadic-labs
@@ -114,16 +117,17 @@ oc.build:dpkg:amd64:
     name: ${TARGET}-$ARCH-$CI_COMMIT_REF_SLUG
     expire_in: 1 day
     paths:
-    - $DISTRIBUTION/octez-*.deb
+    - packages/
     when: on_success
   parallel:
     matrix:
     - DISTRIBUTION:
       - debian:bookworm
       - ubuntu:focal
+      - ubuntu:jammy
 
 oc.build:rpm:amd64:
-  image: fedora:39
+  image: $DISTRIBUTION
   stage: build
   tags:
   - gcp
@@ -143,8 +147,10 @@ oc.build:rpm:amd64:
   - make build-deps
   - eval $(opam env)
   - make $TARGET
-  - mkdir $DISTRIBUTION
-  - mv octez-*.* $DISTRIBUTION/
+  - DISTRO=$(echo "$DISTRIBUTION" | cut -d':' -f1)
+  - RELEASE=$(echo "$DISTRIBUTION" | cut -d':' -f2)
+  - mkdir -p packages/$DISTRO/$RELEASE
+  - mv octez-*.* packages/$DISTRO/$RELEASE/
   variables:
     TARGET: rpm
     OCTEZ_PKGMAINTAINER: nomadic-labs
@@ -154,7 +160,7 @@ oc.build:rpm:amd64:
     name: ${TARGET}-$ARCH-$CI_COMMIT_REF_SLUG
     expire_in: 1 day
     paths:
-    - $DISTRIBUTION/octez-*.rpm
+    - packages/
     when: on_success
   parallel:
     matrix:
diff --git a/.gitlab/ci/pipelines/non_release_tag_test.yml b/.gitlab/ci/pipelines/non_release_tag_test.yml
index 7db85d27bc7dc344f0da2dee12f497527d99734a..e6c30d86e7c204452863bc3c3fbe8bfb7dda0aa9 100644
--- a/.gitlab/ci/pipelines/non_release_tag_test.yml
+++ b/.gitlab/ci/pipelines/non_release_tag_test.yml
@@ -80,7 +80,7 @@ oc.docker:arm64:
     rust_toolchain_image_tag: is-never-pulled
 
 oc.build:dpkg:amd64:
-  image: debian:bookworm
+  image: $DISTRIBUTION
   stage: build
   tags:
   - gcp
@@ -88,6 +88,7 @@ oc.build:dpkg:amd64:
   dependencies: []
   before_script:
   - . ./scripts/version.sh
+  - export DEBIAN_FRONTEND=noninteractive
   - apt update
   - apt-get install -y rsync git m4 build-essential patch unzip wget opam jq bc autoconf
     cmake libev-dev libffi-dev libgmp-dev libhidapi-dev pkg-config zlib1g-dev libprotobuf-dev
@@ -103,8 +104,10 @@ oc.build:dpkg:amd64:
   - make build-deps
   - eval $(opam env)
   - make $TARGET
-  - mkdir $DISTRIBUTION
-  - mv octez-*.* $DISTRIBUTION/
+  - DISTRO=$(echo "$DISTRIBUTION" | cut -d':' -f1)
+  - RELEASE=$(echo "$DISTRIBUTION" | cut -d':' -f2)
+  - mkdir -p packages/$DISTRO/$RELEASE
+  - mv octez-*.* packages/$DISTRO/$RELEASE/
   variables:
     TARGET: dpkg
     OCTEZ_PKGMAINTAINER: nomadic-labs
@@ -114,16 +117,17 @@ oc.build:dpkg:amd64:
     name: ${TARGET}-$ARCH-$CI_COMMIT_REF_SLUG
     expire_in: 1 day
     paths:
-    - $DISTRIBUTION/octez-*.deb
+    - packages/
     when: on_success
   parallel:
     matrix:
     - DISTRIBUTION:
       - debian:bookworm
       - ubuntu:focal
+      - ubuntu:jammy
 
 oc.build:rpm:amd64:
-  image: fedora:39
+  image: $DISTRIBUTION
   stage: build
   tags:
   - gcp
@@ -143,8 +147,10 @@ oc.build:rpm:amd64:
   - make build-deps
   - eval $(opam env)
   - make $TARGET
-  - mkdir $DISTRIBUTION
-  - mv octez-*.* $DISTRIBUTION/
+  - DISTRO=$(echo "$DISTRIBUTION" | cut -d':' -f1)
+  - RELEASE=$(echo "$DISTRIBUTION" | cut -d':' -f2)
+  - mkdir -p packages/$DISTRO/$RELEASE
+  - mv octez-*.* packages/$DISTRO/$RELEASE/
   variables:
     TARGET: rpm
     OCTEZ_PKGMAINTAINER: nomadic-labs
@@ -154,7 +160,7 @@ oc.build:rpm:amd64:
     name: ${TARGET}-$ARCH-$CI_COMMIT_REF_SLUG
     expire_in: 1 day
     paths:
-    - $DISTRIBUTION/octez-*.rpm
+    - packages/
     when: on_success
   parallel:
     matrix:
diff --git a/.gitlab/ci/pipelines/octez_beta_release_tag.yml b/.gitlab/ci/pipelines/octez_beta_release_tag.yml
index 298f5e446da8a25d3ad44967a882bcd52cdcc335..5a2db2902b43a515aca1081ea92e181a0b329e5b 100644
--- a/.gitlab/ci/pipelines/octez_beta_release_tag.yml
+++ b/.gitlab/ci/pipelines/octez_beta_release_tag.yml
@@ -80,7 +80,7 @@ oc.docker:arm64:
     rust_toolchain_image_tag: is-never-pulled
 
 oc.build:dpkg:amd64:
-  image: debian:bookworm
+  image: $DISTRIBUTION
   stage: build
   tags:
   - gcp
@@ -88,6 +88,7 @@ oc.build:dpkg:amd64:
   dependencies: []
   before_script:
   - . ./scripts/version.sh
+  - export DEBIAN_FRONTEND=noninteractive
   - apt update
   - apt-get install -y rsync git m4 build-essential patch unzip wget opam jq bc autoconf
     cmake libev-dev libffi-dev libgmp-dev libhidapi-dev pkg-config zlib1g-dev libprotobuf-dev
@@ -103,8 +104,10 @@ oc.build:dpkg:amd64:
   - make build-deps
   - eval $(opam env)
   - make $TARGET
-  - mkdir $DISTRIBUTION
-  - mv octez-*.* $DISTRIBUTION/
+  - DISTRO=$(echo "$DISTRIBUTION" | cut -d':' -f1)
+  - RELEASE=$(echo "$DISTRIBUTION" | cut -d':' -f2)
+  - mkdir -p packages/$DISTRO/$RELEASE
+  - mv octez-*.* packages/$DISTRO/$RELEASE/
   variables:
     TARGET: dpkg
     OCTEZ_PKGMAINTAINER: nomadic-labs
@@ -114,16 +117,17 @@ oc.build:dpkg:amd64:
     name: ${TARGET}-$ARCH-$CI_COMMIT_REF_SLUG
     expire_in: 1 day
     paths:
-    - $DISTRIBUTION/octez-*.deb
+    - packages/
     when: on_success
   parallel:
     matrix:
     - DISTRIBUTION:
       - debian:bookworm
       - ubuntu:focal
+      - ubuntu:jammy
 
 oc.build:rpm:amd64:
-  image: fedora:39
+  image: $DISTRIBUTION
   stage: build
   tags:
   - gcp
@@ -143,8 +147,10 @@ oc.build:rpm:amd64:
   - make build-deps
   - eval $(opam env)
   - make $TARGET
-  - mkdir $DISTRIBUTION
-  - mv octez-*.* $DISTRIBUTION/
+  - DISTRO=$(echo "$DISTRIBUTION" | cut -d':' -f1)
+  - RELEASE=$(echo "$DISTRIBUTION" | cut -d':' -f2)
+  - mkdir -p packages/$DISTRO/$RELEASE
+  - mv octez-*.* packages/$DISTRO/$RELEASE/
   variables:
     TARGET: rpm
     OCTEZ_PKGMAINTAINER: nomadic-labs
@@ -154,7 +160,7 @@ oc.build:rpm:amd64:
     name: ${TARGET}-$ARCH-$CI_COMMIT_REF_SLUG
     expire_in: 1 day
     paths:
-    - $DISTRIBUTION/octez-*.rpm
+    - packages/
     when: on_success
   parallel:
     matrix:
diff --git a/.gitlab/ci/pipelines/octez_release_tag.yml b/.gitlab/ci/pipelines/octez_release_tag.yml
index 0a41b7c2b1d163224f47df4f59df0ec2359e053c..d15ce45457d00d1557b4b31987bcd4314568144f 100644
--- a/.gitlab/ci/pipelines/octez_release_tag.yml
+++ b/.gitlab/ci/pipelines/octez_release_tag.yml
@@ -80,7 +80,7 @@ oc.docker:arm64:
     rust_toolchain_image_tag: is-never-pulled
 
 oc.build:dpkg:amd64:
-  image: debian:bookworm
+  image: $DISTRIBUTION
   stage: build
   tags:
   - gcp
@@ -88,6 +88,7 @@ oc.build:dpkg:amd64:
   dependencies: []
   before_script:
   - . ./scripts/version.sh
+  - export DEBIAN_FRONTEND=noninteractive
   - apt update
   - apt-get install -y rsync git m4 build-essential patch unzip wget opam jq bc autoconf
     cmake libev-dev libffi-dev libgmp-dev libhidapi-dev pkg-config zlib1g-dev libprotobuf-dev
@@ -103,8 +104,10 @@ oc.build:dpkg:amd64:
   - make build-deps
   - eval $(opam env)
   - make $TARGET
-  - mkdir $DISTRIBUTION
-  - mv octez-*.* $DISTRIBUTION/
+  - DISTRO=$(echo "$DISTRIBUTION" | cut -d':' -f1)
+  - RELEASE=$(echo "$DISTRIBUTION" | cut -d':' -f2)
+  - mkdir -p packages/$DISTRO/$RELEASE
+  - mv octez-*.* packages/$DISTRO/$RELEASE/
   variables:
     TARGET: dpkg
     OCTEZ_PKGMAINTAINER: nomadic-labs
@@ -114,16 +117,17 @@ oc.build:dpkg:amd64:
     name: ${TARGET}-$ARCH-$CI_COMMIT_REF_SLUG
     expire_in: 1 day
     paths:
-    - $DISTRIBUTION/octez-*.deb
+    - packages/
     when: on_success
   parallel:
     matrix:
     - DISTRIBUTION:
       - debian:bookworm
       - ubuntu:focal
+      - ubuntu:jammy
 
 oc.build:rpm:amd64:
-  image: fedora:39
+  image: $DISTRIBUTION
   stage: build
   tags:
   - gcp
@@ -143,8 +147,10 @@ oc.build:rpm:amd64:
   - make build-deps
   - eval $(opam env)
   - make $TARGET
-  - mkdir $DISTRIBUTION
-  - mv octez-*.* $DISTRIBUTION/
+  - DISTRO=$(echo "$DISTRIBUTION" | cut -d':' -f1)
+  - RELEASE=$(echo "$DISTRIBUTION" | cut -d':' -f2)
+  - mkdir -p packages/$DISTRO/$RELEASE
+  - mv octez-*.* packages/$DISTRO/$RELEASE/
   variables:
     TARGET: rpm
     OCTEZ_PKGMAINTAINER: nomadic-labs
@@ -154,7 +160,7 @@ oc.build:rpm:amd64:
     name: ${TARGET}-$ARCH-$CI_COMMIT_REF_SLUG
     expire_in: 1 day
     paths:
-    - $DISTRIBUTION/octez-*.rpm
+    - packages/
     when: on_success
   parallel:
     matrix:
diff --git a/.gitlab/ci/pipelines/octez_release_tag_test.yml b/.gitlab/ci/pipelines/octez_release_tag_test.yml
index 9fb1e52572c608988d75634952f4469d1292322a..461c2c32b0895d5eb00bfedc0185b990ee301a26 100644
--- a/.gitlab/ci/pipelines/octez_release_tag_test.yml
+++ b/.gitlab/ci/pipelines/octez_release_tag_test.yml
@@ -80,7 +80,7 @@ oc.docker:arm64:
     rust_toolchain_image_tag: is-never-pulled
 
 oc.build:dpkg:amd64:
-  image: debian:bookworm
+  image: $DISTRIBUTION
   stage: build
   tags:
   - gcp
@@ -88,6 +88,7 @@ oc.build:dpkg:amd64:
   dependencies: []
   before_script:
   - . ./scripts/version.sh
+  - export DEBIAN_FRONTEND=noninteractive
   - apt update
   - apt-get install -y rsync git m4 build-essential patch unzip wget opam jq bc autoconf
     cmake libev-dev libffi-dev libgmp-dev libhidapi-dev pkg-config zlib1g-dev libprotobuf-dev
@@ -103,8 +104,10 @@ oc.build:dpkg:amd64:
   - make build-deps
   - eval $(opam env)
   - make $TARGET
-  - mkdir $DISTRIBUTION
-  - mv octez-*.* $DISTRIBUTION/
+  - DISTRO=$(echo "$DISTRIBUTION" | cut -d':' -f1)
+  - RELEASE=$(echo "$DISTRIBUTION" | cut -d':' -f2)
+  - mkdir -p packages/$DISTRO/$RELEASE
+  - mv octez-*.* packages/$DISTRO/$RELEASE/
   variables:
     TARGET: dpkg
     OCTEZ_PKGMAINTAINER: nomadic-labs
@@ -114,16 +117,17 @@ oc.build:dpkg:amd64:
     name: ${TARGET}-$ARCH-$CI_COMMIT_REF_SLUG
     expire_in: 1 day
     paths:
-    - $DISTRIBUTION/octez-*.deb
+    - packages/
     when: on_success
   parallel:
     matrix:
     - DISTRIBUTION:
       - debian:bookworm
       - ubuntu:focal
+      - ubuntu:jammy
 
 oc.build:rpm:amd64:
-  image: fedora:39
+  image: $DISTRIBUTION
   stage: build
   tags:
   - gcp
@@ -143,8 +147,10 @@ oc.build:rpm:amd64:
   - make build-deps
   - eval $(opam env)
   - make $TARGET
-  - mkdir $DISTRIBUTION
-  - mv octez-*.* $DISTRIBUTION/
+  - DISTRO=$(echo "$DISTRIBUTION" | cut -d':' -f1)
+  - RELEASE=$(echo "$DISTRIBUTION" | cut -d':' -f2)
+  - mkdir -p packages/$DISTRO/$RELEASE
+  - mv octez-*.* packages/$DISTRO/$RELEASE/
   variables:
     TARGET: rpm
     OCTEZ_PKGMAINTAINER: nomadic-labs
@@ -154,7 +160,7 @@ oc.build:rpm:amd64:
     name: ${TARGET}-$ARCH-$CI_COMMIT_REF_SLUG
     expire_in: 1 day
     paths:
-    - $DISTRIBUTION/octez-*.rpm
+    - packages/
     when: on_success
   parallel:
     matrix:
diff --git a/.gitlab/ci/pipelines/schedule_extended_test.yml b/.gitlab/ci/pipelines/schedule_extended_test.yml
index 1e8f6b2cf7edf840b85d6d2b3ecf645361516dc4..4c0bad4ef1b77a833c3cd22703a177230cda5b20 100644
--- a/.gitlab/ci/pipelines/schedule_extended_test.yml
+++ b/.gitlab/ci/pipelines/schedule_extended_test.yml
@@ -311,7 +311,7 @@ select_tezts:
     when: always
 
 oc.build:dpkg:amd64:
-  image: debian:bookworm
+  image: $DISTRIBUTION
   stage: build
   tags:
   - gcp
@@ -319,6 +319,7 @@ oc.build:dpkg:amd64:
   dependencies: []
   before_script:
   - . ./scripts/version.sh
+  - export DEBIAN_FRONTEND=noninteractive
   - apt update
   - apt-get install -y rsync git m4 build-essential patch unzip wget opam jq bc autoconf
     cmake libev-dev libffi-dev libgmp-dev libhidapi-dev pkg-config zlib1g-dev libprotobuf-dev
@@ -334,8 +335,10 @@ oc.build:dpkg:amd64:
   - make build-deps
   - eval $(opam env)
   - make $TARGET
-  - mkdir $DISTRIBUTION
-  - mv octez-*.* $DISTRIBUTION/
+  - DISTRO=$(echo "$DISTRIBUTION" | cut -d':' -f1)
+  - RELEASE=$(echo "$DISTRIBUTION" | cut -d':' -f2)
+  - mkdir -p packages/$DISTRO/$RELEASE
+  - mv octez-*.* packages/$DISTRO/$RELEASE/
   variables:
     TARGET: dpkg
     OCTEZ_PKGMAINTAINER: nomadic-labs
@@ -345,16 +348,17 @@ oc.build:dpkg:amd64:
     name: ${TARGET}-$ARCH-$CI_COMMIT_REF_SLUG
     expire_in: 1 day
     paths:
-    - $DISTRIBUTION/octez-*.deb
+    - packages/
     when: on_success
   parallel:
     matrix:
     - DISTRIBUTION:
       - debian:bookworm
       - ubuntu:focal
+      - ubuntu:jammy
 
 oc.build:rpm:amd64:
-  image: fedora:39
+  image: $DISTRIBUTION
   stage: build
   tags:
   - gcp
@@ -374,8 +378,10 @@ oc.build:rpm:amd64:
   - make build-deps
   - eval $(opam env)
   - make $TARGET
-  - mkdir $DISTRIBUTION
-  - mv octez-*.* $DISTRIBUTION/
+  - DISTRO=$(echo "$DISTRIBUTION" | cut -d':' -f1)
+  - RELEASE=$(echo "$DISTRIBUTION" | cut -d':' -f2)
+  - mkdir -p packages/$DISTRO/$RELEASE
+  - mv octez-*.* packages/$DISTRO/$RELEASE/
   variables:
     TARGET: rpm
     OCTEZ_PKGMAINTAINER: nomadic-labs
@@ -385,7 +391,7 @@ oc.build:rpm:amd64:
     name: ${TARGET}-$ARCH-$CI_COMMIT_REF_SLUG
     expire_in: 1 day
     paths:
-    - $DISTRIBUTION/octez-*.rpm
+    - packages/
     when: on_success
   parallel:
     matrix:
diff --git a/ci/bin/common.ml b/ci/bin/common.ml
index 8bd63578266ea624b0dfc42e670cc1e5e4f475a2..c464e46f96e415d4fdb304ccc7bfb1b5098598f5 100644
--- a/ci/bin/common.ml
+++ b/ci/bin/common.ml
@@ -727,31 +727,28 @@ let job_docker_merge_manifests ~__POS__ ~ci_docker_hub ~job_docker_amd64
 
 type bin_package_target = Dpkg | Rpm
 
+let bin_package_image =
+  Image.register ~name:"generic" ~image_path:"$DISTRIBUTION"
+
 let job_build_bin_package ?dependencies ?rules ~__POS__ ~name
     ?(stage = Stages.build) ~arch ~target () : tezos_job =
   let arch_string = arch_to_string_alt arch in
   let target_string = match target with Dpkg -> "dpkg" | Rpm -> "rpm" in
-  let image =
-    match target with Dpkg -> Images.debian_bookworm | Rpm -> Images.fedora_39
-  in
+  let image = bin_package_image in
   let parallel =
     let distributions =
       match target with
-      | Dpkg -> ["debian:bookworm"; "ubuntu:focal"]
+      | Dpkg -> ["debian:bookworm"; "ubuntu:focal"; "ubuntu:jammy"]
       | Rpm -> ["fedora:39"; "rockylinux:9.3"]
     in
     Matrix [[("DISTRIBUTION", distributions)]]
   in
   let artifacts =
-    let artifact_path =
-      "$DISTRIBUTION"
-      // ("octez-*." ^ match target with Dpkg -> "deb" | Rpm -> "rpm")
-    in
     artifacts
       ~expire_in:(Duration (Days 1))
       ~when_:On_success
       ~name:"${TARGET}-$ARCH-$CI_COMMIT_REF_SLUG"
-      [artifact_path]
+      ["packages/"]
   in
   let before_script =
     before_script
@@ -759,6 +756,7 @@ let job_build_bin_package ?dependencies ?rules ~__POS__ ~name
       (match target with
       | Dpkg ->
           [
+            "export DEBIAN_FRONTEND=noninteractive";
             "apt update";
             "apt-get install -y rsync git m4 build-essential patch unzip wget \
              opam jq bc autoconf cmake libev-dev libffi-dev libgmp-dev \
@@ -796,8 +794,10 @@ let job_build_bin_package ?dependencies ?rules ~__POS__ ~name
       "make build-deps";
       "eval $(opam env)";
       "make $TARGET";
-      "mkdir $DISTRIBUTION";
-      "mv octez-*.* $DISTRIBUTION/";
+      "DISTRO=$(echo \"$DISTRIBUTION\" | cut -d':' -f1)";
+      "RELEASE=$(echo \"$DISTRIBUTION\" | cut -d':' -f2)";
+      "mkdir -p packages/$DISTRO/$RELEASE";
+      "mv octez-*.* packages/$DISTRO/$RELEASE/";
     ]
 
 let job_build_dpkg_amd64 : unit -> tezos_job =
diff --git a/scripts/ci/create_gitlab_package.sh b/scripts/ci/create_gitlab_package.sh
index 9558c8b3a411ee8ea54413f35835cf916b7739a2..5f5a1bfd026e0417e2e5f603a512b6849823ad9a 100755
--- a/scripts/ci/create_gitlab_package.sh
+++ b/scripts/ci/create_gitlab_package.sh
@@ -14,8 +14,12 @@ set -eu
 # https://docs.gitlab.com/ee/user/packages/generic_packages/index.html#download-package-file
 # :gitlab_api_url/projects/:id/packages/generic/:package_name/:package_version/:file_name
 gitlab_octez_package_url="${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/packages/generic/${gitlab_octez_binaries_package_name}/${gitlab_package_version}"
-gitlab_octez_debian_package_url="${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/packages/generic/${gitlab_octez_debian_package_name}/${gitlab_package_version}"
-gitlab_octez_ubuntu_package_url="${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/packages/generic/${gitlab_octez_ubuntu_package_name}/${gitlab_package_version}"
+
+gitlab_octez_debian_bookworm_package_url="${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/packages/generic/${gitlab_octez_debian_bookworm_package_name}/${gitlab_package_version}"
+
+gitlab_octez_ubuntu_focal_package_url="${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/packages/generic/${gitlab_octez_ubuntu_focal_package_name}/${gitlab_package_version}"
+gitlab_octez_ubuntu_jammy_package_url="${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/packages/generic/${gitlab_octez_ubuntu_jammy_package_name}/${gitlab_package_version}"
+
 gitlab_octez_fedora_package_url="${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/packages/generic/${gitlab_octez_fedora_package_name}/${gitlab_package_version}"
 gitlab_octez_rockylinux_package_url="${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/packages/generic/${gitlab_octez_rockylinux_package_name}/${gitlab_package_version}"
 gitlab_octez_source_package_url="${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/packages/generic/${gitlab_octez_source_package_name}/${gitlab_package_version}"
@@ -72,16 +76,22 @@ for architecture in ${architectures}; do
   cd ..
 done
 
-echo "Upload debian packages"
-for package in ${debian_packages}; do
+echo "Upload debian bookworm packages"
+for package in ${debian_bookworm_packages}; do
+  package_name="$(basename "${package}")"
+  gitlab_upload "./${package}" "${package_name}" "${gitlab_octez_debian_bookworm_package_url}"
+done
+
+echo "Upload Ubuntu focal packages"
+for package in ${ubuntu_focal_packages}; do
   package_name="$(basename "${package}")"
-  gitlab_upload "./${package}" "${package_name}" "${gitlab_octez_debian_package_url}"
+  gitlab_upload "./${package}" "${package_name}" "${gitlab_octez_ubuntu_focal_package_url}"
 done
 
-echo "Upload Ubuntu packages"
-for package in ${ubuntu_packages}; do
+echo "Upload Ubuntu jammy packages"
+for package in ${ubuntu_jammy_packages}; do
   package_name="$(basename "${package}")"
-  gitlab_upload "./${package}" "${package_name}" "${gitlab_octez_ubuntu_package_url}"
+  gitlab_upload "./${package}" "${package_name}" "${gitlab_octez_ubuntu_jammy_package_url}"
 done
 
 echo "Upload Fedora packages"
diff --git a/scripts/ci/create_gitlab_release.sh b/scripts/ci/create_gitlab_release.sh
index 99978fd6c948877cd1e66babbb2682672c8c464b..8deb3888c0ce7217894014bdf9af988c06688216 100755
--- a/scripts/ci/create_gitlab_release.sh
+++ b/scripts/ci/create_gitlab_release.sh
@@ -31,8 +31,9 @@ package_web_path() {
 
 gitlab_binaries_url=$(package_web_path "${gitlab_octez_binaries_package_name}")
 gitlab_octez_source_url=$(package_web_path "${gitlab_octez_source_package_name}")
-gitlab_debian_packages_url=$(package_web_path "${gitlab_octez_debian_package_name}")
-gitlab_ubuntu_packages_url=$(package_web_path "${gitlab_octez_ubuntu_package_name}")
+gitlab_debian_bookworm_packages_url=$(package_web_path "${gitlab_octez_debian_bookworm_package_name}")
+gitlab_ubuntu_focal_packages_url=$(package_web_path "${gitlab_octez_ubuntu_focal_package_name}")
+gitlab_ubuntu_jammy_packages_url=$(package_web_path "${gitlab_octez_ubuntu_jammy_package_name}")
 gitlab_fedora_packages_url=$(package_web_path "${gitlab_octez_fedora_package_name}")
 gitlab_rockylinux_packages_url=$(package_web_path "${gitlab_octez_rockylinux_package_name}")
 
@@ -74,7 +75,8 @@ release-cli create \
   --assets-link="{\"name\":\"Docker image\",\"url\":\"${docker_image_url}\",\"link_type\":\"image\"}" \
   --assets-link="{\"name\":\"Static binaries\",\"url\":\"${gitlab_binaries_url}\",\"link_type\":\"package\"}" \
   --assets-link="{\"name\":\"Octez source\",\"url\":\"${gitlab_octez_source_url}\",\"link_type\":\"other\"}" \
-  --assets-link="{\"name\":\"Debian packages\",\"url\":\"${gitlab_debian_packages_url}\",\"link_type\":\"package\"}" \
-  --assets-link="{\"name\":\"Ubuntu packages\",\"url\":\"${gitlab_ubuntu_packages_url}\",\"link_type\":\"package\"}" \
+  --assets-link="{\"name\":\"Debian Bookworm packages\",\"url\":\"${gitlab_debian_bookworm_packages_url}\",\"link_type\":\"package\"}" \
+  --assets-link="{\"name\":\"Ubuntu Focal packages\",\"url\":\"${gitlab_ubuntu_focal_packages_url}\",\"link_type\":\"package\"}" \
+  --assets-link="{\"name\":\"Ubuntu Jammy packages\",\"url\":\"${gitlab_ubuntu_jammy_packages_url}\",\"link_type\":\"package\"}" \
   --assets-link="{\"name\":\"Fedora packages\",\"url\":\"${gitlab_fedora_packages_url}\",\"link_type\":\"package\"}" \
   --assets-link="{\"name\":\"Rocky Linux packages\",\"url\":\"${gitlab_rockylinux_packages_url}\",\"link_type\":\"package\"}"
diff --git a/scripts/ci/octez-release.sh b/scripts/ci/octez-release.sh
index dad5f3412e0084bc17599c143c518d22664f0377..e9074b8f74e409bcfc0f87b39d8968c8f2a22e02 100755
--- a/scripts/ci/octez-release.sh
+++ b/scripts/ci/octez-release.sh
@@ -13,10 +13,11 @@ script_inputs_dir="$src_dir/script-inputs"
 binaries="$(cat "$script_inputs_dir/released-executables")"
 
 # these variables are used in the script scripts/ci/create_gitlab_package.sh
-debian_packages="$(find debian:bookworm/ -maxdepth 1 -name octez-\*.deb)"
-ubuntu_packages="$(find ubuntu:focal/ -maxdepth 1 -name octez-\*.deb)"
-fedora_packages="$(find fedora:39/ -maxdepth 1 -name octez-\*.rpm)"
-rockylinux_packages="$(find rockylinux:9.3/ -maxdepth 1 -name octez-\*.rpm)"
+debian_bookworm_packages="$(find packages/debian/bookworm/ -maxdepth 1 -name octez-\*.deb)"
+ubuntu_focal_packages="$(find packages/ubuntu/focal/ -maxdepth 1 -name octez-\*.deb)"
+ubuntu_jammy_packages="$(find packages/ubuntu/jammy/ -maxdepth 1 -name octez-\*.deb)"
+fedora_packages="$(find packages/fedora/39/ -maxdepth 1 -name octez-\*.rpm)"
+rockylinux_packages="$(find packages/rockylinux/9.3/ -maxdepth 1 -name octez-\*.rpm)"
 
 octez_source_content="$script_inputs_dir/octez-source-content"
 
@@ -56,8 +57,9 @@ fi
 ### Compute GitLab generic package names
 
 gitlab_octez_binaries_package_name="octez-binaries-${gitlab_release_no_v}"
-gitlab_octez_debian_package_name="octez-debian-${gitlab_release_no_v}"
-gitlab_octez_ubuntu_package_name="octez-ubuntu-${gitlab_release_no_v}"
+gitlab_octez_debian_bookworm_package_name="octez-debian-bookworm-${gitlab_release_no_v}"
+gitlab_octez_ubuntu_focal_package_name="octez-ubuntu-focal-${gitlab_release_no_v}"
+gitlab_octez_ubuntu_jammy_package_name="octez-ubuntu-jammy-${gitlab_release_no_v}"
 gitlab_octez_fedora_package_name="octez-fedora-${gitlab_release_no_v}"
 gitlab_octez_rockylinux_package_name="octez-rockylinux-${gitlab_release_no_v}"
 gitlab_octez_source_package_name="octez-source-${gitlab_release_no_v}"