diff --git a/registry/github_package_registry.go b/registry/github_package_registry.go
index a7de76e16..10873c140 100644
--- a/registry/github_package_registry.go
+++ b/registry/github_package_registry.go
@@ -81,7 +81,17 @@ func (g GithubPackageRegistry) ListTypes(regex *regexp.Regexp) ([]Type, error) {
 		}
 	}
 
-	// TODO(jackgr): Use the supplied regex to filter the results.
+	if regex != nil {
+		var matchTypes []Type
+		for _, retType := range retTypes {
+			if regex.MatchString(retType.String()) {
+				matchTypes = append(matchTypes, retType)
+			}
+		}
+
+		return matchTypes, nil
+	}
+
 	return retTypes, nil
 }
 
diff --git a/registry/github_template_registry.go b/registry/github_template_registry.go
index 40f34968b..42f69da77 100644
--- a/registry/github_template_registry.go
+++ b/registry/github_template_registry.go
@@ -108,7 +108,17 @@ func (g GithubTemplateRegistry) ListTypes(regex *regexp.Regexp) ([]Type, error)
 		}
 	}
 
-	// TODO(jackgr): Use the supplied regex to filter the results.
+	if regex != nil {
+		var matchTypes []Type
+		for _, retType := range retTypes {
+			if regex.MatchString(retType.String()) {
+				matchTypes = append(matchTypes, retType)
+			}
+		}
+
+		return matchTypes, nil
+	}
+
 	return retTypes, nil
 }