diff --git a/build/SharedFxInstaller.targets b/build/SharedFxInstaller.targets
index f3d9365d28..aec052351d 100644
--- a/build/SharedFxInstaller.targets
+++ b/build/SharedFxInstaller.targets
@@ -111,29 +111,7 @@
     <!-- Retry added due to fpm/docker race where .w/package_root directory cannot be resolved -->
     <Run
       FileName="docker"
-      Command="
-      run
-      --rm
-      -v $(RepositoryRoot):$(_DockerRootDir)
-      docker-image-$(Image)
-      fpm
-        --verbose
-        -s dir
-        -t rpm
-        -n $(RpmName)-$(RpmIdVersion)
-        -p $(_DockerRootDir)artifacts/installers/$(RpmName)-$(RpmFileVersion)-$(RpmFileSuffix)
-        -v $(RpmPackageVersion)
-        --iteration $(RpmRevision)
-        -a amd64
-        $(RpmArguments)
-        --rpm-changelog $(_DockerRootDir).w/templates/changelog
-        --rpm-summary &quot;$(RpmMSummary)&quot;
-        --description &quot;$(RpmDescription)&quot;
-        --maintainer &quot;$(RpmMaintainerName) &lt;$(RpmMaintainerEmail)&gt;&quot;
-        --vendor &quot;$(RpmVendor)&quot;
-        --license &quot;$(RpmLicense)&quot;
-        --url &quot;$(RpmHomepage)&quot;
-        $(_DockerRootDir).w/package_root/=&quot;$(RpmInstallRoot)/&quot;"
+      Command="run --rm -v $(RepositoryRoot):$(_DockerRootDir) docker-image-$(Image) fpm --verbose -s dir -t rpm -n $(RpmName)-$(RpmIdVersion) -p $(_DockerRootDir)artifacts/installers/$(RpmName)-$(RpmFileVersion)-$(RpmFileSuffix) -v $(RpmPackageVersion) --iteration $(RpmRevision) -a amd64 $(RpmArguments) --rpm-changelog $(_DockerRootDir).w/templates/changelog --rpm-summary &quot;$(RpmMSummary)&quot; --description &quot;$(RpmDescription)&quot; --maintainer &quot;$(RpmMaintainerName) &lt;$(RpmMaintainerEmail)&gt;&quot; --vendor &quot;$(RpmVendor)&quot; --license &quot;$(RpmLicense)&quot; --url &quot;$(RpmHomepage)&quot; $(_DockerRootDir).w/package_root/=&quot;$(RpmInstallRoot)/&quot;"
       MaxRetries="5"/>
   </Target>
 
@@ -221,14 +199,7 @@
 
     <!-- Build SharedFx Bundle Deb package -->
 
-    <Exec Command="docker run
-      --rm
-      -v $(RepositoryRoot):$(_DockerRootDir)
-      -e DOTNET_SKIP_FIRST_TIME_EXPERIENCE=true
-      -e INSTALLER_NAME=$(DebPrefix)-$(DebIdVersion)
-      -e INSTALLER_VERSION=$(DebPackageVersion)
-      docker-image-$(Image)
-      ./build.sh /t:RunDebTool"
+    <Exec Command="docker run --rm -v $(RepositoryRoot):$(_DockerRootDir) -e DOTNET_SKIP_FIRST_TIME_EXPERIENCE=true -e INSTALLER_NAME=$(DebPrefix)-$(DebIdVersion) -e INSTALLER_VERSION=$(DebPackageVersion) docker-image-$(Image) ./build.sh /t:RunDebTool"
       ContinueOnError="WarnAndContinue" />
 
     <!-- Copy SharedFx packages to output -->