diff --git a/.azure/pipelines/ci-official.yml b/.azure/pipelines/ci-official.yml
index 6e817592f3..97bac52d25 100644
--- a/.azure/pipelines/ci-official.yml
+++ b/.azure/pipelines/ci-official.yml
@@ -193,8 +193,10 @@ phases:
/p:BuildNumber=$(Build.BuildNumber)
displayName: Build linux-x64 runtime
- script: >
- ./build.sh
- --ci
+ ./dockerbuild.sh
+ ubuntu
+ /t:Prepare
+ /t:GeneratePropsFiles
/t:BuildSharedFx
/p:SharedFxRID=linux-arm
/p:BuildNumber=$(Build.BuildNumber)
diff --git a/build/docker/ubuntu.Dockerfile b/build/docker/ubuntu.Dockerfile
new file mode 100644
index 0000000000..f4f6183b8c
--- /dev/null
+++ b/build/docker/ubuntu.Dockerfile
@@ -0,0 +1,15 @@
+FROM microsoft/dotnet-buildtools-prereqs:ubuntu-14.04-cross-e435274-20180426002420
+
+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"
+
+# Set the user to non-root
+USER $USER_ID:$GROUP_ID
+
+# Skip package initilization
+ENV DOTNET_SKIP_FIRST_TIME_EXPERIENCE=1
diff --git a/src/Framework/Directory.Build.props b/src/Framework/Directory.Build.props
index 5e777f75d6..f037e8f657 100644
--- a/src/Framework/Directory.Build.props
+++ b/src/Framework/Directory.Build.props
@@ -18,8 +18,7 @@
$(ArtifactsConfigurationDir)$(SharedFxRid)\$(MSBuildProjectName)\
$(RepositoryRoot)obj\fx\$(MSBuildProjectName)\
- false
- false
+ false
true
$(MSBuildThisFileDirectory)runtime.fx.nuspec