diff --git a/buildlib/az-distro-release.yml b/buildlib/az-distro-release.yml
index 749ea7dd717..4743ee2e708 100644
--- a/buildlib/az-distro-release.yml
+++ b/buildlib/az-distro-release.yml
@@ -3,9 +3,11 @@ jobs:
     displayName: distro
     variables:
       ${{ if eq(variables['Build.Reason'], 'ResourceTrigger') }}:
+        POSTFIX: ucx-${{ replace(variables['Build.SourceBranch'], 'refs/heads/', '') }}
+      ${{ if eq(variables['Build.Reason'], 'IndividualCI') }}:
         POSTFIX: ucx-${{ replace(variables['Build.SourceBranch'], 'refs/tags/', '') }}
       ${{ if eq(variables['Build.Reason'], 'PullRequest') }}:
-        POSTFIX: ucx-test
+        POSTFIX: ucx-pr$(System.PullRequest.PullRequestNumber)
 
     pool:
       name: MLNX
@@ -67,7 +69,7 @@ jobs:
         # ^ Avoid rpmbuild error: Dest dir longer than base dir is not supported
 
       - bash: |
-          set -eE
+          set -eEx
           ./autogen.sh
           mkdir pkg-build
           cd pkg-build
@@ -75,9 +77,9 @@ jobs:
         displayName: Configure
 
       - bash: |
-          set -eE
+          set -eEx
           cd pkg-build
-          ../contrib/buildrpm.sh -s -t -b
+          ../contrib/buildrpm.sh -s -t -b --noclean
           cd rpm-dist/`uname -m`
           tar -cjf "../../../${AZ_ARTIFACT_NAME}" *.rpm
           cd ../../..
@@ -88,7 +90,7 @@ jobs:
           AZ_ARTIFACT_NAME: $(artifact_name)
 
       - bash: |
-          set -eE
+          set -eEx
           cd pkg-build
           dpkg-buildpackage -us -uc
           find .. -name '*.deb'
diff --git a/buildlib/azure-pipelines-release.yml b/buildlib/azure-pipelines-release.yml
index d14c9cbe94c..a955196609d 100644
--- a/buildlib/azure-pipelines-release.yml
+++ b/buildlib/azure-pipelines-release.yml
@@ -103,7 +103,9 @@ stages:
 
   - stage: Build
     displayName: Build binary packages
-    dependsOn: Prepare
+    dependsOn:
+      - Prepare
+      - GitHubDraft
     condition: eq(dependencies.Prepare.outputs['CheckRelease.Result.Launch'], 'True')
     jobs:
       - template: az-distro-release.yml
diff --git a/contrib/buildrpm.sh b/contrib/buildrpm.sh
index 6f45f63af7f..82cacd8483e 100755
--- a/contrib/buildrpm.sh
+++ b/contrib/buildrpm.sh
@@ -24,6 +24,7 @@ while test "$1" != ""; do
         --binrpm|-b)  opt_binrpm=1 ;;
         --no-dist)    opt_no_dist=1 ;;
         --nodeps)     opt_no_deps=1 ;;
+        --noclean)    rpmopts="$rpmopts --noclean" ;;
         --define|-d)  defines="$defines --define '$2'"; shift ;;
         --strict-ibverbs-dep) opt_strict_ibverb_dep=1 ;;
         *)