diff --git a/modules/gerritbot/files/gerritbot_channel_config.yaml b/modules/gerritbot/files/gerritbot_channel_config.yaml
index 2a9abb40e7..c69784f931 100644
--- a/modules/gerritbot/files/gerritbot_channel_config.yaml
+++ b/modules/gerritbot/files/gerritbot_channel_config.yaml
@@ -458,7 +458,7 @@ openstack-glance:
     projects:
       - openstack/glance
       - openstack/glance-specs
-      - openstack/glance.store
+      - openstack/glance_store
       - openstack/python-glanceclient
     branches:
       - master
diff --git a/modules/openstack_project/files/jenkins_job_builder/config/projects.yaml b/modules/openstack_project/files/jenkins_job_builder/config/projects.yaml
index 137c0d4902..0774fb28b3 100644
--- a/modules/openstack_project/files/jenkins_job_builder/config/projects.yaml
+++ b/modules/openstack_project/files/jenkins_job_builder/config/projects.yaml
@@ -693,7 +693,7 @@
       - specs-jobs
 
 - project:
-    name: glance.store
+    name: glance_store
     node: 'bare-precise || bare-trusty'
     tarball-site: tarballs.openstack.org
     doc-publisher-site: docs.openstack.org
diff --git a/modules/openstack_project/files/review.projects.yaml b/modules/openstack_project/files/review.projects.yaml
index bc0b14e25c..1a4300678b 100644
--- a/modules/openstack_project/files/review.projects.yaml
+++ b/modules/openstack_project/files/review.projects.yaml
@@ -271,10 +271,9 @@
 - project: openstack/glance
   docimpact-group: openstack-manuals
 - project: openstack/glance-specs
-- project: openstack/glance.store
+- project: openstack/glance_store
   description: Glance stores library
   group: glance
-  upstream: https://github.com/FlaPer87/glance.store.git
   acl-config: /home/gerrit2/acls/openstack/python-glanceclient.config
 - project: openstack/governance
   description: OpenStack Technical Committee Decisions
diff --git a/modules/openstack_project/files/zuul/layout.yaml b/modules/openstack_project/files/zuul/layout.yaml
index 82d8def4c8..97fdc2b168 100644
--- a/modules/openstack_project/files/zuul/layout.yaml
+++ b/modules/openstack_project/files/zuul/layout.yaml
@@ -951,7 +951,7 @@ projects:
     gate:
       - gate-glance-specs-python27
 
-  - name: openstack/glance.store
+  - name: openstack/glance_store
     template:
       - name: merge-check
       - name: python-jobs
@@ -973,9 +973,9 @@ projects:
       - check-tripleo-novabm-overcloud-precise-nonha
       - check-tripleo-novabm-overcloud-f20-nonha
     pre-release:
-      - glance.store-tarball
+      - glance_store-tarball
     release:
-      - glance.store-tarball
+      - glance_store-tarball
 
   - name: openstack/heat
     template: