diff --git a/src/site/_includes/components/ticker.njk b/src/site/_includes/components/ticker.njk
index e3070bcee..a3897b692 100644
--- a/src/site/_includes/components/ticker.njk
+++ b/src/site/_includes/components/ticker.njk
@@ -1,5 +1,5 @@
 {% macro main() %}
-  <div class="logos-ticker py-4">
+  <div class="py-4 logos-ticker">
     <div class="logos-ticker-container">
       {{ iconsMarkup() }}
     </div>
@@ -13,6 +13,9 @@
   <svg role="img" aria-label="Netlify" focusable="false" width="171" height="70">
     <use xlink:href="#logo-netlify"></use>
   </svg>
+  <svg role="img" aria-label="Astro" focusable="false" width="183" height="48">
+    <use xlink:href="#logo-astro"></use>
+  </svg>
   <svg role="img" aria-label="Hugo" focusable="false" width="183" height="48">
     <use xlink:href="#logo-hugo"></use>
   </svg>
@@ -63,6 +66,16 @@
         </defs>
       </symbol>
 
+      <symbol id="logo-astro" width="183" height="49" viewBox="0 0 183 49" fill="none">
+        <path d="M12.4017 40.9669C10.2289 38.9805 9.59458 34.8071 10.4998 31.7837C12.0695 33.6898 14.2445 34.2939 16.4973 34.6344C19.9751 35.1606 23.3907 34.9639 26.6214 33.3743C26.991 33.1925 27.3326 32.9501 27.7364 32.7052C28.0396 33.5845 28.1185 34.4723 28.0126 35.3761C27.7551 37.577 26.6599 39.2773 24.9178 40.5658C24.2212 41.0814 23.4841 41.5422 22.7647 42.0284C20.5544 43.5219 19.9564 45.2736 20.787 47.8218C20.8067 47.8838 20.8244 47.9459 20.869 48.0974C19.7405 47.5923 18.9162 46.8569 18.2881 45.8902C17.6247 44.8695 17.3092 43.7407 17.2925 42.5195C17.2842 41.925 17.2842 41.3253 17.2043 40.7394C17.0091 39.3109 16.3385 38.6712 15.075 38.6342C13.7783 38.5967 12.7527 39.398 12.4807 40.6605C12.4599 40.7572 12.4298 40.8529 12.3997 40.9655L12.4017 40.9669Z" fill="#646E73"/>
+        <path d="M0 31.2797C0 31.2797 6.43423 28.1455 12.8864 28.1455L17.7512 13.0899C17.9334 12.3618 18.4651 11.867 19.0655 11.867C19.6658 11.867 20.1976 12.3618 20.3798 13.0899L25.2445 28.1455C32.8861 28.1455 38.1311 31.2797 38.1311 31.2797C38.1311 31.2797 27.2019 1.50689 27.1805 1.44715C26.8668 0.566924 26.3373 0 25.6234 0H12.5087C11.7948 0 11.2866 0.566924 10.9516 1.44715C10.928 1.50579 0 31.2797 0 31.2797Z" fill="#646E73"/>
+        <path d="M67.8379 21.7029C67.8379 24.3412 64.5562 25.9168 60.0125 25.9168C57.055 25.9168 56.0093 25.1839 56.0093 23.645C56.0093 22.0327 57.3075 21.2632 60.2645 21.2632C62.9334 21.2632 65.2051 21.2998 67.8379 21.6296V21.7029ZM67.874 18.4417C66.2512 18.0753 63.7987 17.8555 60.8778 17.8555C52.3669 17.8555 48.3643 19.8708 48.3643 24.561C48.3643 29.4345 51.1049 31.3033 57.4518 31.3033C62.8252 31.3033 66.4672 29.9475 67.8019 26.613H68.0178C67.9817 27.4192 67.9457 28.2253 67.9457 28.8482C67.9457 30.5704 68.2343 30.717 69.6406 30.717H76.2761C75.9154 29.691 75.699 26.7962 75.699 24.3045C75.699 21.6296 75.8072 19.6143 75.8072 16.9028C75.8072 11.3697 72.4899 7.85205 62.1038 7.85205C57.6321 7.85205 52.6555 8.62156 48.8693 9.75748C49.2295 11.2598 49.7346 14.3011 49.9871 16.2798C53.2688 14.7408 57.9207 14.0813 61.5271 14.0813C66.5032 14.0813 67.874 15.2172 67.874 17.5257V18.4417Z" fill="#646E73"/>
+        <path d="M86.0805 23.2419C85.1792 23.3518 83.9527 23.3518 82.6906 23.3518C81.3564 23.3518 80.1304 23.3152 79.3007 23.2052C79.3007 23.4984 79.2646 23.8281 79.2646 24.1213C79.2646 28.7016 82.2578 31.3764 92.7882 31.3764C102.705 31.3764 105.914 28.7383 105.914 24.0846C105.914 19.6875 103.787 17.5257 94.3749 17.0493C87.054 16.7195 86.4052 15.9134 86.4052 14.9973C86.4052 13.9347 87.3426 13.385 92.2471 13.385C97.332 13.385 98.7022 14.0813 98.7022 15.547V15.8767C99.4232 15.8401 100.722 15.8035 102.056 15.8035C103.318 15.8035 104.688 15.8401 105.482 15.9134C105.482 15.5836 105.518 15.2905 105.518 15.034C105.518 9.6475 101.046 7.88867 92.3914 7.88867C82.6545 7.88867 79.3729 10.2705 79.3729 14.924C79.3729 19.1013 82.0057 21.7029 91.3457 22.106C98.2333 22.3258 98.9908 23.0953 98.9908 24.1579C98.9908 25.2939 97.8726 25.8069 93.0407 25.8069C87.4869 25.8069 86.0805 25.0374 86.0805 23.4617V23.2419Z" fill="#646E73"/>
+        <path d="M117.817 3.93115C115.185 6.38624 110.46 8.84127 107.828 9.50083C107.864 10.8566 107.864 13.3483 107.864 14.7041L110.28 14.7407C110.244 17.3423 110.208 20.4936 110.208 22.5822C110.208 27.4556 112.768 31.1199 120.738 31.1199C124.092 31.1199 126.328 30.7535 129.104 30.1672C128.816 28.3717 128.491 25.6235 128.383 23.5349C126.724 24.0845 124.633 24.3777 122.325 24.3777C119.115 24.3777 117.817 23.4983 117.817 20.9699C117.817 18.7714 117.817 16.7194 117.853 14.814C121.964 14.8507 126.075 14.9239 128.491 14.9972C128.455 13.0918 128.527 10.3436 128.636 8.51147C125.137 8.58477 121.207 8.62142 117.961 8.62142C117.997 7.00914 118.033 5.47017 118.07 3.93115H117.817Z" fill="#646E73"/>
+        <path d="M139.355 13.6048C139.391 11.6994 139.428 10.0872 139.464 8.51149H132.215C132.323 11.6628 132.323 14.8873 132.323 19.6142C132.323 24.3411 132.287 27.6023 132.215 30.7168H140.509C140.365 28.5183 140.329 24.8174 140.329 21.6662C140.329 16.6828 142.348 15.2537 146.928 15.2537C149.056 15.2537 150.571 15.5102 151.905 15.9866C151.941 14.1178 152.302 10.4902 152.518 8.87794C151.147 8.47489 149.633 8.21838 147.794 8.21838C143.863 8.18173 140.978 9.794 139.644 13.6415L139.355 13.6048Z" fill="#646E73"/>
+        <path d="M175.463 19.4677C175.463 23.4618 172.578 25.3306 168.035 25.3306C163.527 25.3306 160.642 23.5717 160.642 19.4677C160.642 15.3638 163.563 13.8248 168.035 13.8248C172.542 13.8248 175.463 15.4737 175.463 19.4677ZM183 19.2845C183 11.3331 176.798 7.77881 168.035 7.77881C159.236 7.77881 153.249 11.3331 153.249 19.2845C153.249 27.1993 158.839 31.45 167.999 31.45C177.23 31.45 183 27.1993 183 19.2845Z" fill="#646E73"/>
+      </symbol>
+
       <symbol id="logo-hugo" fill-rule="evenodd" stroke-width="17" viewBox="0 0 1493 391">
         <path fill="none" stroke="#646E73" d="M1345.211 24.704l112.262 64.305a43 43 0 0 1 21.627 37.312v142.237a40 40 0 0 1-20.702 35.037l-120.886 66.584a42 42 0 0 1-41.216-.389l-106.242-61.155a57 57 0 0 1-28.564-49.4V138.71a64 64 0 0 1 31.172-54.939l98.01-58.564a54 54 0 0 1 54.54-.503z"/>
         <path fill="none" stroke="#646E73" d="M958.07 22.82l117.31 66.78a41 41 0 0 1 20.72 35.64v139.5a45 45 0 0 1-23.1 39.32L955.68 369.4a44 44 0 0 1-43.54-.41l-105.82-61.6a56 56 0 0 1-27.83-48.4V140.07a68 68 0 0 1 33.23-58.44l98.06-58.35a48 48 0 0 1 48.3-.46z"/>
