diff --git a/images/dotnet.png b/images/dotnet.png
index c8972efdc..fb00ecf91 100644
Binary files a/images/dotnet.png and b/images/dotnet.png differ
diff --git a/images/golang.svg b/images/golang.svg
new file mode 100644
index 000000000..d706fb571
--- /dev/null
+++ b/images/golang.svg
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?><!-- Uploaded to: SVG Repo, www.svgrepo.com, Generator: SVG Repo Mixer Tools -->
+<svg width="800px" height="800px" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+  <g fill="none">
+    <path fill="#8CC5E7" d="M21.4679537,3.20617761 C22.1814672,4.67953668 20.0131274,4.83706564 20.1243243,5.49498069 C20.3281853,6.68108108 20.1891892,8.44169884 20.0316602,10.1745174 C19.7629344,13.1119691 21.9590734,20.1451737 17.3814672,22.9714286 C16.5196911,23.5088803 14.4718147,23.8054054 12.4517375,23.8517375 C12.4517375,23.8517375 12.442471,23.8517375 12.442471,23.8517375 C12.442471,23.8517375 12.4332046,23.8517375 12.4332046,23.8517375 C10.4131274,23.8054054 8.08725869,23.5088803 7.22548263,22.9714286 C2.65714286,20.1451737 4.85328185,13.1119691 4.59382239,10.1745174 C4.42702703,8.44169884 4.28803089,6.68108108 4.5011583,5.49498069 C4.61235521,4.83706564 2.44401544,4.68880309 3.15752896,3.20617761 C3.76911197,1.93667954 5.27953668,3.05791506 5.65945946,2.65945946 C7.596139,0.648648649 9.94980695,0.111196911 11.8030888,0.0648648649 C11.988417,0.0648648649 12.8223938,0.0648648649 12.8223938,0.0648648649 C14.6664093,0.157528958 17.0200772,0.657915058 18.9660232,2.65945946 C19.3459459,3.05791506 20.8471042,1.93667954 21.4679537,3.20617761 Z M11.4324324,10.9065637 C11.3490347,10.9436293 11.2100386,11.8517375 11.6362934,11.8980695 C11.9235521,11.9258687 12.7111969,12.0185328 12.8965251,11.8980695 C13.2579151,11.6664093 13.2208494,11.1104247 13.0169884,10.9714286 C12.6741313,10.7490347 11.5250965,10.8602317 11.4324324,10.9065637 Z M9.07876448,4.10501931 C8.12432432,3.99382239 6.52123552,4.88339768 6.28030888,6.77374517 C6.02084942,8.73822394 8.33745174,10.6841699 10.56139,8.73822394 C11.7567568,7.69111969 12.1737452,4.46640927 9.07876448,4.10501931 Z M15.5281853,4.10501931 C12.4332046,4.46640927 12.8501931,7.69111969 14.0455598,8.73822394 C16.2694981,10.6841699 18.5861004,8.73822394 18.3266409,6.77374517 C18.0949807,4.88339768 16.4918919,3.99382239 15.5281853,4.10501931 Z"/>
+    <path fill="#B8937F" d="M12.3127413,8.98841699 C12.8965251,8.90501931 14.2957529,9.57220077 14.2030888,10.3598456 C14.0918919,11.2772201 10.5984556,11.3976834 10.4131274,10.3042471 C10.3019305,9.63706564 10.8301158,9.21081081 12.3127413,8.98841699 Z M20.1984556,16.3737452 C19.9111969,16.3644788 19.7258687,15.984556 19.7258687,15.7528958 C19.7258687,15.3359073 19.7814672,14.8447876 20.0872587,14.6316602 C20.7173745,14.196139 21.2177606,16.3830116 20.1984556,16.3737452 Z M4.41776062,16.3737452 C3.3984556,16.3830116 3.8988417,14.196139 4.52895753,14.6316602 C4.83474903,14.8447876 4.89034749,15.3359073 4.89034749,15.7528958 C4.89034749,15.984556 4.70501931,16.3644788 4.41776062,16.3737452 Z M18.2617761,23.0918919 C18.4471042,23.3606178 18.4563707,23.5459459 18.1598456,23.6849421 C17.0293436,24.203861 16.019305,23.5088803 16.3992278,23.3142857 C17.2054054,22.9065637 17.7057915,22.2671815 18.2617761,23.0918919 Z M6.35444015,23.184556 C6.91042471,22.3598456 7.41081081,22.9992278 8.21698842,23.4069498 C8.5969112,23.6015444 7.58687259,24.2965251 6.45637066,23.7776062 C6.15984556,23.63861 6.16911197,23.4532819 6.35444015,23.184556 Z"/>
+    <path fill="#000000" d="M19.7351351,3.42857143 C19.7814672,3.23397683 20.2633205,3.14131274 20.5320463,3.47490347 C20.8563707,3.87335907 20.0594595,4.42007722 20.0223938,4.1976834 C19.9297297,3.5953668 19.6795367,3.62316602 19.7351351,3.42857143 Z M4.88108108,3.42857143 C4.93667954,3.62316602 4.68648649,3.5953668 4.59382239,4.1976834 C4.55675676,4.42007722 3.75984556,3.87335907 4.08416988,3.47490347 C4.34362934,3.14131274 4.82548263,3.23397683 4.88108108,3.42857143 Z M15.7413127,7.94131274 C15.1578953,7.94131274 14.6849421,7.46835949 14.6849421,6.88494208 C14.6849421,6.30152468 15.1578953,5.82857143 15.7413127,5.82857143 C16.3247301,5.82857143 16.7976834,6.30152468 16.7976834,6.88494208 C16.7976834,7.46835949 16.3247301,7.94131274 15.7413127,7.94131274 Z M15.4633205,6.76447876 C15.6475575,6.76447876 15.7969112,6.61512511 15.7969112,6.43088803 C15.7969112,6.24665096 15.6475575,6.0972973 15.4633205,6.0972973 C15.2790834,6.0972973 15.1297297,6.24665096 15.1297297,6.43088803 C15.1297297,6.61512511 15.2790834,6.76447876 15.4633205,6.76447876 Z M11.3583012,9.43320463 C11.4694981,9.00694981 11.8586873,8.86795367 12.1737452,8.85868726 C12.9799228,8.84015444 13.2857143,9.27567568 13.3135135,9.61853282 C13.369112,10.2023166 11.1081081,10.3413127 11.3583012,9.43320463 Z M8.87490347,7.94131274 C8.29148607,7.94131274 7.81853282,7.46835949 7.81853282,6.88494208 C7.81853282,6.30152468 8.29148607,5.82857143 8.87490347,5.82857143 C9.45832088,5.82857143 9.93127413,6.30152468 9.93127413,6.88494208 C9.93127413,7.46835949 9.45832088,7.94131274 8.87490347,7.94131274 Z M9.15289575,6.76447876 C9.33713283,6.76447876 9.48648649,6.61512511 9.48648649,6.43088803 C9.48648649,6.24665096 9.33713283,6.0972973 9.15289575,6.0972973 C8.96865868,6.0972973 8.81930502,6.24665096 8.81930502,6.43088803 C8.81930502,6.61512511 8.96865868,6.76447876 9.15289575,6.76447876 Z"/>
+  </g>
+</svg>
\ No newline at end of file
diff --git a/images/springboot.svg b/images/springboot.svg
new file mode 100644
index 000000000..ee451deaa
--- /dev/null
+++ b/images/springboot.svg
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Uploaded to: SVG Repo, www.svgrepo.com, Generator: SVG Repo Mixer Tools -->
+<svg width="800px" height="800px" viewBox="0 0 256 256" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" preserveAspectRatio="xMidYMid">
+    <g>
+        <path d="M38.9437824,35.879008 C89.5234256,-13.1200214 170.398168,-11.8028432 219.397197,39.0402357 C224.929346,31.6640377 229.671187,23.4975328 233.095851,15.0675923 C249.165425,64.0666217 258.912543,105.162582 255.224444,137.038295 C253.380395,163.90873 242.842969,189.725423 225.456217,210.273403 C180.145286,264.014274 99.53398,270.863601 45.7931091,225.55267 L45.7931091,225.55267 L44.765,224.638 L44.7103323,224.601984 C44.5420247,224.484832 44.376007,224.362668 44.2124952,224.235492 C43.7219599,223.853965 43.2765312,223.438607 42.8762093,222.995252 L42.732,222.831 L41.0512675,221.3377 C39.4121124,219.93271 37.7729573,218.52772 36.3188215,216.93771 L35.7825547,216.332423 C-13.2164747,165.752779 -11.6358609,84.8780374 38.9437824,35.879008 Z M57.9111486,207.375611 C53.169307,203.687512 46.3199803,204.214383 42.6318814,208.956225 C39.3888978,213.125775 39.4048731,218.924805 42.6798072,222.771269 L42.732,222.831 L44.765,224.638 L44.9644841,224.773953 C49.5691585,227.80174 55.7644273,227.175885 59.2982065,222.896387 L59.4917624,222.654878 C63.1798614,217.913037 62.3895545,211.06371 57.9111486,207.375611 Z M231.778672,28.2393744 C218.60689,55.9001168 185.940871,76.9749681 157.753257,83.5608592 C131.146257,89.8833146 107.963921,84.6146018 83.4644059,94.0982849 C27.6160498,115.436572 28.6697923,181.822354 59.2283268,196.838185 L59.2283268,196.838185 L61.0723763,197.891928 C61.0723763,197.891928 83.1456487,193.50309 104.973663,187.707242 L106.843514,187.207079 C115.561826,184.857554 124.138869,182.296538 131.146257,179.714869 C167.500376,166.279651 207.542593,133.08676 220.714375,94.6251562 C213.865049,134.667374 179.35498,173.392413 144.84491,191.042601 C126.404416,200.526284 112.178891,202.633769 81.883792,213.171195 C78.195693,214.488373 75.297901,215.805551 75.297901,215.805551 C75.6675607,215.754564 76.0372203,215.70481 76.4060145,215.65629 L77.1421925,215.560893 L77.1421925,215.560893 L77.8745239,215.468787 C84.5652297,214.639554 90.5771682,214.224938 90.5771682,214.224938 C133.517178,212.117452 200.956702,226.342977 232.305544,184.45671 C264.444692,141.780136 246.531068,72.7599979 231.778672,28.2393744 Z" fill="#6DB33F">
+
</path>
+        <path d="M57.9111486,207.375611 C62.3895545,211.06371 63.1798614,217.913037 59.4917624,222.654878 C55.8036635,227.39672 48.9543368,227.923591 44.2124952,224.235492 C39.4706537,220.547393 38.9437824,213.698066 42.6318814,208.956225 C46.3199803,204.214383 53.169307,203.687512 57.9111486,207.375611 Z M231.778672,28.2393744 C246.531068,72.7599979 264.444692,141.780136 232.305544,184.45671 C200.956702,226.342977 133.517178,212.117452 90.5771682,214.224938 C90.5771682,214.224938 84.5652297,214.639554 77.8745239,215.468787 L77.1421925,215.560893 C76.5300999,215.63902 75.9140004,215.720572 75.297901,215.805551 C75.297901,215.805551 78.195693,214.488373 81.883792,213.171195 C112.178891,202.633769 126.404416,200.526284 144.84491,191.042601 C179.35498,173.392413 213.865049,134.667374 220.714375,94.6251562 C207.542593,133.08676 167.500376,166.279651 131.146257,179.714869 C106.119871,188.935116 61.0723763,197.891928 61.0723763,197.891928 L59.2283268,196.838185 C28.6697923,181.822354 27.6160498,115.436572 83.4644059,94.0982849 C107.963921,84.6146018 131.146257,89.8833146 157.753257,83.5608592 C185.940871,76.9749681 218.60689,55.9001168 231.778672,28.2393744 Z" fill="#FFFFFF">
+
</path>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/src/quickstart.html b/src/quickstart.html
index e369724e6..fc89be86f 100644
--- a/src/quickstart.html
+++ b/src/quickstart.html
@@ -42,29 +42,30 @@
       <div class="container-fluid">
         <ul class="nav nav-tabs qslevel">
           <li class="active">
