diff --git a/docker/cinder-base/Dockerfile.j2 b/docker/cinder-base/Dockerfile.j2
index 0f700fe..4899abf 100644
--- a/docker/cinder-base/Dockerfile.j2
+++ b/docker/cinder-base/Dockerfile.j2
@@ -1,11 +1,11 @@
 FROM {{ image_spec("openstack-base") }}
 MAINTAINER {{ maintainer }}
 
-COPY sources.list.debian /etc/apt/sources.list.d/ceph.list
+COPY {{ render('sources.list.debian.j2') }} /etc/apt/sources.list.d/ceph.list
 {{ copy_sources("openstack/cinder", "/cinder") }}
 
 RUN useradd --user-group -G microservices cinder \
-    && apt-key adv --recv-keys --keyserver hkp://keyserver.ubuntu.com:80 460F3994 \
+    && apt-key adv --recv-keys --keyserver {{ url.ceph.debian.keyserver }} {{ url.ceph.debian.keyid }} \
     && /var/lib/microservices/venv/bin/pip install --upgrade /cinder \
     && mkdir -p /etc/cinder /var/lib/cinder /home/cinder \
     && cp -r /cinder/etc/cinder/* /etc/cinder/ \
diff --git a/docker/cinder-base/sources.list.debian b/docker/cinder-base/sources.list.debian
deleted file mode 100644
index 017f3ba..0000000
--- a/docker/cinder-base/sources.list.debian
+++ /dev/null
@@ -1 +0,0 @@
-deb http://download.ceph.com/debian-jewel jessie main
diff --git a/docker/cinder-base/sources.list.debian.j2 b/docker/cinder-base/sources.list.debian.j2
new file mode 100644
index 0000000..b3bb799
--- /dev/null
+++ b/docker/cinder-base/sources.list.debian.j2
@@ -0,0 +1 @@
+deb {{ url.ceph.debian.repo }} jessie main