diff --git a/cli/catalogue/generate.go b/cli/catalogue/generate.go
index 0a7670dd..9a7a207d 100644
--- a/cli/catalogue/generate.go
+++ b/cli/catalogue/generate.go
@@ -89,10 +89,21 @@ var catalogueGenerateCommand = &cli.Command{
 		}
 
 		catl := make(catalogue.RecipeCatalogue)
-		for recipeName := range repos {
-			// TODO: gather more metadata
-			catl[recipeName] = catalogue.RecipeMeta{
-				Name: recipeName,
+		for _, recipeMeta := range repos {
+			if recipeName != "" && recipeName != recipeMeta.Name {
+				continue
+			}
+			if _, exists := CatalogueSkipList[recipeMeta.Name]; exists {
+				continue
+			}
+
+			catl[recipeMeta.Name] = catalogue.RecipeMeta{
+				Name:          recipeName,
+				Repository:    recipeMeta.CloneURL,
+				DefaultBranch: recipeMeta.DefaultBranch,
+				Description:   recipeMeta.Description,
+				Website:       recipeMeta.Website,
+				Versions:      nil, // FIXME: once the new versions work goes down
 			}
 		}