-            <a data-toggle="tab" href="#net"
-              ><img class="qsmenuicons" src="../images/dotnet.png" alt=".NET platform" />.NET</a
-            >
+            <a data-toggle="tab" href="#net">
+              <img class="qsmenuicons" src="../images/dotnet.png" alt=".NET" /> .NET
+            </a>
           </li>
           <li>
-            <a data-toggle="tab" href="#corenet"
-              ><img class="qsmenuicons" src="../images/dotnet.png" alt=".NET Core platform" />.NET Core</a
-            >
+            <a data-toggle="tab" href="#java"> <img class="qsmenuicons" src="../images/java.png" alt="Java" /> Java </a>
           </li>
           <li>
-            <a data-toggle="tab" href="#Java"
-              ><img class="qsmenuicons" src="../images/java.png" alt="Java platform" />Java</a
-            >
+            <a data-toggle="tab" href="#nodejs">
+              <img class="qsmenuicons" src="../images/nodejs.png" alt="Node.js" /> Node.js
+            </a>
           </li>
           <li>
-            <a data-toggle="tab" href="#NodeJs"
-              ><img class="qsmenuicons" src="../images/nodejs.png" alt="Node.js platform" />Node.js</a
-            >
+            <a data-toggle="tab" href="#python">
+              <img class="qsmenuicons" src="../images/python.png" alt="Python" /> Python
+            </a>
           </li>
           <li>
