diff --git a/.azure-pipelines-templates/common.yml b/.azure-pipelines-templates/common.yml
index 62a5bfc2302a..36c24757a720 100644
--- a/.azure-pipelines-templates/common.yml
+++ b/.azure-pipelines-templates/common.yml
@@ -31,4 +31,5 @@ jobs:
     - ${{ if and(ne(parameters.consensus, 'BFT'), or(eq(parameters.suffix, 'Release'), eq(parameters.suffix, 'Perf'))) }}:
       - template: install.yml
         parameters:
-          install_prefix: ${{ parameters.install_prefix }}
\ No newline at end of file
+          install_prefix: ${{ parameters.install_prefix }}
+          suffix: ${{ parameters.suffix }}
\ No newline at end of file
diff --git a/.azure-pipelines-templates/install.yml b/.azure-pipelines-templates/install.yml
index 082ce395580f..4c3d172d00fa 100644
--- a/.azure-pipelines-templates/install.yml
+++ b/.azure-pipelines-templates/install.yml
@@ -19,17 +19,18 @@ steps:
       -v
   displayName: Test installed CCF
 
-- task: ArchiveFiles@2
-  inputs:
-    rootFolderOrFile: ${{ parameters.install_prefix }}
-    archiveType: 'tar'
-    tarCompression: 'gz'
-    archiveFile: '$(Build.ArtifactStagingDirectory)/ccf${{ parameters.install_suffix }}.tar.gz'
-    verbose: true
-  displayName: 'Create Install Tarball'
+- ${{ if eq(parameters.suffix, 'Release') }}:
+  - task: ArchiveFiles@2
+    inputs:
+      rootFolderOrFile: ${{ parameters.install_prefix }}
+      archiveType: 'tar'
+      tarCompression: 'gz'
+      archiveFile: '$(Build.ArtifactStagingDirectory)/ccf.tar.gz'
+      verbose: true
+    displayName: 'Create Install Tarball'
 
-- task: PublishPipelineArtifact@1
-  inputs:
-    path: $(Build.ArtifactStagingDirectory)/ccf${{ parameters.install_suffix }}.tar.gz
-    artifact: ccf${{ parameters.install_suffix }}.tar.gz
-    displayName: 'Publish CCF Install'
\ No newline at end of file
+  - task: PublishPipelineArtifact@1
+    inputs:
+      path: $(Build.ArtifactStagingDirectory)/ccf.tar.gz
+      artifact: ccf.tar.gz
+      displayName: 'Publish CCF Install'
\ No newline at end of file
diff --git a/.azure-pipelines-templates/release.yml b/.azure-pipelines-templates/release.yml
index 100f917e3550..e1e4300c1926 100644
--- a/.azure-pipelines-templates/release.yml
+++ b/.azure-pipelines-templates/release.yml
@@ -20,7 +20,7 @@ jobs:
         action: 'create'
         target: '$(Build.SourceVersion)'
         tagSource: 'auto'
-        assets: $(Build.ArtifactStagingDirectory)/**/ccf*.tar.gz
+        assets: $(Build.ArtifactStagingDirectory)/**/ccf.tar.gz
         assetUploadMode: 'delete'
         isDraft: true
         isPreRelease: true