diff --git a/src/site/generators/eleventy.md b/src/site/generators/eleventy.md
index dfb5b3377..2d7716b07 100644
--- a/src/site/generators/eleventy.md
+++ b/src/site/generators/eleventy.md
@@ -18,7 +18,7 @@ templates:
   - HTML
   - Markdown
 description: A simpler static site generator
-startertemplaterepo: https://github.com/11ty/eleventy-base-blog
+startertemplaterepo: https://github.com/netlify-templates/eleventy-blog-starter
 twitter: eleven_ty
 ---
 
diff --git a/src/site/generators/jekyll.md b/src/site/generators/jekyll.md
index 67ac5d8d6..d71cbfe32 100644
--- a/src/site/generators/jekyll.md
+++ b/src/site/generators/jekyll.md
@@ -10,7 +10,6 @@ templates:
   - Liquid
 description: A simple, blog-aware, static site generator.
 twitter: jekyllrb
-startertemplaterepo: https://github.com/netlify-templates/jekyll-base
 ---
 
 Jekyll is a simple, blog-aware, static site generator perfect for personal, project, or organization sites. Think of it like a file-based CMS, without all the complexity. Jekyll takes your content, renders Markdown and Liquid templates, and spits out a complete, static website ready to be served by Apache, Nginx or another web server. Jekyll is the engine behind [GitHub Pages](https://pages.github.com), which you can use to host sites right from your GitHub repositories.