diff --git a/.azure/pipelines/fast-pr-validation.yml b/.azure/pipelines/fast-pr-validation.yml
index 863270dc71..6857144c97 100644
--- a/.azure/pipelines/fast-pr-validation.yml
+++ b/.azure/pipelines/fast-pr-validation.yml
@@ -15,14 +15,21 @@ phases:
 - template: .vsts-pipelines/templates/project-ci.yml@buildtools
   parameters:
     buildArgs: "/t:FastCheck"
-- phase: DataProtection
-  queue: Hosted VS2017
+- phase: RepoBuilds
+  queue:
+    name: Hosted VS2017
+    parallel: 2
+    matrix:
+      DataProtection:
+        _FolderName: DataProtection
+      WebSockets:
+        _FolderName: WebSockets
   steps:
-  - script: src/DataProtection/build.cmd -ci
-    displayName: Run src/DataProtection/build.cmd
+  - script: src/$(_FolderName)/build.cmd -ci
+    displayName: Run src/$(_FolderName)/build.cmd
   - task: PublishTestResults@2
     displayName: Publish test results
     condition: always()
     inputs:
       testRunner: vstest
-      testResultsFiles: 'src/DataProtection/artifacts/logs/**/*.trx'
+      testResultsFiles: 'src/$(_FolderName)/artifacts/logs/**/*.trx'
diff --git a/.gitmodules b/.gitmodules
index 972b9ce3f8..513f28cb14 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -178,7 +178,3 @@
 	path = modules/Testing
 	url = https://github.com/aspnet/Testing.git
 	branch = release/2.1
-[submodule "modules/WebSockets"]
-	path = modules/WebSockets
-	url = https://github.com/aspnet/WebSockets.git
-	branch = release/2.1
diff --git a/build/buildorder.props b/build/buildorder.props
index c8b166f55b..761d9e7f39 100644
--- a/build/buildorder.props
+++ b/build/buildorder.props
@@ -40,7 +40,7 @@
     <RepositoryBuildOrder Include="ServerTests" Order="11" />
     <RepositoryBuildOrder Include="Diagnostics" Order="12" />
     <RepositoryBuildOrder Include="Localization" Order="12" />
-    <RepositoryBuildOrder Include="WebSockets" Order="13" />
+    <RepositoryBuildOrder Include="WebSockets" Order="13" RootPath="$(RepositoryRoot)src\WebSockets\"  />
     <RepositoryBuildOrder Include="Security" Order="13" />
     <RepositoryBuildOrder Include="MetaPackages" Order="13" />
     <RepositoryBuildOrder Include="Mvc" Order="14" />
diff --git a/build/submodules.props b/build/submodules.props
index cc0a5c1603..26ca5497b6 100644
--- a/build/submodules.props
+++ b/build/submodules.props
@@ -87,6 +87,6 @@
     <ShippedRepository Include="SignalR" />
     <ShippedRepository Include="StaticFiles" />
     <ShippedRepository Include="Testing" />
-    <ShippedRepository Include="WebSockets" />
+    <ShippedRepository Include="WebSockets" RootPath="$(RepositoryRoot)src\WebSockets\" />
   </ItemGroup>
 </Project>
diff --git a/modules/WebSockets b/modules/WebSockets
deleted file mode 160000
index 67f2c3149e..0000000000
--- a/modules/WebSockets
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 67f2c3149efd03511794ed64726a196ee0b1ab36
diff --git a/src/WebSockets/build.cmd b/src/WebSockets/build.cmd
new file mode 100644
index 0000000000..f4169ea5e4
--- /dev/null
+++ b/src/WebSockets/build.cmd
@@ -0,0 +1,3 @@
+@ECHO OFF
+SET RepoRoot="%~dp0..\.."
+%RepoRoot%\build.cmd -LockFile %RepoRoot%\korebuild-lock.txt -Path %~dp0 %*
diff --git a/src/WebSockets/build.sh b/src/WebSockets/build.sh
new file mode 100755
index 0000000000..d5bb0cf631
--- /dev/null
+++ b/src/WebSockets/build.sh
@@ -0,0 +1,7 @@
+#!/usr/bin/env bash
+
+set -euo pipefail
+
+DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
+repo_root="$DIR/../.."
+"$repo_root/build.sh" --path "$DIR" --lockfile "$repo_root/korebuild-lock.txt" "$@"