diff --git a/etc/default_data.json b/etc/default_data.json
index 9242e07cd..1a4fc0b6d 100644
--- a/etc/default_data.json
+++ b/etc/default_data.json
@@ -45174,7 +45174,7 @@
     "project_sources": [
         {
             "organization": "openstack",
-            "pattern": "^(openstack|x)/.*",
+            "pattern": "^(openstack|openstack-infra|inspur|osf|x)/.*",
             "exclude": [
                 "openstack", "gantt", "python-ganttclient", "deb-alembic", "deb-aodh", "deb-bandit", "deb-barbican",
                 "deb-ceilometer", "deb-ceilometermiddleware", "deb-cinder", "deb-congress", "deb-designate",
@@ -45270,15 +45270,6 @@
         {
             "organization": "airship"
         },
-        {
-            "organization": "openstack-dev"
-        },
-        {
-            "organization": "openstack-infra"
-        },
-        {
-            "organization": "openstack-ops"
-        },
         {
             "organization": "cloudfoundry",
             "uri": "github://"
@@ -46018,7 +46009,7 @@
         {
             "id": "all",
             "title": "OpenStack",
-            "modules": ["openstack", "openstack-infra", "openstack-dev", "unknown"]
+            "modules": ["openstack", "airship", "unknown"]
         },
         {
             "id": "openstack",
@@ -46035,11 +46026,17 @@
             "child": true,
             "modules": ["tc:approved-release"]
         },
+        {
+            "id": "airship-type",
+            "title": "Airship",
+            "child": true,
+            "modules": ["airship"]
+        },
         {
             "id": "openstack-others",
             "title": "Others",
             "child": true,
-            "modules": ["openstack-others", "airship-group", "unknown"]
+            "modules": ["openstack-others", "unknown"]
         },
         {
             "id": "cncf-group",