-            <a data-toggle="tab" href="#Python"
-              ><img class="qsmenuicons" src="../images/python.png" alt="Python platform" />Python</a
-            >
+            <a data-toggle="tab" href="#go"> <img class="qsmenuicons" src="../images/golang.svg" alt="Go" /> Go </a>
+          </li>
+          <li>
+            <a data-toggle="tab" href="#springboot">
+              <img class="qsmenuicons" src="../images/springboot.svg" alt="Spring Boot" /> Springboot
+            </a>
           </li>
         </ul>
         <div class="tab-content tab-content-override">
@@ -82,80 +83,10 @@
                 >
               </div>
             </div>
-
-            <div class="netApp">
-              <div class="numbersize">2</div>
-              <div class="numberheading">
-                Learn more about Azure Cosmos DB
-                <ul>
-                  <li>
-                    <a target="_blank" class="atags" href="https://aka.ms/cosmos-db-emulator/samples/dotnet"
-                      >Code Samples</a
-                    >
-                  </li>
-                  <li>
-                    <a target="_blank" class="atags" href="https://aka.ms/cosmos-db-emulator/docs">Documentation</a>
-                  </li>
-                  <li>
-                    <a target="_blank" class="atags" href="https://aka.ms/cosmos-db-emulator/pricing">Pricing</a>
-                  </li>
-                  <li>
-                    <a target="_blank" class="atags" href="https://aka.ms/cosmos-db-emulator/capacity-planner"
-                      >Capacity Planner</a
-                    >
-                  </li>
-                  <li>
-                    <a target="_blank" class="atags" href="https://aka.ms/cosmos-db-emulator/stackoverflow">Forum</a>
-                  </li>
-                </ul>
-              </div>
-            </div>
-          </div>
-          <div id="corenet" class="tab-pane fade">
-            <div class="netApp">
-              <div class="numbersize numbersizePadding">1</div>
-              <div class="numberheading">
-                Open and run a sample .NET Core app
-                <p>
-                  We created a sample .NET Core app connected to your Azure Cosmos DB Emulator instance. Download,
-                  extract, build and run the app.
-                </p>
-                <a href="quickstart/DocumentDB-Quickstart-DotNetCore.zip"
-                  ><button class="btncreatecoll">Download</button></a
-                >
-              </div>
-            </div>
-
-            <div class="netApp">
-              <div class="numbersize">2</div>
-              <div class="numberheading">
-                Learn more about Azure Cosmos DB.
-                <ul>
-                  <li>
-                    <a target="_blank" class="atags" href="https://aka.ms/cosmos-db-emulator/samples/dotnet"
-                      >Code Samples</a
-                    >
-                  </li>
-                  <li>
-                    <a target="_blank" class="atags" href="https://aka.ms/cosmos-db-emulator/docs">Documentation</a>
-                  </li>
-                  <li>
-                    <a target="_blank" class="atags" href="https://aka.ms/cosmos-db-emulator/pricing">Pricing</a>
-                  </li>
-                  <li>
-                    <a target="_blank" class="atags" href="https://aka.ms/cosmos-db-emulator/capacity-planner"
-                      >Capacity Planner</a
-                    >
-                  </li>
-                  <li>
-                    <a target="_blank" class="atags" href="https://aka.ms/cosmos-db-emulator/stackoverflow">Forum</a>
-                  </li>
-                </ul>
-              </div>
-            </div>
+            <div class="learn-more"></div>
           </div>
 
