diff --git a/metadata/dist/metadata.json b/metadata/dist/metadata.json
index 4b555ba0..f5de4060 100644
--- a/metadata/dist/metadata.json
+++ b/metadata/dist/metadata.json
@@ -604,6 +604,7 @@
             "name": "aws-csharp",
             "runtime": "dotnet",
             "template": {
+                "displayName": "Starter",
                 "description": "A minimal AWS C# Pulumi program",
                 "important": true,
                 "config": {
@@ -611,6 +612,9 @@
                         "description": "The AWS region to deploy into",
                         "default": "us-east-1"
                     }
+                },
+                "metadata": {
+                    "cloud": "aws"
                 }
             }
         },
@@ -618,12 +622,16 @@
             "name": "aws-fsharp",
             "runtime": "dotnet",
             "template": {
+                "displayName": "Starter",
                 "description": "A minimal AWS F# Pulumi program",
                 "config": {
                     "aws:region": {
                         "description": "The AWS region to deploy into",
                         "default": "us-east-1"
                     }
+                },
+                "metadata": {
+                    "cloud": "aws"
                 }
             }
         },
@@ -631,6 +639,7 @@
             "name": "aws-go",
             "runtime": "go",
             "template": {
+                "displayName": "Starter",
                 "description": "A minimal AWS Go Pulumi program",
                 "important": true,
                 "config": {
@@ -638,6 +647,9 @@
                         "description": "The AWS region to deploy into",
                         "default": "us-east-1"
                     }
+                },
+                "metadata": {
+                    "cloud": "aws"
                 }
             }
         },
@@ -645,6 +657,7 @@
             "name": "aws-java",
             "runtime": "java",
             "template": {
+                "displayName": "Starter",
                 "description": "A minimal AWS Java Pulumi program",
                 "important": true,
                 "config": {
@@ -652,6 +665,9 @@
                         "description": "The AWS region to deploy into",
                         "default": "us-east-1"
                     }
+                },
+                "metadata": {
+                    "cloud": "aws"
                 }
             }
         },
@@ -664,6 +680,7 @@
                 }
             },
             "template": {
+                "displayName": "Starter",
                 "description": "A minimal AWS JavaScript Pulumi program",
                 "important": true,
                 "config": {
@@ -671,6 +688,9 @@
                         "description": "The AWS region to deploy into",
                         "default": "us-east-1"
                     }
+                },
+                "metadata": {
+                    "cloud": "aws"
                 }
             }
         },
@@ -787,6 +807,7 @@
             "name": "aws-python",
             "runtime": "python",
             "template": {
+                "displayName": "Starter",
                 "description": "A minimal AWS Python Pulumi program",
                 "important": true,
                 "config": {
@@ -794,6 +815,9 @@
                         "description": "The AWS region to deploy into",
                         "default": "us-east-1"
                     }
+                },
+                "metadata": {
+                    "cloud": "aws"
                 }
             }
         },
@@ -814,6 +838,7 @@
             "name": "aws-typescript",
             "runtime": "nodejs",
             "template": {
+                "displayName": "Starter",
                 "description": "A minimal AWS TypeScript Pulumi program",
                 "important": true,
                 "config": {
@@ -821,6 +846,9 @@
                         "description": "The AWS region to deploy into",
                         "default": "us-east-1"
                     }
+                },
+                "metadata": {
+                    "cloud": "aws"
                 }
             }
         },
@@ -828,12 +856,16 @@
             "name": "aws-visualbasic",
             "runtime": "dotnet",
             "template": {
+                "displayName": "Starter",
                 "description": "A minimal AWS VB.NET Pulumi program",
                 "config": {
                     "aws:region": {
                         "description": "The AWS region to deploy into",
                         "default": "us-east-1"
                     }
+                },
+                "metadata": {
+                    "cloud": "aws"
                 }
             }
         },
@@ -841,6 +873,7 @@
             "name": "aws-yaml",
             "runtime": "yaml",
             "template": {
+                "displayName": "Starter",
                 "description": "A minimal AWS Pulumi YAML program",
                 "important": true,
                 "config": {
@@ -848,6 +881,9 @@
                         "description": "The AWS region to deploy into",
                         "default": "us-east-1"
                     }
+                },
+                "metadata": {
+                    "cloud": "aws"
                 }
             }
         },
@@ -964,6 +1000,7 @@
             "name": "azure-csharp",
             "runtime": "dotnet",
             "template": {
+                "displayName": "Starter",
                 "description": "A minimal Azure Native C# Pulumi program",
                 "important": true,
                 "config": {
@@ -971,6 +1008,9 @@
                         "description": "The Azure location to use",
                         "default": "WestUS2"
                     }
+                },
+                "metadata": {
+                    "cloud": "azure"
                 }
             }
         },
