diff --git a/jeepyb/projects.py b/jeepyb/projects.py
index 0ada57c..cf126a2 100644
--- a/jeepyb/projects.py
+++ b/jeepyb/projects.py
@@ -82,10 +82,6 @@
           description: Best project ever.
     """
     return project_full_name in [
-        'openstack/openstack-manuals',
-        'openstack/api-site',
-        'openstack/tripleo-incubator',
-        'openstack/tempest',
         'openstack-dev/devstack',
         'openstack-infra/askbot-theme',
         'openstack-infra/config',
@@ -100,6 +96,12 @@
         'openstack-infra/publications',
         'openstack-infra/reviewday',
         'openstack-infra/statusbot',
+        'openstack/api-site',
+        'openstack/openstack-manuals',
+        'openstack/tempest',
+        'openstack/tripleo-heat-templates',
+        'openstack/tripleo-image-elements',
+        'openstack/tripleo-incubator',
         'stackforge/cookbook-openstack-block-storage',
         'stackforge/cookbook-openstack-common',
         'stackforge/cookbook-openstack-compute',
@@ -113,8 +115,6 @@
         'stackforge/cookbook-openstack-ops-messaging',
         'stackforge/cookbook-openstack-orchestration',
         'stackforge/openstack-chef-repo',
-        'stackforge/tripleo-heat-templates',
-        'stackforge/tripleo-image-elements',
     ]
 
 
@@ -132,23 +132,6 @@
     """
 
     project_map = {
-        'openstack/api-site': 'openstack-api-site',
-        'openstack/identity-api': 'openstack-api-site',
-        'openstack/object-api': 'openstack-api-site',
-        'openstack/volume-api': 'openstack-api-site',
-        'openstack/netconn-api': 'openstack-api-site',
-        'openstack/compute-api': 'openstack-api-site',
-        'openstack/image-api': 'openstack-api-site',
-        'openstack/database-api': 'openstack-api-site',
-        'openstack/quantum': 'neutron',
-        'openstack/python-quantumclient': 'python-neutronclient',
-        'openstack/oslo-incubator': 'oslo',
-        'openstack/tripleo-incubator': 'tripleo',
-        'openstack/django_openstack_auth': 'django-openstack-auth',
-        'openstack/savanna': 'savanna',
-        'openstack/savanna-dashboard': 'savanna',
-        'openstack/savanna-image-elements': 'savanna',
-        'openstack/savanna-extra': 'savanna',
         'openstack-infra/askbot-theme': 'openstack-ci',
         'openstack-infra/config': 'openstack-ci',
         'openstack-infra/devstack-gate': 'openstack-ci',
@@ -169,6 +152,25 @@
         'openstack-infra/reviewday': 'openstack-ci',
         'openstack-infra/statusbot': 'openstack-ci',
         'openstack-infra/zmq-event-publisher': 'openstack-ci',
+        'openstack/api-site': 'openstack-api-site',
+        'openstack/compute-api': 'openstack-api-site',
+        'openstack/database-api': 'openstack-api-site',
+        'openstack/django_openstack_auth': 'django-openstack-auth',
+        'openstack/identity-api': 'openstack-api-site',
+        'openstack/image-api': 'openstack-api-site',
+        'openstack/netconn-api': 'openstack-api-site',
+        'openstack/object-api': 'openstack-api-site',
+        'openstack/oslo-incubator': 'oslo',
+        'openstack/python-quantumclient': 'python-neutronclient',
+        'openstack/quantum': 'neutron',
+        'openstack/savanna': 'savanna',
+        'openstack/savanna-dashboard': 'savanna',
+        'openstack/savanna-extra': 'savanna',
+        'openstack/savanna-image-elements': 'savanna',
+        'openstack/tripleo-heat-templates': 'tripleo',
+        'openstack/tripleo-image-elements': 'tripleo',
+        'openstack/tripleo-incubator': 'tripleo',
+        'openstack/volume-api': 'openstack-api-site',
         'stackforge/cookbook-openstack-block-storage': 'openstack-chef',
         'stackforge/cookbook-openstack-common': 'openstack-chef',
         'stackforge/cookbook-openstack-compute': 'openstack-chef',
@@ -181,16 +183,14 @@
         'stackforge/cookbook-openstack-ops-database': 'openstack-chef',
         'stackforge/cookbook-openstack-ops-messaging': 'openstack-chef',
         'stackforge/cookbook-openstack-orchestration': 'openstack-chef',
+        'stackforge/fuel-astute': 'fuel',
+        'stackforge/fuel-main': 'fuel',
+        'stackforge/fuel-ostf': 'fuel',
+        'stackforge/fuel-web': 'fuel',
         'stackforge/openstack-chef-repo': 'openstack-chef',
         'stackforge/puppet-openstack_dev_env': 'puppet-openstack',
         'stackforge/puppet-quantum': 'puppet-neutron',
-        'stackforge/tripleo-heat-templates': 'tripleo',
-        'stackforge/tripleo-image-elements': 'tripleo',
         'stackforge/puppet-savanna': 'savanna',
-        'stackforge/fuel-web': 'fuel',
-        'stackforge/fuel-astute': 'fuel',
-        'stackforge/fuel-ostf': 'fuel',
-        'stackforge/fuel-main': 'fuel'
     }
     return project_map.get(project_full_name,
                            u.short_project_name(project_full_name))