-          <div id="Java" class="tab-pane fade">
+          <div id="java" class="tab-pane fade">
             <div class="step1">
               <div class="numbersize numbersizePadding">1</div>
               <div class="numberheading">
@@ -171,33 +102,10 @@
                 </p>
               </div>
             </div>
-
-            <div class="step1">
-              <div class="numbersize">2</div>
-              <div class="numberheading">
-                Learn more about Azure Cosmos DB.
-                <ul>
-                  <!--<li><a target="_blank" class="atags" href="https://aka.ms/cosmos-db-emulator/samples/java">Code Samples</a></li>-->
-                  <li>
-                    <a target="_blank" class="atags" href="https://aka.ms/cosmos-db-emulator/docs">Documentation</a>
-                  </li>
-                  <li>
-                    <a target="_blank" class="atags" href="https://aka.ms/cosmos-db-emulator/pricing">Pricing</a>
-                  </li>
-                  <li>
-                    <a target="_blank" class="atags" href="https://aka.ms/cosmos-db-emulator/capacity-planner"
-                      >Capacity Planner</a
-                    >
-                  </li>
-                  <li>
-                    <a target="_blank" class="atags" href="https://aka.ms/cosmos-db-emulator/stackoverflow">Forum</a>
-                  </li>
-                </ul>
-              </div>
-            </div>
+            <div class="learn-more"></div>
           </div>
 
