diff --git a/.gitmodules b/.gitmodules
index 85fb6bd2be..721adca927 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -6,14 +6,6 @@
 	path = modules/Antiforgery
 	url = https://github.com/aspnet/Antiforgery.git
 	branch = release/2.2
-[submodule "modules/AuthSamples"]
-	path = modules/AuthSamples
-	url = https://github.com/aspnet/AuthSamples.git
-	branch = release/2.2
-[submodule "modules/AzureIntegration"]
-	path = modules/AzureIntegration
-	url = https://github.com/aspnet/AzureIntegration.git
-	branch = release/2.2
 [submodule "modules/BasicMiddleware"]
 	path = modules/BasicMiddleware
 	url = https://github.com/aspnet/BasicMiddleware.git
@@ -110,10 +102,6 @@
 	path = modules/StaticFiles
 	url = https://github.com/aspnet/StaticFiles.git
 	branch = release/2.2
-[submodule "modules/Templating"]
-	path = modules/Templating
-	url = https://github.com/aspnet/Templating.git
-	branch = release/2.2
 [submodule "src/IISIntegration/test/gtest/googletest"]
 	path = src/IISIntegration/test/gtest/googletest
 	url = https://github.com/google/googletest
diff --git a/build/buildorder.props b/build/buildorder.props
index 9e7b14d3fa..09076924ee 100644
--- a/build/buildorder.props
+++ b/build/buildorder.props
@@ -33,10 +33,10 @@
     <RepositoryBuildOrder Include="JavaScriptServices" Order="15" />
     <RepositoryBuildOrder Include="MvcPrecompilation" Order="15" />
     <RepositoryBuildOrder Include="Scaffolding" Order="15" />
-    <RepositoryBuildOrder Include="AzureIntegration" Order="15" />
+    <RepositoryBuildOrder Include="AzureIntegration" Order="15" RootPath="$(RepositoryRoot)src\AzureIntegration\" />
     <RepositoryBuildOrder Include="MusicStore" Order="16" RootPath="$(RepositoryRoot)src\MusicStore\" />
     <RepositoryBuildOrder Include="SignalR" Order="16" />
-    <RepositoryBuildOrder Include="AuthSamples" Order="16" />
-    <RepositoryBuildOrder Include="Templating" Order="17" />
+    <RepositoryBuildOrder Include="AuthSamples" Order="16" RootPath="$(RepositoryRoot)src\AuthSamples\" />
+    <RepositoryBuildOrder Include="Templating" Order="17" RootPath="$(RepositoryRoot)src\Templating\" />
   </ItemGroup>
 </Project>
diff --git a/build/submodules.props b/build/submodules.props
index 260d83e385..d1b26d95b0 100644
--- a/build/submodules.props
+++ b/build/submodules.props
@@ -38,10 +38,10 @@
   <ItemGroup>
     <Repository Include="Scaffolding" PatchPolicy="AlwaysUpdate" />
     <Repository Include="IISIntegration" RootPath="$(RepositoryRoot)src\IISIntegration\" />
-    <Repository Include="Templating" PatchPolicy="AlwaysUpdateAndCascadeVersions" />
+    <Repository Include="Templating" RootPath="$(RepositoryRoot)src\Templating\" PatchPolicy="AlwaysUpdateAndCascadeVersions" />
 
     <!-- Test-only repos -->
-    <Repository Include="AuthSamples" PatchPolicy="AlwaysUpdateAndCascadeVersions" />
+    <Repository Include="AuthSamples" RootPath="$(RepositoryRoot)src\AuthSamples\" PatchPolicy="AlwaysUpdateAndCascadeVersions" />
     <Repository Include="MusicStore" RootPath="$(RepositoryRoot)src\MusicStore\" PatchPolicy="AlwaysUpdateAndCascadeVersions" />
     <Repository Include="ServerTests" PatchPolicy="AlwaysUpdateAndCascadeVersions" />
   </ItemGroup>
@@ -49,7 +49,7 @@
   <ItemGroup>
     <ShippedRepository Include="AADIntegration" />
     <ShippedRepository Include="Antiforgery" />
-    <ShippedRepository Include="AzureIntegration" />
+    <ShippedRepository Include="AzureIntegration" RootPath="$(RepositoryRoot)src\AzureIntegration\" />
     <ShippedRepository Include="BasicMiddleware" />
     <ShippedRepository Include="BrowserLink" />
     <ShippedRepository Include="CORS" />
diff --git a/modules/AuthSamples b/modules/AuthSamples
deleted file mode 160000
index 7383e532c9..0000000000
--- a/modules/AuthSamples
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 7383e532c9bbfaf843a137d627ba824694529507
diff --git a/modules/AzureIntegration b/modules/AzureIntegration
deleted file mode 160000
index 031a2ed214..0000000000
--- a/modules/AzureIntegration
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 031a2ed214529194d95d8deed50287760163ffae
diff --git a/modules/Templating b/modules/Templating
deleted file mode 160000
index d26f89a6bc..0000000000
--- a/modules/Templating
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit d26f89a6bcb649438cee1b851a682caac4363204