diff --git a/common-npm-packages/docker-common/pipelineutils.ts b/common-npm-packages/docker-common/pipelineutils.ts
index c9e8132b..958d114c 100644
--- a/common-npm-packages/docker-common/pipelineutils.ts
+++ b/common-npm-packages/docker-common/pipelineutils.ts
@@ -27,16 +27,16 @@ function addLabelWithValue(labelName: string, labelValue: string, labels: string
 }
 
 function addCommonLabels(hostName: string, labels: string[], addPipelineData?: boolean): void {
-    addLabel(hostName, "system.teamfoundationcollectionuri", "SYSTEM_TEAMFOUNDATIONCOLLECTIONURI", labels);
     if (addPipelineData) {
+        addLabel(hostName, "system.teamfoundationcollectionuri", "SYSTEM_TEAMFOUNDATIONCOLLECTIONURI", labels);
         addLabel(hostName, "system.teamproject", "SYSTEM_TEAMPROJECT", labels);
         addLabel(hostName, "build.repository.name", "BUILD_REPOSITORY_NAME", labels);
     }
 }
 
 function addBuildLabels(hostName: string, labels: string[], addPipelineData?: boolean): void {
-    addLabel(hostName, "build.sourceversion", "BUILD_SOURCEVERSION", labels);
     if (addPipelineData) {
+        addLabel(hostName, "build.sourceversion", "BUILD_SOURCEVERSION", labels);
         addLabel(hostName, "build.repository.uri", "BUILD_REPOSITORY_URI", labels);
         addLabel(hostName, "build.sourcebranchname", "BUILD_SOURCEBRANCHNAME", labels);
         addLabel(hostName, "build.definitionname", "BUILD_DEFINITIONNAME", labels);
@@ -46,8 +46,8 @@ function addBuildLabels(hostName: string, labels: string[], addPipelineData?: bo
 }
 
 function addReleaseLabels(hostName: string, labels: string[], addPipelineData?: boolean): void {
-    addLabel(hostName, "release.releaseid", "RELEASE_RELEASEID", labels);
     if (addPipelineData) {
+        addLabel(hostName, "release.releaseid", "RELEASE_RELEASEID", labels);
         addLabel(hostName, "release.definitionname", "RELEASE_DEFINITIONNAME", labels);
         addLabel(hostName, "release.releaseweburl", "RELEASE_RELEASEWEBURL", labels);
     }
@@ -115,4 +115,4 @@ export function getDefaultLabels(addPipelineData?: boolean, addBaseImageData?: b
         }
     }
     return labels;
-}
\ No newline at end of file
+}