-          <div id="NodeJs" class="tab-pane fade">
+          <div id="nodejs" class="tab-pane fade">
             <div class="step1">
               <div class="numbersize numbersizePadding">1</div>
               <div class="numberheading">
@@ -215,41 +123,14 @@
                 </p>
               </div>
             </div>
-
-            <div class="step1">
-              <div class="numbersize">2</div>
-              <div class="numberheading">
-                Learn more about Azure Cosmos DB.
-                <ul>
-                  <li>
-                    <a target="_blank" class="atags" href="https://aka.ms/cosmos-db-emulator/samples/nodejs"
-                      >Code Samples</a
-                    >
-                  </li>
-                  <li>
-                    <a target="_blank" class="atags" href="https://aka.ms/cosmos-db-emulator/docs">Documentation</a>
-                  </li>
-                  <li>
-                    <a target="_blank" class="atags" href="https://aka.ms/cosmos-db-emulator/pricing">Pricing</a>
-                  </li>
-                  <li>
-                    <a target="_blank" class="atags" href="https://aka.ms/cosmos-db-emulator/capacity-planner"
-                      >Capacity Planner</a
-                    >
-                  </li>
-                  <li>
-                    <a target="_blank" class="atags" href="https://aka.ms/cosmos-db-emulator/stackoverflow">Forum</a>
-                  </li>
-                </ul>
-              </div>
-            </div>
+            <div class="learn-more"></div>
           </div>
 
