diff --git a/build-pipeline-yocto.yml.jinja2 b/build-pipeline-yocto.yml.jinja2
index 92ae00c0ded8d34224f8cce79e69f6bcaf10ed88..618196001f54a20321ef3a8f31bc84da303a6117 100644
--- a/build-pipeline-yocto.yml.jinja2
+++ b/build-pipeline-yocto.yml.jinja2
@@ -153,14 +153,14 @@ deploy-{{ machine }}:
   stage: Deploy SoftwareStore
   variables:
     MACHINE: {{ machine }}
-    DEPLOY_SOURCE: release/$${RELEASE_NAME}
+    DEPLOY_SOURCE: $${RELEASE_NAME}
     DEPLOY_TARGET: ${DEPLOY_RELEASE_TARGET}
     DEPLOY_TARGET_LINK: ${DEPLOY_RELEASE_TARGET_LINK}
 {% else %}
   stage: Deploy SoftwareStore Internal
   variables:
     MACHINE: {{ machine }}
-    DEPLOY_SOURCE: release/$${RELEASE_NAME}
+    DEPLOY_SOURCE: $${RELEASE_NAME}
     DEPLOY_TARGET: ${DEPLOY_INTERNAL_RELEASE_TARGET}
     DEPLOY_TARGET_LINK: ${DEPLOY_INTERNAL_RELEASE_TARGET_LINK}
 {% endif %}
@@ -206,7 +206,7 @@ ftp-{{ machine }}:
     - ftp
   variables:
     MACHINE: {{ machine }}
-    DEPLOY_SOURCE: release/$${RELEASE_NAME}
+    DEPLOY_SOURCE: $${RELEASE_NAME}
     DEPLOY_TARGET: ${DEPLOY_FTP_TARGET}
     DEPLOY_TARGET_LINK: ${DEPLOY_FTP_TARGET_LINK}
     ASSOCIATED_PACKAGE_JOB: package-{{ machine }}
@@ -235,14 +235,15 @@ azure-{{ machine }}:
       allow_failure: true
   variables:
     MACHINE: {{ machine }}
-    DEPLOY_SOURCE: release
-    DEPLOY_TARGET: ${AZURE_TARGET_FOLDER}
+    DEPLOY_SOURCE: $${RELEASE_NAME}
+    DEPLOY_TARGET: ${AZURE_TARGET_FOLDER}/$${RELEASE_NAME}
     CONTAINER_NAME: ${AZURE_CONTAINER_NAME}
     ASSOCIATED_PACKAGE_JOB: package-{{ machine }}
   needs:
     - job: package-{{ machine }}
       artifacts: false
     - job: changelog
+    - job: build-version
 
 {% endif %}
 
diff --git a/build-pipeline.yml b/build-pipeline.yml
index 534949709b3a8667d47bd96e29cd62fdd147aa30..d42f1e5833dae54139f120b7381ac41b7e287b18 100644
--- a/build-pipeline.yml
+++ b/build-pipeline.yml
@@ -330,7 +330,7 @@ workflow:
     - if: $PACKAGE_TYPE == "sdk"
   artifacts:
     paths:
-      - release/**/**/*
+      - ${RELEASE_NAME}/**/*
   timeout: 90m
   before_script:
     # We do this manually since we do not use GitLab's default artifact downloader
@@ -343,13 +343,13 @@ workflow:
         --images-dir="${IMAGE_PATH}"
         --licenses-dir="${LICENSES_PATH}"
         --doc-dir=.
-        --output-dir=release/${RELEASE_NAME}
+        --output-dir=${RELEASE_NAME}
         --release-version=${RELEASE_VERSION}
         --machine=${MACHINE}
     - elif [[ "${PACKAGE_TYPE}" == "sdk" ]]; then
     - .gitlab-ci/scripts/package_release.py
         --sdk-dir="${SDK_PATH}"
-        --output-dir=release/${RELEASE_NAME}
+        --output-dir=${RELEASE_NAME}
         --release-version=${RELEASE_VERSION}
         --machine=${MACHINE}
     - fi
@@ -360,7 +360,7 @@ workflow:
     - key: ${CI_PIPELINE_ID}-${CI_JOB_NAME}
       policy: push
       paths:
-        - release
+        - ${RELEASE_NAME}
 
 # --------------------------------------------------------------------------------------
 # Stage: deploy