diff --git a/merlin b/merlin
index ede2fe7..ee9ec7e 100644
--- a/merlin
+++ b/merlin
@@ -39,7 +39,7 @@ merlin-managementnode001
 merlin-managementnode002
 
 [cinder-controller]
-merlin-managementnode002
+merlin-managementnode003
 
 [cinder-storage]
 merlin-managementnode002
diff --git a/roles/cinder-storage/templates/cinder-storage.service b/roles/cinder-storage/templates/cinder-storage.service
index 14a6917..df85aeb 100644
--- a/roles/cinder-storage/templates/cinder-storage.service
+++ b/roles/cinder-storage/templates/cinder-storage.service
@@ -12,7 +12,7 @@ ExecStart=/usr/bin/docker run --name %n \
   --privileged \
   {{ env_vars | replace('\n', '') }} \
   -v /srv/cinder-storage/root:/root \
-  -v /srv/cinder-storage/etc/ceph:/etc/ceph \
+  -v /etc/ceph:/etc/ceph \
   -p 8777:8776 \
   -p 3260:3260 \
   {{ docker_image }}
diff --git a/roles/nova-compute/templates/nova-compute.service b/roles/nova-compute/templates/nova-compute.service
index a03fc84..e5ab574 100644
--- a/roles/nova-compute/templates/nova-compute.service
+++ b/roles/nova-compute/templates/nova-compute.service
@@ -45,7 +45,7 @@ ExecStart=/usr/bin/docker run --name %n \
     -v /var/lib/nova/instances:/var/lib/nova/instances \
     -v /lib/modules:/lib/modules \
     -v /etc/machine-id:/etc/machine-id \
-    -v /srv/nova-compute/etc/ceph:/etc/ceph \
+    -v /etc/ceph:/etc/ceph \
     --network host \
     {{ docker_image }} /etc/run.sh
 
diff --git a/settings.yml b/settings.yml
index adc7b3c..cd6ff2d 100644
--- a/settings.yml
+++ b/settings.yml
@@ -10,3 +10,5 @@
 - subnet_range: 172.23.128.0/24
 
 - rsa_pub: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDStPUPXkcu81onUm/le54JCu174yXJJDsthDr96Mv8irBVBWuy5FxnaASuDpmC4QE4s0UAIg1iq/SWrr8qdBQ4OVuYFiW0S7ZJvcoKr/40Wh+T5MeltGQfmkDp6kBsfaMSo6M4tF1c8i+XgOgxb4fxHYb8mFhseztRLx6McxJJJLB0nu+T12WQ01nl0XtwD+3EsZWfxRH0KA59VHZSe3Anc5z+Fm7WU+1Vzy6/pkiIhVReI1L6VVhZsIdSu3fQK6fHQcujtfuw6RKEpisZQqnxMUviWQ98yeQXHk6Nx840WCh3vvKveEAoC4Y/UEZa1TMe6PczfUaLjaidUkpulJsP egon@egon-pc
+
+- use_ceph: True