-          <div id="Python" class="tab-pane fade">
+          <div id="python" class="tab-pane fade">
             <div class="pythonApp">
               <div class="numbersize numbersizePadding">1</div>
               <div class="numberheading">
-                Create a new Python app.
+                Create a new Python app
                 <p>
                   Follow this
                   <a href="https://aka.ms/cosmos-db-emulator/tutorial/python" target="_blank">tutorial</a>
@@ -257,42 +138,74 @@
                 </p>
               </div>
             </div>
+            <div class="learn-more"></div>
+          </div>
 
+          <!-- Go -->
+          <div id="go" class="tab-pane fade">
             <div class="pythonApp">
-              <div class="numbersize">2</div>
+              <div class="numbersize numbersizePadding">1</div>
               <div class="numberheading">
-                Learn more about Azure Cosmos DB.
-                <ul>
-                  <li>
-                    <a target="_blank" class="atags" href="https://aka.ms/cosmos-db-emulator/samples/python"
-                      >Code Samples</a
-                    >
-                  </li>
-                  <li>
-                    <a target="_blank" class="atags" href="https://aka.ms/cosmos-db-emulator/docs">Documentation</a>
-                  </li>
-                  <li>
-                    <a target="_blank" class="atags" href="https://aka.ms/cosmos-db-emulator/pricing">Pricing</a>
-                  </li>
-                  <li>
-                    <a target="_blank" class="atags" href="https://aka.ms/cosmos-db-emulator/capacity-planner"
-                      >Capacity planner</a
-                    >
-                  </li>
-                  <li>
-                    <a
-                      target="_blank"
-                      class="atags"
-                      href="https://social.msdn.microsoft.com/forums/azure/home?forum=AzureDocumentDB"
-                      >Forum</a
-                    >
-                  </li>
-                </ul>
+                Create a new Go app
+                <p>
+                  Follow this
+                  <a href="https://learn.microsoft.com/azure/cosmos-db/nosql/quickstart-go" target="_blank">tutorial</a>
+                  to create a new Go app connected to Azure Cosmos DB.
+                </p>
               </div>
             </div>
+            <div class="learn-more"></div>
+          </div>
+
+          <div id="springboot" class="tab-pane fade">
+            <div class="pythonApp">
+              <div class="numbersize numbersizePadding">1</div>
+              <div class="numberheading">
+                Create a new Spring Boot app
+                <p>
+                  Follow this
+                  <a
+                    href="https://learn.microsoft.com/azure/cosmos-db/nosql/tutorial-springboot-azure-kubernetes-service"
+                    target="_blank"
+                    >tutorial</a
+                  >
+                  to create a new Spring Boot app connected to Azure Cosmos DB.
+                </p>
+              </div>
+            </div>
+            <div class="learn-more"></div>
           </div>
         </div>
       </div>
     </div>
+
+    <template id="learnMoreTpl">
+      <div class="app-block">
+        <div class="numbersize">2</div>
+        <div class="numberheading">
+          Learn more about Azure Cosmos DB
+          <ul>
+            <li>
+              <a href="https://azurecosmosdb.github.io/gallery/?tags=example" target="_blank" class="atags"
+                >Code Samples</a
+              >
+            </li>
+            <li><a href="https://aka.ms/cosmos-db-emulator/docs" target="_blank" class="atags">Documentation</a></li>
+            <li><a href="https://aka.ms/cosmos-db-emulator/pricing" target="_blank" class="atags">Pricing</a></li>
+            <li>
+              <a href="https://cosmos.azure.com/capacitycalculator/" target="_blank" class="atags">Capacity planner</a>
+            </li>
+            <li><a href="https://aka.ms/cosmos-db-emulator/stackoverflow" target="_blank" class="atags">Forum</a></li>
+          </ul>
+        </div>
+      </div>
+    </template>
+
+    <script>
+      document.querySelectorAll(".learn-more").forEach((slot) => {
+        const node = document.getElementById("learnMoreTpl").content.cloneNode(true);
+        slot.appendChild(node);
+      });
+    </script>
   </body>
 </html>