diff --git a/Makefile b/Makefile
index 4c95e4bb2..4e55297d8 100644
--- a/Makefile
+++ b/Makefile
@@ -53,3 +53,7 @@ new-learn-module:
 .PHONY: new-learn-topic
 new-learn-topic:
 	./scripts/content/new-learn-topic.sh
+
+.PHONY: new-template
+new-template:
+	./scripts/content/new-template.sh
diff --git a/scripts/content/new-template.sh b/scripts/content/new-template.sh
new file mode 100755
index 000000000..264e02537
--- /dev/null
+++ b/scripts/content/new-template.sh
@@ -0,0 +1,58 @@
+#!/bin/bash
+
+set -o errexit -o pipefail
+
+type=""
+template=""
+content_dir="themes/default/content"
+
+prompt_for_template_type() {
+    read -p "Template type (e.g., static-website): " type
+
+    if [[ ! -z "$type" && -d "${content_dir}/templates/${type}" ]]; then
+        return
+    fi
+
+    create_template_type
+}
+
+create_template_type() {
+    echo
+    read -e -p "Template type '${type}' doesn't exist in '${content_dir}/templates'. Create it [y/n]? " choice
+
+    if [[ "$choice" == [Yy]* ]]; then
+        hugo new --kind templates/type --contentDir "${content_dir}" "templates/${type}"
+        return
+    fi
+
+    echo "Ok, exiting."
+    exit 0
+}
+
+prompt_for_template_name() {
+    read -p "Template name (e.g., azure): " template
+
+    if [ ! -z "$template" ]; then
+        hugo new --kind templates/template --contentDir "${content_dir}" "templates/${type}/${template}"
+        return
+    fi
+
+    echo "Please give the template a name."
+    echo
+    prompt_for_template_name
+}
+
+echo "So, you want to make a new Pulumi template? Great! 🙌"
+echo
+echo "Step 1:"
+echo "What type of template would you like to create?"
+echo
+prompt_for_template_type
+
+echo
+echo "Step 2:"
+echo "Now give your new template a URL-friendly name. For example, to
+create a new template under ${type} that'll live at
+https://pulumi.com/templates/${type}/azure, type 'azure'."
+echo
+prompt_for_template_name && echo && echo "Done! You can now run 'make serve' to get started."
diff --git a/themes/default/archetypes/templates/template/architecture.png b/themes/default/archetypes/templates/template/architecture.png
new file mode 100644
index 000000000..44a346913
Binary files /dev/null and b/themes/default/archetypes/templates/template/architecture.png differ
diff --git a/themes/default/archetypes/templates/template/index.md b/themes/default/archetypes/templates/template/index.md
new file mode 100644
index 000000000..c3def0f7c
--- /dev/null
+++ b/themes/default/archetypes/templates/template/index.md
@@ -0,0 +1,221 @@
+---
+title: "{{ replace .Name "-" " " | title }} Template"
+layout: template
+
+# Make sure this is description accurate for this template.
+meta_desc: The {{ replace .Name "-" " " | title }} template makes it easy to deploy a static website on $CLOUD with Pulumi, some service, and some other cloud service.
+
+# Appears on the cards on template-overview pages.
+card_desc: Deploy a $THING on $CLOUD with Pulumi, some cloud service, and some other cloud service.
+
+# Used for generating language-specific links to templates on GitHub. (Example: `static-website-aws`)
+template:
+    prefix: architecture-cloud
+
+# Used for generating links to sibling templates in the right-hand nav. Slug is this template's parent directory.
+cloud:
+  name: Amazon Web Services
+  slug: aws
+
+# Be sure to replace this image. Figma source file:
+# https://www.figma.com/file/lGrSpwbGGmbixEuewMbtkh/Template-Architecture-Diagrams?node-id=15%3A196
+meta_image: meta.png
+
+# The content below is meant help you get started and to serve as a guide to work by. Feel free to adjust it needed for your template.
+---
+
+The $CLOUD $ARCHITECTURE template deploys a $THING on $CLOUD with Pulumi. It uses this resource, this other resource, and probably some other awesome resource to accomplish some particular desirable outcome. The template generates a complete Pulumi program, including $INCLUDED_STUFF, to give you a working project out of the box that you can customize easily and extend to suit your needs.
+
+![An architecture diagram of the Pulumi $CLOUD $ARCHITECTURE template](./architecture.png)
+
+## Using this template
+
+To use this template to deploy your own $THING, make sure you've [installed Pulumi]({{< relref "/docs/get-started/install" >}}) and [configured your $CLOUD credentials]({{< relref "/registry/packages/$CLOUD/installation-configuration#credentials" >}}), then create a new [project]({{< relref "/docs/intro/concepts/project" >}}) using the template in your language of choice:
+
+{{% chooser language "typescript,python,go,csharp,yaml" / %}}
+
+{{% choosable language typescript %}}
+
+```bash
+$ mkdir my-site && cd my-site
+$ pulumi new architecture-cloud-typescript
+```
+
+{{% /choosable %}}
+
+{{% choosable language python %}}
+
+```bash
+$ mkdir my-site && cd my-site
+$ pulumi new architecture-cloud-python
+```
+
+{{% /choosable %}}
+
+{{% choosable language go %}}
+
+```bash
+$ mkdir my-site && cd my-site
+$ pulumi new architecture-cloud-go
+```
+
+{{% /choosable %}}
+
+{{% choosable language csharp %}}
+
+```bash
+$ mkdir my-site && cd my-site
+$ pulumi new architecture-cloud-csharp
+```
+
+{{% /choosable %}}
+
+{{% choosable language yaml %}}
+
+```bash
+$ mkdir my-site && cd my-site
+$ pulumi new architecture-cloud-yaml
+```
+
+{{% /choosable %}}
+
+Follow the prompts to complete the new-project wizard. When it's done, you'll have a complete Pulumi project that's ready to deploy and configured with the most common settings. Feel free to inspect the code in {{< langfile >}} for a closer look.
+
+## Deploying the project
+
+The template requires no additional configuration. Once the new project is created, you can deploy it immediately with [`pulumi up`]({{< relref "/docs/reference/cli/pulumi_up" >}}):
+
+```bash
+$ pulumi up
+```
+
+When the deployment completes, Pulumi exports the following [stack output]({{< relref "/docs/intro/concepts/stack#outputs" >}}) values:
+
+someOutput
+: The provider-assigned property of the widget resource.
+
+someOtherOutput
+: The fully-qualified HTTP URL of the widget resource.
+
+Output values like these are useful in many ways, most commonly as inputs for other stacks or related cloud resources. The computed `someOutput`, for example, can be used from the command line to open the newly deployed website in your favorite web browser:
+
+```bash
+$ open $(pulumi stack output cdnURL)
+```
+
+## Customizing the project
+
+Projects created with the $ARCHITECTURE template expose the following [configuration]({{< relref "/docs/intro/concepts/config" >}}) settings:
+
+someProp
+: The description of the property. Defaults to `someValue`.
+
+otherProp
+: The file to use for top-level pages. Defaults to `otherValue`.
+
+All of these settings are optional and may be adjusted either by editing the stack configuration file directly (by default, `Pulumi.dev.yaml`) or by changing their values with [`pulumi config set`]({{< relref "/docs/reference/cli/pulumi_config_set" >}}) as shown below.
+
+### Changing a config value
+
+If you already have a $THING you'd like to deploy on $CLOUD with Pulumi, you can do so either by replacing placeholder content in the `foo` folder or by configuring the stack to point to another folder on your computer with the `someProp` setting:
+
+```bash
+$ pulumi config set someProp ../some/value
+$ pulumi up
+```
+
+### Adjusting the code somehow
+
+By default, the generated program configures some resource in a particular way, which may or may not be the best fit for your project. You can adjust these settings by changing the code in {{< langfile >}}:
+
+{{% chooser language "typescript,python,go,csharp,yaml" / %}}
+
+{{% choosable language typescript %}}
+
+```diff
+const cdn = new aws.cloudfront.Distribution("cdn", {
+    defaultCacheBehavior: {
+-       minTtl: 600,
++       minTtl: 3600,
+```
+
+{{% /choosable %}}
+
+{{% choosable language python %}}
+
+```diff
+cdn = aws.cloudfront.Distribution(
+    default_cache_behavior=aws.cloudfront.DistributionDefaultCacheBehaviorArgs(
+-       min_ttl=600,
++       min_ttl=3600,
+```
+
+{{% /choosable %}}
+
+{{% choosable language go %}}
+
+```diff
+cdn, err := cloudfront.NewDistribution(ctx, "cdn", &cloudfront.DistributionArgs{
+    DefaultCacheBehavior: &cloudfront.DistributionDefaultCacheBehaviorArgs{
+-       MinTtl:     pulumi.Int(600),
++       MinTtl:     pulumi.Int(3600),
+```
+
+{{% /choosable %}}
+
+{{% choosable language csharp %}}
+
+```diff
+var cdn = new Aws.CloudFront.Distribution("cdn", new()
+{
+    DefaultCacheBehavior = new Aws.CloudFront.Inputs.DistributionDefaultCacheBehaviorArgs
+    {
+-       MinTtl = 600,
++       MinTtl = 3600,
+```
+
+{{% /choosable %}}
+
+{{% choosable language yaml %}}
+
+```diff
+cdn:
+  type: aws:cloudfront:Distribution
+  properties:
+    defaultCacheBehavior:
+-     minTtl: 600
++     minTtl: 600
+```
+
+{{% /choosable %}}
+
+Alternatively, you could make these settings configurable as well, which would allow them to vary between other stacks in your project.
+
+## Next steps
+
+This section is optional, but strongly encouraged.
+
+### Some next step
+
+A description of the next step.
+
+### Some other next step
+
+A description of the other next step.
+
+## Cleaning up
+
+You can cleanly destroy the stack and all of its infrastructure with [`pulumi destroy`]({{< relref "/docs/reference/cli/pulumi_destroy" >}}):
+
+```bash
+$ pulumi destroy
+```
+
+## Learn more
+
+Congratulations! You're now well on your way to managing a production-grade $THING on $CLOUD with Pulumi --- and there's lots more you can do from here:
+
+* Discover more architecture templates as they're available in [Templates &rarr;]({{< relref "/templates" >}})
+* Dive into the $CLOUD package by exploring the [API docs in the Registry &rarr;]({{< relref "/registry/packages/$CLOUD" >}})
+* Expand your understanding of how Pulumi works in [Architecture &amp; Concepts &rarr;]({{< relref "/docs/intro/concepts" >}})
+* Read up on the latest new features [in the Pulumi Blog &rarr;]({{< relref "/blog" >}})
diff --git a/themes/default/archetypes/templates/template/meta.png b/themes/default/archetypes/templates/template/meta.png
new file mode 100644
index 000000000..44a346913
Binary files /dev/null and b/themes/default/archetypes/templates/template/meta.png differ
diff --git a/themes/default/archetypes/templates/type/_index.md b/themes/default/archetypes/templates/type/_index.md
new file mode 100644
index 000000000..04e8c255e
--- /dev/null
+++ b/themes/default/archetypes/templates/type/_index.md
@@ -0,0 +1,14 @@
+---
+title: "{{ replace .Name "-" " " | title }} Templates"
+layout: overview
+meta_desc: Pulumi program templates that make it easy to deploy {{ replace .Name "-" " " }}s on AWS, Azure, or Google Cloud Platform.
+
+# Be sure to replace this image. Figma source file:
+# https://www.figma.com/file/lGrSpwbGGmbixEuewMbtkh/Template-Architecture-Diagrams?node-id=15%3A196
+meta_image: meta.png
+
+# Adjust this value to ensure the new template sorts as you'd like it to sort in the list.
+weight: 99
+---
+
+Pulumi program templates that make it easy to deploy {{ replace .Name "-" " " }}s on AWS, Azure, or Google Cloud Platform.
diff --git a/themes/default/archetypes/templates/type/meta.png b/themes/default/archetypes/templates/type/meta.png
new file mode 100644
index 000000000..44a346913
Binary files /dev/null and b/themes/default/archetypes/templates/type/meta.png differ