diff --git a/.taskcluster.yml b/.taskcluster.yml
index 0a65ed890..56930d85a 100644
--- a/.taskcluster.yml
+++ b/.taskcluster.yml
@@ -56,7 +56,7 @@ tasks:
           owner: cdenizet@mozilla.com
           source: ${repository}/raw/${head_rev}/.taskcluster.yml
 
-      - taskId: {$eval: as_slugid("grcov_test_task")}
+      - taskId: {$eval: as_slugid("ccov_test_task")}
         created: {$fromNow: ''}
         deadline: {$fromNow: '1 hour'}
         provisionerId: proj-relman
@@ -220,11 +220,11 @@ tasks:
                             --artifacts=$WINDOWS_BIN:public/$WINDOWS_BIN &&
                    apk add --no-cache zip &&
                    strip $WINDOWS_BIN &&
-                   zip -9 rust-code-analysis-windows-x86_64.zip $WINDOWS_BIN"
+                   zip -9 rust-code-analysis-win-x86_64.zip $WINDOWS_BIN"
             artifacts:
-              public/rust-code-analysis-windows-x86_64.zip:
+              public/rust-code-analysis-win-x86_64.zip:
                 expires: {$fromNow: '2 weeks'}
-                path: /rust-code-analysis-windows-x86_64.zip
+                path: /rust-code-analysis-win-x86_64.zip
                 type: file
           metadata:
             name: strip rust-code-analysis windows binary
@@ -236,6 +236,8 @@ tasks:
         then:
           $let:
             version: {$eval: 'head_branch[10:]'}
+            linux_artifact: rust-code-analysis-linux-x86_64.tar.gz
+            windows_artifact: rust-code-analysis-win-x86_64.zip
           in:
             taskId: {$eval: as_slugid("deploy_release")}
             dependencies:
@@ -253,16 +255,14 @@ tasks:
               maxRunTime: 3600
               image: "mozilla/taskboot:0.2.5"
               env:
-                LINUX_ARTIFACT: rust-code-analysis-linux-x86_64.tar.gz
-                WINDOWS_ARTIFACT: rust-code-analysis-windows-x86_64.zip
                 TASKCLUSTER_SECRET: project/relman/rust-code-analysis/deploy
               command:
                 - taskboot
                 - github-release
                 - mozilla/rust-code-analysis
                 - "${version}"
-                - "--asset=$LINUX_ARTIFACT:public/$LINUX_ARTIFACT"
-                - "--asset=$WINDOWS_ARTIFACT:public/$WINDOWS_ARTIFACT"
+                - "--asset=${linux_artifact}:public/${linux_artifact}"
+                - "--asset=${windows_artifact}:public/${windows_artifact}"
             metadata:
               name: "rust-code-analysis release publication ${version}"
               description: rust-code-analysis release publication on Github