diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index cc8d46803142e1364f718dcb84cf7eb6e9d78724..4d08bfada64d2928a80df082d59b01fc6326a0da 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -49,13 +49,13 @@ prepare-release:
     - if: $CI_PIPELINE_SOURCE == "trigger"
   variables:
     ARCHIVE_NAME: '$PROJECT.$TAG.tbz'
-    PACKAGE_URI: '$PROJECT_URI/$PROJECT/$TAG/$ARCHIVE_NAME'
+    PACKAGE_URI: '$PROJECT_URI/packages/generic/$PROJECT/$TAG/$ARCHIVE_NAME'
   script:
     - apt-get update
     - apt-get install -y curl
     - sed -n -f changelog.sed CHANGES.md > description.txt
     - |
-      curl --header "PRIVATE-TOKEN: $CI_JOB_TOKEN" --upload-file bundle.tbz "$PACKAGE_URI"
+      curl --fail --header "JOB-TOKEN: ${CI_JOB_TOKEN}" --upload-file bundle.tbz "$PACKAGE_URI"
   artifacts:
     paths:
       - description.txt
@@ -69,7 +69,7 @@ release:
     - if: $CI_PIPELINE_SOURCE == "trigger"
   variables:
     ARCHIVE_NAME: '$PROJECT.$TAG.tbz'
-    PACKAGE_URI: '$PROJECT_URI/$PROJECT/$TAG/$ARCHIVE_NAME'
+    PACKAGE_URI: '$PROJECT_URI/packages/generic/$PROJECT/$TAG/$ARCHIVE_NAME'
   script:
     - echo "Release job for tag $TAG"
   release: