diff --git a/build/Publish.targets b/build/Publish.targets
index 4ac2bb7eb2..8a84d9deec 100644
--- a/build/Publish.targets
+++ b/build/Publish.targets
@@ -6,7 +6,7 @@
     <!-- This file is used by the dotnet/cli to determine if our shared framework aligns with the version they pull. -->
     <BaseRuntimeVersionFileName>aspnetcore_base_runtime.version</BaseRuntimeVersionFileName>
     <BaseRuntimeVersionFile>$(IntermediateDir)$(BaseRuntimeVersionFileName)</BaseRuntimeVersionFile>
-    <LatestRuntimeVersionFileName>latest.aspnetcore.version</LatestRuntimeVersionFileName>
+    <LatestRuntimeVersionFileName>latest.version</LatestRuntimeVersionFileName>
     <LatestRuntimeVersionFile>$(IntermediateDir)$(LatestRuntimeVersionFileName)</LatestRuntimeVersionFile>
 
     <PublishDependsOn>
diff --git a/build/artifacts.props b/build/artifacts.props
index 2a3b4201c6..8884c08821 100644
--- a/build/artifacts.props
+++ b/build/artifacts.props
@@ -170,7 +170,6 @@
 
     <PackageArtifact Include="Microsoft.AspNetCore.SpaServices" Category="ship" AppMetapackage="true" AllMetapackage="true"/>
     <PackageArtifact Include="Microsoft.AspNetCore.SpaServices.Extensions" Category="ship" AppMetapackage="true" AllMetapackage="true"/>
-    <PackageArtifact Include="Microsoft.AspNetCore.SpaTemplates" Category="ship" />
     <PackageArtifact Include="Microsoft.AspNetCore.StaticFiles" Category="ship" AppMetapackage="true" AllMetapackage="true"/>
     <PackageArtifact Include="Microsoft.AspNetCore.TestHost" Category="ship" />
     <PackageArtifact Include="Microsoft.AspNetCore.Testing" Category="noship" />
diff --git a/build/dependencies.props b/build/dependencies.props
index 6aa516ec04..d32645a7ff 100644
--- a/build/dependencies.props
+++ b/build/dependencies.props
@@ -144,7 +144,7 @@
     <MicrosoftNETCoreApp11PackageVersion>1.1.2</MicrosoftNETCoreApp11PackageVersion>
     <MicrosoftNETCoreApp20PackageVersion>2.0.0</MicrosoftNETCoreApp20PackageVersion>
     <MicrosoftNETCoreWindowsApiSetsPackageVersion>1.0.1</MicrosoftNETCoreWindowsApiSetsPackageVersion>
-    <MicrosoftNETTestSdkPackageVersion>15.6.0</MicrosoftNETTestSdkPackageVersion>
+    <MicrosoftNETTestSdkPackageVersion>15.6.1</MicrosoftNETTestSdkPackageVersion>
     <MicrosoftOwinPackageVersion>3.0.1</MicrosoftOwinPackageVersion>
     <MicrosoftOwinSecurityCookiesPackageVersion>3.0.1</MicrosoftOwinSecurityCookiesPackageVersion>
     <MicrosoftOwinSecurityPackageVersion>3.0.1</MicrosoftOwinSecurityPackageVersion>
diff --git a/build/docker/alpine.Dockerfile b/build/docker/alpine.Dockerfile
index bd4f99478a..1f80997905 100644
--- a/build/docker/alpine.Dockerfile
+++ b/build/docker/alpine.Dockerfile
@@ -1,5 +1,11 @@
 FROM microsoft/dotnet:2.1-runtime-deps-alpine
+ARG USER
+ARG USER_ID
+ARG GROUP_ID
+
 WORKDIR /code/build
+RUN mkdir -p "/home/$USER" && chown "${USER_ID}:${GROUP_ID}" "/home/$USER"
+ENV HOME "/home/$USER"
 
 RUN apk add --no-cache \
         bash \
@@ -10,6 +16,8 @@ RUN apk add --no-cache \
         icu-libs \
         openssl
 
+USER $USER_ID:$GROUP_ID
+
 # Disable the invariant mode (set in base image)
 ENV DOTNET_SYSTEM_GLOBALIZATION_INVARIANT false
 ENV LC_ALL en_US.UTF-8
@@ -26,6 +34,5 @@ COPY global.json /tmp/global.json
 RUN DOTNET_SDK_VERSION="$(jq -r '.sdk.version' /tmp/global.json)" \
     && echo "Installing SDK ${DOTNET_SDK_VERSION}" \
     && wget -q --tries 10 -O /tmp/dotnet.tar.gz https://dotnetcli.blob.core.windows.net/dotnet/Sdk/$DOTNET_SDK_VERSION/dotnet-sdk-$DOTNET_SDK_VERSION-alpine.3.6-x64.tar.gz \
-    && mkdir -p /usr/share/dotnet \
-    && tar xzf /tmp/dotnet.tar.gz -C /usr/share/dotnet \
-    && ln -s /usr/share/dotnet/dotnet /usr/bin/dotnet
+    && mkdir -p "$HOME/.dotnet" \
+    && tar xzf /tmp/dotnet.tar.gz -C "$HOME/.dotnet"
diff --git a/dockerbuild.sh b/dockerbuild.sh
index da7c76ea9d..cb62311488 100755
--- a/dockerbuild.sh
+++ b/dockerbuild.sh
@@ -97,7 +97,12 @@ tagname="universe-build-$image"
 cp "$DIR/global.json" "$(dirname "$dockerfile")"
 #endworkaround
 
-docker build "$(dirname "$dockerfile")" -f "$dockerfile" --tag $tagname
+docker build "$(dirname "$dockerfile")" \
+    --build-arg "USER=$(whoami)" \
+    --build-arg "USER_ID=$(id -u)" \
+    --build-arg "GROUP_ID=$(id -g)" \
+    --tag $tagname \
+    -f "$dockerfile"
 
 docker run \
     --rm \
diff --git a/modules/Templating b/modules/Templating
index 001f37263b..88f8f97702 160000
--- a/modules/Templating
+++ b/modules/Templating
@@ -1 +1 @@
-Subproject commit 001f37263b70f9a068b814de42c86debe0759b76
+Subproject commit 88f8f977022681a15d3d6700ac311cc01aaa9cf2