@@ -978,12 +1018,16 @@
             "name": "azure-fsharp",
             "runtime": "dotnet",
             "template": {
+                "displayName": "Starter",
                 "description": "A minimal Azure Native F# Pulumi program",
                 "config": {
                     "azure-native:location": {
                         "description": "The Azure location to use",
                         "default": "WestUS2"
                     }
+                },
+                "metadata": {
+                    "cloud": "azure"
                 }
             }
         },
@@ -991,6 +1035,7 @@
             "name": "azure-go",
             "runtime": "go",
             "template": {
+                "displayName": "Starter",
                 "description": "A minimal Azure Native Go Pulumi program",
                 "important": true,
                 "config": {
@@ -998,6 +1043,9 @@
                         "description": "The Azure location to use",
                         "default": "WestUS2"
                     }
+                },
+                "metadata": {
+                    "cloud": "azure"
                 }
             }
         },
@@ -1005,6 +1053,7 @@
             "name": "azure-java",
             "runtime": "java",
             "template": {
+                "displayName": "Starter",
                 "description": "A minimal Azure Native Java Pulumi program",
                 "important": true,
                 "config": {
@@ -1012,6 +1061,9 @@
                         "description": "The Azure location to use",
                         "default": "WestUS2"
                     }
+                },
+                "metadata": {
+                    "cloud": "azure"
                 }
             }
         },
@@ -1024,6 +1076,7 @@
                 }
             },
             "template": {
+                "displayName": "Starter",
                 "description": "A minimal JavaScript Pulumi program with the native Azure provider",
                 "important": true,
                 "config": {
@@ -1031,6 +1084,9 @@
                         "description": "The Azure location to use",
                         "default": "WestUS2"
                     }
+                },
+                "metadata": {
+                    "cloud": "azure"
                 }
             }
         },
@@ -1038,6 +1094,7 @@
             "name": "azure-python",
             "runtime": "python",
             "template": {
+                "displayName": "Starter",
                 "description": "A minimal Azure Native Python Pulumi program",
                 "important": true,
                 "config": {
@@ -1045,6 +1102,9 @@
                         "description": "The Azure location to use",
                         "default": "WestUS2"
                     }
+                },
+                "metadata": {
+                    "cloud": "azure"
                 }
             }
         },
@@ -1052,6 +1112,7 @@
             "name": "azure-typescript",
             "runtime": "nodejs",
             "template": {
+                "displayName": "Starter",
                 "description": "A minimal Azure Native TypeScript Pulumi program",
                 "important": true,
                 "config": {
@@ -1059,6 +1120,9 @@
                         "description": "The Azure location to use",
                         "default": "WestUS2"
                     }
+                },
+                "metadata": {
+                    "cloud": "azure"
                 }
             }
         },
@@ -1066,6 +1130,7 @@
             "name": "azure-yaml",
             "runtime": "yaml",
             "template": {
+                "displayName": "Starter",
                 "description": "A minimal Azure Native Pulumi YAML program",
                 "important": true,
                 "config": {
@@ -1073,6 +1138,9 @@
                         "description": "The Azure location to use",
                         "default": "WestUS2"
                     }
+                },
+                "metadata": {
+                    "cloud": "azure"
                 }
             }
         },
@@ -1700,12 +1768,16 @@
             "name": "gcp-csharp",
             "runtime": "dotnet",
             "template": {
+                "displayName": "Starter",
                 "description": "A minimal Google Cloud C# Pulumi program",
                 "important": true,
                 "config": {
                     "gcp:project": {
                         "description": "The Google Cloud project to deploy into"
                     }
+                },
+                "metadata": {
+                    "cloud": "gcp"
                 }
             }
         },
@@ -1713,11 +1785,15 @@
             "name": "gcp-fsharp",
             "runtime": "dotnet",
             "template": {
+                "displayName": "Starter",
                 "description": "A minimal GCP F# Pulumi program",
                 "config": {
                     "gcp:project": {
                         "description": "The Google Cloud project to deploy into"
                     }
+                },
+                "metadata": {
+                    "cloud": "gcp"
                 }
             }
         },
@@ -1725,12 +1801,16 @@
             "name": "gcp-go",
             "runtime": "go",
             "template": {
+                "displayName": "Starter",
                 "description": "A minimal Google Cloud Go Pulumi program",
                 "important": true,
                 "config": {
                     "gcp:project": {
                         "description": "The Google Cloud project to deploy into"
                     }
+                },
+                "metadata": {
+                    "cloud": "gcp"
                 }
             }
         },
@@ -1738,12 +1818,16 @@
             "name": "gcp-java",
             "runtime": "java",
             "template": {
+                "displayName": "Starter",
                 "description": "A minimal Google Cloud Java Pulumi program",
                 "important": true,
                 "config": {
                     "gcp:project": {
                         "description": "The Google Cloud project to deploy into"
                     }
+                },
+                "metadata": {
+                    "cloud": "gcp"
                 }
             }
         },
