diff --git a/eng/common/scripts/copy-docs-to-blobstorage.ps1 b/eng/common/scripts/copy-docs-to-blobstorage.ps1
index 4d7effb10110b..debbc010ba5dc 100644
--- a/eng/common/scripts/copy-docs-to-blobstorage.ps1
+++ b/eng/common/scripts/copy-docs-to-blobstorage.ps1
@@ -278,7 +278,10 @@ if ($Language -eq "dotnet")
     Write-Host "DocDir $($BinDirectory)/docstoupload"
     Write-Host "PkgName $($pkgName)"
     Write-Host "DocVersion $($version)"
-    Upload-Blobs -DocDir "$($BinDirectory)/docstoupload" -PkgName $pkgName -DocVersion $version
+    New-Item -ItemType directory -Path "$BinDirectory/publicartifactscopy"
+    Copy-Item -Path "$PublicArtifactLocation/*.nupkg" -Destination "$BinDirectory/publicartifactscopy" -Exclude '*.symbols.nupkg'
+    $releaseTag = RetrieveReleaseTag "Nuget" "$BinDirectory/publicartifactscopy" 
+    Upload-Blobs -DocDir "$($BinDirectory)/docstoupload" -PkgName $pkgName -DocVersion $version -ReleaseTag $releaseTag
 }
 
 if ($Language -eq "python")
diff --git a/eng/pipelines/templates/stages/archetype-net-release.yml b/eng/pipelines/templates/stages/archetype-net-release.yml
index 0c5a3b9063a20..e3fc6fce8e8b2 100644
--- a/eng/pipelines/templates/stages/archetype-net-release.yml
+++ b/eng/pipelines/templates/stages/archetype-net-release.yml
@@ -115,7 +115,11 @@ stages:
                         displayName: 'Upload Symbols for ${{artifact.name}}'
                         inputs:
                           solution: '$(AzureSDKBuildToolsPath)/tools/symboltool/SymbolUploader.proj'
-                          msbuildArguments: '/p:PackagesPath=$(Pipeline.Workspace)/${{parameters.ArtifactName}}-signed/${{artifact.name}} /p:MSPublicSymbolsPAT=$(azuresdk-microsoftpublicsymbols-devops-pat) /p:MSSymbolsPAT=$(azuresdk-microsoft-devops-pat) /p:AzureSDKSymbolsPAT=$(azuresdk-azure-sdk-devops-pat)'
+                          msbuildArguments: >-
+                            /p:PackagesPath=$(Pipeline.Workspace)/${{parameters.ArtifactName}}-signed/${{artifact.name}}
+                            /p:MSPublicSymbolsPAT=$(azuresdk-microsoftpublicsymbols-devops-pat)
+                            /p:MSSymbolsPAT=$(azuresdk-microsoft-devops-pat)
+                            /p:AzureSDKSymbolsPAT=$(azuresdk-azure-sdk-devops-pat)
 
           - ${{if ne(artifact.options.skipPublishDocs, 'true')}}:
             - deployment: PublicDocsMS
@@ -177,7 +181,7 @@ stages:
                           BlobSASKey: '$(azure-sdk-docs-prod-sas)'
                           BlobName: '$(azure-sdk-docs-prod-blob-name)'
                           TargetLanguage: 'dotnet'
-                          ArtifactLocation: '$(Pipeline.Workspace)/${{artifact.safeName}}/packages'
+                          ArtifactLocation: '$(Pipeline.Workspace)/${{parameters.ArtifactName}}/${{artifact.name}}'
                           # we override the regular script path because we have cloned the build tools repo as a separate artifact.
                           ScriptPath: 'eng/common/scripts/copy-docs-to-blobstorage.ps1'
 
diff --git a/eng/pipelines/templates/steps/archetype-sdk-docs.yml b/eng/pipelines/templates/steps/archetype-sdk-docs.yml
index c344d15143bb8..a79e0a165e024 100644
--- a/eng/pipelines/templates/steps/archetype-sdk-docs.yml
+++ b/eng/pipelines/templates/steps/archetype-sdk-docs.yml
@@ -15,9 +15,18 @@ steps:
     displayName: Download and Extract Required Software
 
   - ${{ each artifact in parameters.Artifacts }}:
-    - pwsh: |
-        $(Build.SourcesDirectory)/doc/ApiDocGeneration/Generate-Api-Docs.ps1 -ArtifactName '${{artifact.name}}' -ServiceDirectory '${{parameters.ServiceDirectory}}' `
-        -ArtifactsDirectoryName '${{artifact.directoryName}}' `
-        -LibType '${{parameters.LibType}}' -RepoRoot $(Build.SourcesDirectory) -BinDirectory $(Build.BinariesDirectory) -DocGenDir ${{parameters.DocGenerationDir}} `
-        -ArtifactStagingDirectory '$(Build.ArtifactStagingDirectory)' -verbose
-      displayName: Build DocFx Documenttion Site for ${{artifact.name}}
\ No newline at end of file
+    - task: PowerShell@2
+      displayName: Build DocFx Documenttion Site for ${{artifact.name}}
+      inputs:
+        pwsh: true
+        filePath: $(Build.SourcesDirectory)/doc/ApiDocGeneration/Generate-Api-Docs.ps1
+        arguments: >
+          -ArtifactName '${{artifact.name}}'
+          -ServiceDirectory '${{parameters.ServiceDirectory}}'
+          -ArtifactsDirectoryName '${{artifact.directoryName}}'
+          -LibType '${{parameters.LibType}}'
+          -RepoRoot $(Build.SourcesDirectory)
+          -BinDirectory $(Build.BinariesDirectory)
+          -DocGenDir ${{parameters.DocGenerationDir}}
+          -ArtifactStagingDirectory '$(Build.ArtifactStagingDirectory)'
+          -verbose
\ No newline at end of file
diff --git a/sdk/template/Azure.Template/CHANGELOG.md b/sdk/template/Azure.Template/CHANGELOG.md
index 40dab83843f84..856555ed8711a 100644
--- a/sdk/template/Azure.Template/CHANGELOG.md
+++ b/sdk/template/Azure.Template/CHANGELOG.md
@@ -1,4 +1,7 @@
 # Release History
+## 1.0.3-beta.12 (2020-09-11)
+- Package Artifacts directory restructure, attempt 2
+
 ## 1.0.3-beta.11 (2020-09-10)
 - Package Artifacts directory restructure
 
diff --git a/sdk/template/Azure.Template/src/Azure.Template.csproj b/sdk/template/Azure.Template/src/Azure.Template.csproj
index df6face2b7639..c2b7b09dc747e 100644
--- a/sdk/template/Azure.Template/src/Azure.Template.csproj
+++ b/sdk/template/Azure.Template/src/Azure.Template.csproj
@@ -2,7 +2,7 @@
   <PropertyGroup>
     <Description>This is a template project to demonstrate how to create a package that uses code generation as well as use for testing our build and release pipelines</Description>
     <AssemblyTitle>Azure SDK Template</AssemblyTitle>
-    <Version>1.0.3-beta.11</Version>
+    <Version>1.0.3-beta.12</Version>
     <PackageTags>Azure Template</PackageTags>
     <TargetFrameworks>$(RequiredTargetFrameworks)</TargetFrameworks>
   </PropertyGroup>