diff --git a/benchmarks/markdown_id/gatsby-config.js b/benchmarks/markdown_id/gatsby-config.js
index c380d4d0c2f40..969639a3cfa1a 100644
--- a/benchmarks/markdown_id/gatsby-config.js
+++ b/benchmarks/markdown_id/gatsby-config.js
@@ -3,10 +3,10 @@ module.exports = {
     title: `Gatsby MD Benchmark Blog`,
     author: `Myle Kathews`,
     description: `The MD starter blog turned into a benchmark`,
-    siteUrl: `https://gatsby-starter-blog-demo.netlify.com/`,
+    siteUrl: `https://gatsby-starter-blog-demo.netlify.app/`,
     social: {
-      twitter: `gatsbyjs`,
-    },
+      twitter: `gatsbyjs`
+    }
   },
   plugins: [
     `gatsby-plugin-benchmark-reporting`,
@@ -14,15 +14,15 @@ module.exports = {
       resolve: `gatsby-source-filesystem`,
       options: {
         path: `${__dirname}/markdown-pages`,
-        name: `blog`,
-      },
+        name: `blog`
+      }
     },
     {
       resolve: `gatsby-source-filesystem`,
       options: {
         path: `${__dirname}/content/assets`,
-        name: `assets`,
-      },
+        name: `assets`
+      }
     },
     {
       resolve: `gatsby-transformer-remark`,
@@ -31,28 +31,28 @@ module.exports = {
           {
             resolve: `gatsby-remark-images`,
             options: {
-              maxWidth: 590,
-            },
+              maxWidth: 590
+            }
           },
           {
             resolve: `gatsby-remark-responsive-iframe`,
             options: {
-              wrapperStyle: `margin-bottom: 1.0725rem`,
-            },
+              wrapperStyle: `margin-bottom: 1.0725rem`
+            }
           },
           `gatsby-remark-prismjs`,
           `gatsby-remark-copy-linked-files`,
-          `gatsby-remark-smartypants`,
-        ],
-      },
+          `gatsby-remark-smartypants`
+        ]
+      }
     },
     `gatsby-transformer-sharp`,
     `gatsby-plugin-sharp`,
     {
       resolve: `gatsby-plugin-google-analytics`,
       options: {
-        trackingId: `do-not-track`,
-      },
+        trackingId: `do-not-track`
+      }
     },
     {
       resolve: `gatsby-plugin-manifest`,
@@ -63,16 +63,16 @@ module.exports = {
         background_color: `#ffffff`,
         theme_color: `#663399`,
         display: `minimal-ui`,
-        icon: `content/assets/gatsby-icon.png`,
-      },
+        icon: `content/assets/gatsby-icon.png`
+      }
     },
     `gatsby-plugin-offline`,
     `gatsby-plugin-react-helmet`,
     {
       resolve: `gatsby-plugin-typography`,
       options: {
-        pathToConfigModule: `src/utils/typography`,
-      },
-    },
-  ],
+        pathToConfigModule: `src/utils/typography`
+      }
+    }
+  ]
 }
diff --git a/benchmarks/markdown_slug/gatsby-config.js b/benchmarks/markdown_slug/gatsby-config.js
index c380d4d0c2f40..969639a3cfa1a 100644
--- a/benchmarks/markdown_slug/gatsby-config.js
+++ b/benchmarks/markdown_slug/gatsby-config.js
@@ -3,10 +3,10 @@ module.exports = {
     title: `Gatsby MD Benchmark Blog`,
     author: `Myle Kathews`,
     description: `The MD starter blog turned into a benchmark`,
-    siteUrl: `https://gatsby-starter-blog-demo.netlify.com/`,
+    siteUrl: `https://gatsby-starter-blog-demo.netlify.app/`,
     social: {
-      twitter: `gatsbyjs`,
-    },
+      twitter: `gatsbyjs`
+    }
   },
   plugins: [
     `gatsby-plugin-benchmark-reporting`,
@@ -14,15 +14,15 @@ module.exports = {
       resolve: `gatsby-source-filesystem`,
       options: {
         path: `${__dirname}/markdown-pages`,
-        name: `blog`,
-      },
+        name: `blog`
+      }
     },
     {
       resolve: `gatsby-source-filesystem`,
       options: {
         path: `${__dirname}/content/assets`,
-        name: `assets`,
-      },
+        name: `assets`
+      }
     },
     {
       resolve: `gatsby-transformer-remark`,
@@ -31,28 +31,28 @@ module.exports = {
           {
             resolve: `gatsby-remark-images`,
             options: {
-              maxWidth: 590,
-            },
+              maxWidth: 590
+            }
           },
           {
             resolve: `gatsby-remark-responsive-iframe`,
             options: {
-              wrapperStyle: `margin-bottom: 1.0725rem`,
-            },
+              wrapperStyle: `margin-bottom: 1.0725rem`
+            }
           },
           `gatsby-remark-prismjs`,
           `gatsby-remark-copy-linked-files`,
