diff --git a/jeepyb/cmd/update_bug.py b/jeepyb/cmd/update_bug.py
index 3529128..be24c46 100644
--- a/jeepyb/cmd/update_bug.py
+++ b/jeepyb/cmd/update_bug.py
@@ -59,7 +59,8 @@
                               submitter, branch, git_log, related=False):
     subject = '%s merged to %s (%s)' % (fix_or_related_fix(related),
                                         u.short_project_name(project), branch)
-    git_url = 'http://github.com/%s/commit/%s' % (project, commit)
+    git_url = 'https://git.openstack.org/cgit/%s/commit/?id=%s' % (project,
+                                                                   commit)
     body = '''Reviewed:  %s
 Committed: %s
 Submitter: %s
diff --git a/jeepyb/projects.py b/jeepyb/projects.py
index 6d15549..090a891 100644
--- a/jeepyb/projects.py
+++ b/jeepyb/projects.py
@@ -35,8 +35,7 @@
     try:
         return registry[project_full_name]['launchpad']
     except KeyError:
-        return _hardcoded_git2lp(project_full_name)
-        # return u.short_project_name(project_full_name)
+        return u.short_project_name(project_full_name)
 
 
 def _is_no_launchpad(project_full_name, obj_type):
@@ -116,61 +115,3 @@
         'stackforge/cookbook-openstack-orchestration',
         'stackforge/openstack-chef-repo',
     ]
-
-
-def _hardcoded_git2lp(project_full_name):
-    """Convert Git repo name to Launchpad project.
-
-    This function should be removed when projects.yaml will be updated.
-    To specify launchpad project name you just need add parameter 'lp' to your
-    project declaration in projects.yaml
-
-    Example:
-        - project: some/project
-          launchpad: awesomeproject
-          description: Best project ever.
-    """
-
-    project_map = {
-        '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',
-        'stackforge/cookbook-openstack-dashboard': 'openstack-chef',
-        'stackforge/cookbook-openstack-identity': 'openstack-chef',
-        'stackforge/cookbook-openstack-image': 'openstack-chef',
-        'stackforge/cookbook-openstack-metering': 'openstack-chef',
-        'stackforge/cookbook-openstack-network': 'openstack-chef',
-        'stackforge/cookbook-openstack-object-storage': 'openstack-chef',
-        '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/puppet-savanna': 'savanna',
-    }
-    return project_map.get(project_full_name,
-                           u.short_project_name(project_full_name))