diff --git a/docfx.json b/docfx.json
index ad763c0b6abba..c3ad47486344a 100644
--- a/docfx.json
+++ b/docfx.json
@@ -106,6 +106,7 @@
         "_vblang/spec/*.md": "dotnet-visualbasic",
         "docs/core/**/**.md": "dotnet-core",
         "docs/csharp/**/**.md": "dotnet-csharp",
+        "docs/csharp/**/**.yml": "dotnet-csharp",
         "docs/framework/**/**.md": "dotnet-framework",
         "docs/fsharp/**/**.md": "dotnet-fsharp",
         "docs/standard/**/**.md": "dotnet",
@@ -124,12 +125,14 @@
       },
       "ms.devlang": {
         "docs/csharp/**/**.md": "csharp",
+        "docs/csharp/**/**.yml": "csharp",
         "docs/fsharp/**/**.md": "fsharp",
         "docs/visual-basic/**/**.md": "vb"
       },
       "author": {
         "docs/core/**/**.md": "mairaw",
-        "docs/csharp/**/**.md": "billwagner",        
+        "docs/csharp/**/**.md": "billwagner",
+        "docs/csharp/**/**.yml": "billwagner",
         "docs/framework/data/adonet/**/**.md": "douglaslMS",
         "docs/fsharp/**/**.md": "cartermp"
       },
@@ -138,6 +141,7 @@
         "_vblang/spec/*.md": "wiwagn",
         "docs/core/**/**.md": "mairaw",
         "docs/csharp/**/**.md": "wiwagn",
+        "docs/csharp/**/**.yml": "wiwagn",
         "docs/framework/data/adonet/**/**.md": "douglasl",
         "docs/fsharp/**/**.md": "phcart"        
       },
diff --git a/docs/csharp/quick-starts/branches-and-loops.yml b/docs/csharp/quick-starts/branches-and-loops.yml
index d3c3a126d4911..82c78ac63d411 100644
--- a/docs/csharp/quick-starts/branches-and-loops.yml
+++ b/docs/csharp/quick-starts/branches-and-loops.yml
@@ -5,13 +5,11 @@ metadata:
   description: In this quickstart about branches and loops, you'll use your browser to learn C# interactively. You'll write C# code and see the results of compiling and running your code directly in the browser.
   audience: Developer
   level: Beginner
+  ms.topic: quickstart
   ms.custom: mvc
-  ms.prod: .net
-  ms.technology: devlang-csharp
-  ms.topic: get-started-article
   displayType: two-column
   interactive: csharp
-  nextTutorialHref: interpolated-strings
+  nextTutorialHref: interpolated-strings.yml
   nextTutorialTitle: String interpolation in C#
 items:
 - durationInMinutes: 1
diff --git a/docs/csharp/quick-starts/hello-world.yml b/docs/csharp/quick-starts/hello-world.yml
index f095ff55b8214..3199fd683b9a5 100644
--- a/docs/csharp/quick-starts/hello-world.yml
+++ b/docs/csharp/quick-starts/hello-world.yml
@@ -5,14 +5,12 @@ metadata:
   description: In this quickstart, you'll use your browser to learn C# interactively. You write C# code and see the results of compiling and running your code directly in the browser.
   audience: Developer
   level: Beginner
-  ms.topic: get-started-article
-  nextTutorialHref: numbers-in-csharp
+  ms.topic: quickstart
+  nextTutorialHref: numbers-in-csharp.yml
   nextTutorialTitle: Numbers in C#
   displayType: two-column
   interactive: csharp
   ms.custom: mvc
-  ms.prod: .net
-  ms.technology: devlang-csharp
 items:
 - durationInMinutes: 1
   content: |
diff --git a/docs/csharp/quick-starts/interpolated-strings.yml b/docs/csharp/quick-starts/interpolated-strings.yml
index 0bbccb5f027b0..aa4429e9cceb3 100644
--- a/docs/csharp/quick-starts/interpolated-strings.yml
+++ b/docs/csharp/quick-starts/interpolated-strings.yml
@@ -9,7 +9,7 @@ metadata:
   level: Beginner
   displayType: two-column
   interactive: csharp
-  nextTutorialHref: list-collection
+  nextTutorialHref: list-collection.yml
   nextTutorialTitle: Collections in C#
 items:
 - durationInMinutes: 2
diff --git a/docs/csharp/quick-starts/list-collection.yml b/docs/csharp/quick-starts/list-collection.yml
index d2fb0665e6b7e..d6ed42ffd626c 100644
--- a/docs/csharp/quick-starts/list-collection.yml
+++ b/docs/csharp/quick-starts/list-collection.yml
@@ -4,13 +4,11 @@ metadata:
   title:  Collections interactive tutorial - C# quickstarts
   description: In this tutorial, you'll use your browser to learn C# interactively. You write C# code and see the results of compiling and running your code directly in the browser.
   audience: Developer
-  ms.topic: get-started-article
+  ms.topic: quickstart
   ms.custom: mvc
   level: Beginner
   displayType: two-column
   interactive: csharp
-  ms.prod: .net
-  ms.technology: devlang-csharp
 items:
 - durationInMinutes: 1
   content: |
diff --git a/docs/csharp/quick-starts/numbers-in-csharp.yml b/docs/csharp/quick-starts/numbers-in-csharp.yml
index c73b73d800386..59a8ed50ab2e7 100644
--- a/docs/csharp/quick-starts/numbers-in-csharp.yml
+++ b/docs/csharp/quick-starts/numbers-in-csharp.yml
@@ -4,15 +4,13 @@ metadata:
   title:  Numbers in C# interactive tutorial - C# quickstarts
   description: In this quick start about numeric types, you'll use your browser to learn C# interactively. You're going to write C# code and see the results of compiling and running your code directly in the browser.
   audience: Developer
-  ms.topic: get-started-article
+  ms.topic: quickstart
   ms.custom: mvc
   level: Beginner
-  nextTutorialHref: branches-and-loops
+  nextTutorialHref: branches-and-loops.yml
   nextTutorialTitle: Branches and loops in C#
   displayType: two-column
   interactive: csharp
-  ms.prod: .net
-  ms.technology: devlang-csharp  
 items:
 - durationInMinutes: 1
   content: |