@@ -1756,12 +1840,16 @@
                 }
             },
             "template": {
+                "displayName": "Starter",
                 "description": "A minimal Google Cloud JavaScript Pulumi program",
                 "important": true,
                 "config": {
                     "gcp:project": {
                         "description": "The Google Cloud project to deploy into"
                     }
+                },
+                "metadata": {
+                    "cloud": "gcp"
                 }
             }
         },
@@ -1769,12 +1857,16 @@
             "name": "gcp-python",
             "runtime": "python",
             "template": {
+                "displayName": "Starter",
                 "description": "A minimal Google Cloud Python Pulumi program",
                 "important": true,
                 "config": {
                     "gcp:project": {
                         "description": "The Google Cloud project to deploy into"
                     }
+                },
+                "metadata": {
+                    "cloud": "gcp"
                 }
             }
         },
@@ -1782,12 +1874,16 @@
             "name": "gcp-typescript",
             "runtime": "nodejs",
             "template": {
+                "displayName": "Starter",
                 "description": "A minimal Google Cloud TypeScript Pulumi program",
                 "important": true,
                 "config": {
                     "gcp:project": {
                         "description": "The Google Cloud project to deploy into"
                     }
+                },
+                "metadata": {
+                    "cloud": "gcp"
                 }
             }
         },
@@ -1795,11 +1891,15 @@
             "name": "gcp-visualbasic",
             "runtime": "dotnet",
             "template": {
+                "displayName": "Starter",
                 "description": "A minimal GCP VB.NET Pulumi program",
                 "config": {
                     "gcp:project": {
                         "description": "The Google Cloud project to deploy into"
                     }
+                },
+                "metadata": {
+                    "cloud": "gcp"
                 }
             }
         },
@@ -1807,12 +1907,16 @@
             "name": "gcp-yaml",
             "runtime": "yaml",
             "template": {
+                "displayName": "Starter",
                 "description": "A minimal Google Cloud Pulumi YAML program",
                 "important": true,
                 "config": {
                     "gcp:project": {
                         "description": "The Google Cloud project to deploy into"
                     }
+                },
+                "metadata": {
+                    "cloud": "gcp"
                 }
             }
         },
@@ -2508,15 +2612,23 @@
             "name": "kubernetes-csharp",
             "runtime": "dotnet",
             "template": {
+                "displayName": "Starter",
                 "description": "A minimal Kubernetes C# Pulumi program",
-                "important": true
+                "important": true,
+                "metadata": {
+                    "cloud": "kubernetes"
+                }
             }
         },
         "kubernetes-fsharp": {
             "name": "kubernetes-fsharp",
             "runtime": "dotnet",
             "template": {
-                "description": "A minimal Kubernetes F# Pulumi program"
+                "displayName": "Starter",
+                "description": "A minimal Kubernetes F# Pulumi program",
+                "metadata": {
+                    "cloud": "kubernetes"
+                }
             }
         },
         "kubernetes-gcp-csharp": {
@@ -2643,16 +2755,24 @@
             "name": "kubernetes-go",
             "runtime": "go",
             "template": {
+                "displayName": "Starter",
                 "description": "A minimal Kubernetes Go Pulumi program",
-                "important": true
+                "important": true,
+                "metadata": {
+                    "cloud": "kubernetes"
+                }
             }
         },
         "kubernetes-java": {
             "name": "kubernetes-java",
             "runtime": "java",
             "template": {
+                "displayName": "Starter",
                 "description": "A minimal Kubernetes Java Pulumi program",
-                "important": true
+                "important": true,
+                "metadata": {
+                    "cloud": "kubernetes"
+                }
             }
         },
         "kubernetes-javascript": {
@@ -2664,32 +2784,48 @@
                 }
             },
             "template": {
+                "displayName": "Starter",
                 "description": "A minimal Kubernetes JavaScript Pulumi program",
-                "important": true
+                "important": true,
+                "metadata": {
+                    "cloud": "kubernetes"
+                }
             }
         },
         "kubernetes-python": {
             "name": "kubernetes-python",
             "runtime": "python",
             "template": {
+                "displayName": "Starter",
                 "description": "A minimal Kubernetes Python Pulumi program",
-                "important": true
+                "important": true,
+                "metadata": {
+                    "cloud": "kubernetes"
+                }
             }
         },
         "kubernetes-typescript": {
             "name": "kubernetes-typescript",
             "runtime": "nodejs",
             "template": {
+                "displayName": "Starter",
                 "description": "A minimal Kubernetes TypeScript Pulumi program",
-                "important": true
+                "important": true,
+                "metadata": {
+                    "cloud": "kubernetes"
+                }
             }
         },
         "kubernetes-yaml": {
             "name": "kubernetes-yaml",
             "runtime": "yaml",
             "template": {
+                "displayName": "Starter",
                 "description": "A minimal Kubernetes Pulumi YAML program",
-                "important": true
+                "important": true,
+                "metadata": {
+                    "cloud": "kubernetes"
+                }
             }
         },
         "linode-go": {