diff --git a/docker/glance-base/Dockerfile.j2 b/docker/glance-base/Dockerfile.j2
index 748cb29..fabdaca 100644
--- a/docker/glance-base/Dockerfile.j2
+++ b/docker/glance-base/Dockerfile.j2
@@ -1,12 +1,9 @@
 FROM {{ namespace }}/openstack-base:{{ tag }}
 MAINTAINER {{ maintainer }}
 
-RUN curl -o glance-{{ branch }}.tar.gz http://tarballs.openstack.org/glance/glance-{{ branch }}.tar.gz \
-    && tar -zxvf glance-{{ branch }}.tar.gz
+{{ copy_sources("openstack/glance", "/glance") }}
 
-RUN mv glance*/ glance-{{ branch }}/ \
-    &&  ln -s glance-{{ branch }} /glance \
-    && useradd --user-group glance \
+RUN useradd --user-group glance \
     && /var/lib/microservices/venv/bin/pip --no-cache-dir install --upgrade -c /glance/requirements.txt /glance \
     && mkdir -p /var/lib/glance /etc/glance \
     && chown -R glance: /var/lib/glance \
diff --git a/service/files/defaults.yaml b/service/files/defaults.yaml
index 387688c..1911770 100644
--- a/service/files/defaults.yaml
+++ b/service/files/defaults.yaml
@@ -1,14 +1,19 @@
 configs:
-    glance_api_port: 9292
-    glance_registry_port: 9191
+  glance_api_port: 9292
+  glance_registry_port: 9191
 
-    glance_db_username: glance
-    glance_db_password: password
-    glance_db_name: glance
+  glance_db_username: glance
+  glance_db_password: password
+  glance_db_name: glance
 
-    glance_user: glance
-    glance_password: password
+  glance_user: glance
+  glance_password: password
 
-    glance_memcache_secret_key: secret_key
+  glance_memcache_secret_key: secret_key
 
-    glance_debug: false
+  glance_debug: false
+
+sources:
+  openstack/glance:
+    git_url: https://github.com/openstack/glance.git
+    git_ref: master