-          `gatsby-remark-smartypants`,
-        ],
-      },
+          `gatsby-remark-smartypants`
+        ]
+      }
     },
     `gatsby-transformer-sharp`,
     `gatsby-plugin-sharp`,
     {
       resolve: `gatsby-plugin-google-analytics`,
       options: {
-        trackingId: `do-not-track`,
-      },
+        trackingId: `do-not-track`
+      }
     },
     {
       resolve: `gatsby-plugin-manifest`,
@@ -63,16 +63,16 @@ module.exports = {
         background_color: `#ffffff`,
         theme_color: `#663399`,
         display: `minimal-ui`,
-        icon: `content/assets/gatsby-icon.png`,
-      },
+        icon: `content/assets/gatsby-icon.png`
+      }
     },
     `gatsby-plugin-offline`,
     `gatsby-plugin-react-helmet`,
     {
       resolve: `gatsby-plugin-typography`,
       options: {
-        pathToConfigModule: `src/utils/typography`,
-      },
-    },
-  ],
+        pathToConfigModule: `src/utils/typography`
+      }
+    }
+  ]
 }
diff --git a/docs/blog/2018-1-18-strapi-and-gatsby/index.md b/docs/blog/2018-1-18-strapi-and-gatsby/index.md
index e885350bdb474..ecc5d74aebbbe 100644
--- a/docs/blog/2018-1-18-strapi-and-gatsby/index.md
+++ b/docs/blog/2018-1-18-strapi-and-gatsby/index.md
@@ -76,7 +76,7 @@ _Important links from Video:_
 - [Strapi Official Website](https://strapi.io/)
 - [Gatsby JS Official Website](/)
 - [Gatsby JS Starters](/starters/?v=2)
-- [Gatsby JS Default Starter Demo](https://gatsby-starter-default-demo.netlify.com/)
+- [Gatsby JS Default Starter Demo](https://gatsby-starter-default-demo.netlify.app/)
 
 ### 2. Installation
 
diff --git a/docs/docs/gatsby-repl.md b/docs/docs/gatsby-repl.md
index 6411eea4b3cf3..e89f3dd048ef4 100644
--- a/docs/docs/gatsby-repl.md
+++ b/docs/docs/gatsby-repl.md
@@ -194,7 +194,7 @@ gatsby > siteConfig.siteMetadata
 { title: 'Gatsby Starter Blog',
   author: 'Kyle Mathews',
   description: 'A starter blog demonstrating what Gatsby can do.',
-  siteUrl: 'https://gatsby-starter-blog-demo.netlify.com/',
+  siteUrl: 'https://gatsby-starter-blog-demo.netlify.app/',
   social: { twitter: 'kylemathews' } } // returns just the siteMetadata value of the config.
 ```
 
diff --git a/docs/docs/starters.md b/docs/docs/starters.md
index a9402f1ce80ba..b6412e274b5a6 100644
--- a/docs/docs/starters.md
+++ b/docs/docs/starters.md
@@ -64,9 +64,9 @@ Official starters are maintained by Gatsby.
 
 | Starter                                                                                      | Demo/Docs                                                    | Use case                       | Features                     |
 | -------------------------------------------------------------------------------------------- | ------------------------------------------------------------ | ------------------------------ | ---------------------------- |
-| [gatsby-starter-default](https://github.com/gatsbyjs/gatsby-starter-default)                 | [Demo](https://gatsby-starter-default-demo.netlify.com/)     | Appropriate for most use cases | General Gatsby site          |
-| [gatsby-starter-blog](https://github.com/gatsbyjs/gatsby-starter-blog)                       | [Demo](https://gatsby-starter-blog-demo.netlify.com/)        | Create a basic blog            | Blog post pages and listings |
-| [gatsby-starter-hello-world](https://github.com/gatsbyjs/gatsby-starter-hello-world)         | [Demo](https://gatsby-starter-hello-world-demo.netlify.com/) | Learn Gatsby                   | Gatsby bare essentials       |
+| [gatsby-starter-default](https://github.com/gatsbyjs/gatsby-starter-default)                 | [Demo](https://gatsby-starter-default-demo.netlify.app/)     | Appropriate for most use cases | General Gatsby site          |
+| [gatsby-starter-blog](https://github.com/gatsbyjs/gatsby-starter-blog)                       | [Demo](https://gatsby-starter-blog-demo.netlify.app/)        | Create a basic blog            | Blog post pages and listings |
+| [gatsby-starter-hello-world](https://github.com/gatsbyjs/gatsby-starter-hello-world)         | [Demo](https://gatsby-starter-hello-world-demo.netlify.app/) | Learn Gatsby                   | Gatsby bare essentials       |
 | [gatsby-starter-blog-theme](https://github.com/gatsbyjs/gatsby-starter-blog-theme)           | [Docs](/docs/themes/getting-started/)                        | Blog posts and pages           | Gatsby themes                |
 | [gatsby-starter-theme-workspace](https://github.com/gatsbyjs/gatsby-starter-theme-workspace) | [Docs](/docs/themes/building-themes/)                        | Building Gatsby Themes         | Minimal theme workspace      |
 
diff --git a/docs/starters.yml b/docs/starters.yml
index 9f23541f6d15c..41e37dc1e4a0d 100644
--- a/docs/starters.yml
+++ b/docs/starters.yml
@@ -123,7 +123,7 @@
     - Password Reset
     - Multi-Factor Authentication
     - Styling with Bootstrap and Sass
-- url: https://gatsby-starter-blog-demo.netlify.com/
+- url: https://gatsby-starter-blog-demo.netlify.app/
   repo: https://github.com/gatsbyjs/gatsby-starter-blog
   description: official blog
   tags:
@@ -138,7 +138,7 @@
     - Includes plugins for easy, beautiful typography
     - Includes React Helmet to allow editing site meta tags
     - Includes plugins for offline support out of the box
-- url: https://gatsby-starter-default-demo.netlify.com/
+- url: https://gatsby-starter-default-demo.netlify.app/
   repo: https://github.com/gatsbyjs/gatsby-starter-default
   description: official default
   tags:
@@ -583,7 +583,7 @@
   features:
     - Barebones configuration for using the Grommet design system
     - Uses Sass (with CSS modules support)
-- url: https://gatsby-starter-hello-world-demo.netlify.com/
+- url: https://gatsby-starter-hello-world-demo.netlify.app/
   repo: https://github.com/gatsbyjs/gatsby-starter-hello-world
   description: official hello world
   tags:
@@ -679,7 +679,7 @@
     - Write your blog posts in MDX
     - Offline Support, WebApp Manifest, SEO
     - Code highlighting (with prism-react-renderer) and live preview (with react-live)
-- url: https://gatsby-starter-modern-demo.netlify.com/
+- url: https://gatsby-starter-modern-demo.netlify.app/
   repo: https://github.com/kripod/gatsby-starter-modern
   description: no description yet
   tags:
@@ -1703,7 +1703,7 @@
     - Portfolio Page
     - Timline (Journey) page
     - Minimal
-- url: https://gatsby-starter-blog-mdx-demo.netlify.com
+- url: https://gatsby-starter-blog-mdx-demo.netlify.app
   repo: https://github.com/hagnerd/gatsby-starter-blog-mdx
   description: A fork of the Official Gatsby Starter Blog with support for MDX out of the box.
   tags:
@@ -1713,7 +1713,7 @@
     - MDX
     - Blog
     - RSS Feed
-- url: https://gatsby-tailwindcss-sass-starter-demo.netlify.com/
+- url: https://gatsby-tailwindcss-sass-starter-demo.netlify.app/
   repo: https://github.com/durianstack/gatsby-tailwindcss-sass-starter
   description: Just another Gatsby Tailwind with SASS starter
   tags:
@@ -4290,7 +4290,7 @@
     - Mobile friendly responsive design made to be customized or leave as is
     - Separate components for everything
     - ...and more
-- url: https://gatsby-tailwind-emotion-starter-demo.netlify.com/
+- url: https://gatsby-tailwind-emotion-starter-demo.netlify.app/
   repo: https://github.com/pauloelias/gatsby-tailwind-emotion-starter
   description: Gatsby starter using the latest Tailwind CSS and Emotion.
   tags:
@@ -4585,7 +4585,7 @@
     - TSLint
     - Tailwind CSS v1
     - PostCSS + PurgeCSS
-- url: https://gatsby-starter-blog-tailwindcss-demo.netlify.com/
+- url: https://gatsby-starter-blog-tailwindcss-demo.netlify.app/
   repo: https://github.com/andrezzoid/gatsby-starter-blog-tailwindcss
   description: Gatsby blog starter with TailwindCSS
   tags:
@@ -4621,7 +4621,7 @@
     - Extendable
     - Feature filters
     - Performant
-- url: https://gatsby-theme-phoenix-demo.netlify.com
+- url: https://gatsby-theme-phoenix-demo.netlify.app
   repo: https://github.com/arshad/gatsby-theme-phoenix
   description: A personal blogging and portfolio theme for Gatsby with great typography and dark mode.
   tags:
@@ -4823,7 +4823,7 @@
     - ESLint(Airbnb) for linting
     - Prettier code formatting
     - gh-pages for deploying to GitHub Pages
-- url: https://gatsby-starter-boilerplatev-kontent-demo.netlify.com/
+- url: https://gatsby-starter-boilerplatev-kontent-demo.netlify.app/
   repo: https://github.com/viperfx07/gatsby-starter-boilerplatev-kontent
   description: A Gatsby starter using BoilerplateV for Kentico Kontent.
   tags:
@@ -5551,7 +5551,7 @@
     - Light and Dark themes based on CSS variables (persisted state)
     - Font Awesome
     - Normalize.css
-- url: https://gatsby-notion-demo.netlify.com/
+- url: https://gatsby-notion-demo.netlify.app/
   repo: https://github.com/conradlin/gatsby-starter-strata-notion
   description: Gatsby starter utilizing Notion as a CMS based on strata site template
   tags:
@@ -5598,7 +5598,7 @@
     - Tailwind CSS and SCSS for styling
     - Typescript for easier debugging and development, strict types, etc
     - Netlify for hosting
-- url: https://gatsby-simple-blog-with-asciidoctor-demo.netlify.com
+- url: https://gatsby-simple-blog-with-asciidoctor-demo.netlify.app
   repo: https://github.com/hitsuji-no-shippo/gatsby-simple-blog-with-asciidoctor
   description: A Gatsby blog with Asciidoctor. Forked from thundermiracle/gatsby-simple-blog.
   tags:
diff --git a/docs/tutorial/part-eight/index.md b/docs/tutorial/part-eight/index.md
index 4f5ad7fd0f4ea..1b3a25f13cf51 100644
--- a/docs/tutorial/part-eight/index.md
+++ b/docs/tutorial/part-eight/index.md
@@ -357,7 +357,7 @@ Lighthouse is a great tool for site improvements and learning -- Continue lookin
 
 1. [Gatsby's Default Starter](https://github.com/gatsbyjs/gatsby-starter-default): Kick off your project with this default boilerplate. This barebones starter ships with the main Gatsby configuration files you might need. _[working example](https://gatsbyjs.github.io/gatsby-starter-default/)_
 2. [Gatsby's Blog Starter](https://github.com/gatsbyjs/gatsby-starter-blog): Gatsby starter for creating an awesome and blazing-fast blog. _[working example](https://gatsbyjs.github.io/gatsby-starter-blog/)_
-3. [Gatsby's Hello-World Starter](https://github.com/gatsbyjs/gatsby-starter-hello-world): Gatsby Starter with the bare essentials needed for a Gatsby site. _[working example](https://gatsby-starter-hello-world-demo.netlify.com/)_
+3. [Gatsby's Hello-World Starter](https://github.com/gatsbyjs/gatsby-starter-hello-world): Gatsby Starter with the bare essentials needed for a Gatsby site. _[working example](https://gatsby-starter-hello-world-demo.netlify.app/)_
 
 ## That's all, folks
 
diff --git a/e2e-tests/development-runtime/README.md b/e2e-tests/development-runtime/README.md
index 1066234af49de..61b4f718f9e4a 100644
--- a/e2e-tests/development-runtime/README.md
+++ b/e2e-tests/development-runtime/README.md
@@ -7,7 +7,7 @@
   Gatsby's default starter
 </h1>
 
-Kick off your project with this default boilerplate ([live demo](https://gatsby-starter-default-demo.netlify.com/)). This barebones starter ships with the main Gatsby configuration files you might need.
+Kick off your project with this default boilerplate ([live demo](https://gatsby-starter-default-demo.netlify.app/)). This barebones starter ships with the main Gatsby configuration files you might need.
 
 _Have another more specific idea? You may want to check out our vibrant collection of [official and community-created starters](https://www.gatsbyjs.org/docs/gatsby-starters/)._
 
diff --git a/markdown.config.js b/markdown.config.js
index 0664da5b69595..3ecc9bd09b2c7 100644
--- a/markdown.config.js
+++ b/markdown.config.js
@@ -25,7 +25,7 @@ module.exports = {
           .map(name => {
             const starter = starters[name]
             return `
-            |[${name}](https://github.com/gatsbyjs/gatsby-starter-${name})|[gatsby-starter-${name}-demo.netlify.com](https://gatsby-starter-${name}-demo.netlify.com/)|${starter.description}|
+            |[${name}](https://github.com/gatsbyjs/gatsby-starter-${name})|[gatsby-starter-${name}-demo.netlify.app](https://gatsby-starter-${name}-demo.netlify.app/)|${starter.description}|
           `.trim()
           })
           .join(`\n`)}
diff --git a/starters/README.md b/starters/README.md
index 70b16e4e70aac..92a5afa8dca75 100644
--- a/starters/README.md
+++ b/starters/README.md
@@ -62,9 +62,9 @@ A starter is a simplified example to get up and running with Gatsby quickly and
 
 |                                 Name                                  | Demo                                                                                                | Description                                                   |
 | :-------------------------------------------------------------------: | --------------------------------------------------------------------------------------------------- | ------------------------------------------------------------- |
-|        [blog](https://github.com/gatsbyjs/gatsby-starter-blog)        | [gatsby-starter-blog-demo.netlify.com](https://gatsby-starter-blog-demo.netlify.com/)               | A starter for a blog powered by Gatsby and Markdown           |
-|     [default](https://github.com/gatsbyjs/gatsby-starter-default)     | [gatsby-starter-default-demo.netlify.com](https://gatsby-starter-default-demo.netlify.com/)         | A simple starter to get up and developing quickly with Gatsby |
-| [hello-world](https://github.com/gatsbyjs/gatsby-starter-hello-world) | [gatsby-starter-hello-world-demo.netlify.com](https://gatsby-starter-hello-world-demo.netlify.com/) | A simplified bare-bones starter for Gatsby                    |
+|        [blog](https://github.com/gatsbyjs/gatsby-starter-blog)        | [gatsby-starter-blog-demo.netlify.app](https://gatsby-starter-blog-demo.netlify.app/)               | A starter for a blog powered by Gatsby and Markdown           |
+|     [default](https://github.com/gatsbyjs/gatsby-starter-default)     | [gatsby-starter-default-demo.netlify.app](https://gatsby-starter-default-demo.netlify.app/)         | A simple starter to get up and developing quickly with Gatsby |
+| [hello-world](https://github.com/gatsbyjs/gatsby-starter-hello-world) | [gatsby-starter-hello-world-demo.netlify.app](https://gatsby-starter-hello-world-demo.netlify.app/) | A simplified bare-bones starter for Gatsby                    |
 
 <!-- AUTO-GENERATED-CONTENT:END -->
 
diff --git a/starters/blog/gatsby-config.js b/starters/blog/gatsby-config.js
index 0c0fe58c6d63a..b902ffe474497 100644
--- a/starters/blog/gatsby-config.js
+++ b/starters/blog/gatsby-config.js
@@ -3,28 +3,28 @@ module.exports = {
     title: `Gatsby Starter Blog`,
     author: {
       name: `Kyle Mathews`,
-      summary: `who lives and works in San Francisco building useful things.`,
+      summary: `who lives and works in San Francisco building useful things.`
     },
     description: `A starter blog demonstrating what Gatsby can do.`,
-    siteUrl: `https://gatsby-starter-blog-demo.netlify.com/`,
+    siteUrl: `https://gatsby-starter-blog-demo.netlify.app/`,
     social: {
-      twitter: `kylemathews`,
-    },
+      twitter: `kylemathews`
+    }
   },
   plugins: [
     {
       resolve: `gatsby-source-filesystem`,
       options: {
         path: `${__dirname}/content/blog`,
-        name: `blog`,
-      },
+        name: `blog`
+      }
     },
     {
       resolve: `gatsby-source-filesystem`,
       options: {
         path: `${__dirname}/content/assets`,
-        name: `assets`,
-      },
+        name: `assets`
+      }
     },
     {
       resolve: `gatsby-transformer-remark`,
@@ -33,20 +33,20 @@ module.exports = {
           {
             resolve: `gatsby-remark-images`,
             options: {
-              maxWidth: 590,
-            },
+              maxWidth: 590
+            }
           },
           {
             resolve: `gatsby-remark-responsive-iframe`,
             options: {
-              wrapperStyle: `margin-bottom: 1.0725rem`,
-            },
+              wrapperStyle: `margin-bottom: 1.0725rem`
+            }
           },
           `gatsby-remark-prismjs`,
           `gatsby-remark-copy-linked-files`,
-          `gatsby-remark-smartypants`,
-        ],
-      },
+          `gatsby-remark-smartypants`
+        ]
+      }
     },
     `gatsby-transformer-sharp`,
     `gatsby-plugin-sharp`,
@@ -54,7 +54,7 @@ module.exports = {
       resolve: `gatsby-plugin-google-analytics`,
       options: {
         //trackingId: `ADD YOUR TRACKING ID HERE`,
-      },
+      }
     },
     `gatsby-plugin-feed`,
     {
@@ -66,18 +66,18 @@ module.exports = {
         background_color: `#ffffff`,
         theme_color: `#663399`,
         display: `minimal-ui`,
-        icon: `content/assets/gatsby-icon.png`,
-      },
+        icon: `content/assets/gatsby-icon.png`
+      }
     },
     `gatsby-plugin-react-helmet`,
     {
       resolve: `gatsby-plugin-typography`,
       options: {
-        pathToConfigModule: `src/utils/typography`,
-      },
-    },
+        pathToConfigModule: `src/utils/typography`
+      }
+    }
     // this (optional) plugin enables Progressive Web App + Offline functionality
     // To learn more, visit: https://gatsby.dev/offline
     // `gatsby-plugin-offline`,
-  ],
+  ]
 }