diff --git a/.vsts-ci.yml b/.vsts-ci.yml
index 12fa45708..565d59b50 100644
--- a/.vsts-ci.yml
+++ b/.vsts-ci.yml
@@ -182,7 +182,7 @@ jobs:
             _DropSuffix: ''
           Build_Rhel_6_Release_x64:
             _BuildConfig: Release
-            _DockerParameter: '--docker rhel.6 -e BUILD_REPOSITORY_URI -e BUILD_SOURCEBRANCH -e BUILD_BUILDNUMBER -e BUILD_SOURCEVERSION'
+            _DockerParameter: '--docker rhel.6'
             _LinuxPortable: ''
             _RuntimeIdentifier: '--runtime-id rhel.6-x64'
             _BuildArchitecture: 'x64'
@@ -190,14 +190,14 @@ jobs:
             _AdditionalBuildParameters: '/p:DisableSourceLink=true'
           Build_Linux_musl_Release_x64:
             _BuildConfig: Release
-            _DockerParameter: '--docker alpine.3.6 -e BUILD_REPOSITORY_URI -e BUILD_SOURCEBRANCH -e BUILD_BUILDNUMBER -e BUILD_SOURCEVERSION'
+            _DockerParameter: '--docker alpine.3.6'
             _LinuxPortable: ''
             _RuntimeIdentifier: '--runtime-id linux-musl-x64'
             _BuildArchitecture: 'x64'
             _DropSuffix: ''
           Build_Linux_Portable_Deb_Release_x64:
             _BuildConfig: Release
-            _DockerParameter: '--docker ubuntu.16.04 -e BUILD_REPOSITORY_URI -e BUILD_SOURCEBRANCH -e BUILD_BUILDNUMBER -e BUILD_SOURCEVERSION'
+            _DockerParameter: '--docker ubuntu.16.04'
             _LinuxPortable: '--linux-portable'
             _RuntimeIdentifier: ''
             _BuildArchitecture: 'x64'
@@ -207,7 +207,7 @@ jobs:
             _AdditionalBuildParameters: '/p:PublishBinariesAndBadge=false'
           Build_Linux_Portable_Rpm_Release_x64:
             _BuildConfig: Release
-            _DockerParameter: '--docker rhel -e BUILD_REPOSITORY_URI -e BUILD_SOURCEBRANCH -e BUILD_BUILDNUMBER -e BUILD_SOURCEVERSION'
+            _DockerParameter: '--docker rhel'
             _LinuxPortable: '--linux-portable'
             _RuntimeIdentifier: ''
             _BuildArchitecture: 'x64'
diff --git a/eng/dockerrun.sh b/eng/dockerrun.sh
index e73d440e0..6424389e7 100755
--- a/eng/dockerrun.sh
+++ b/eng/dockerrun.sh
@@ -140,6 +140,13 @@ docker run $INTERACTIVE -t --rm --sig-proxy=true \
     -e PB_ASSETROOTURL \
     -e PB_PACKAGEVERSIONPROPSURL \
     -e PB_PUBLISHBLOBFEEDURL \
+    -e _PUBLISHBLOBFEEDURL
+    -e _ASSETROOTURL \
+    -e _PACKAGEVERSIONPROPSURL \
     -e EXTERNALRESTORESOURCES \
+    -e BUILD_REPOSITORY_URI \
+    -e BUILD_SOURCEBRANCH \
+    -e BUILD_BUILDNUMBER \
+    -e BUILD_SOURCEVERSION
     $DOTNET_BUILD_CONTAINER_TAG \
     $BUILD_COMMAND "$@"