diff --git a/roles/glance-controller/tasks/main.yml b/roles/glance-controller/tasks/main.yml
index 552919a..1c48274 100644
--- a/roles/glance-controller/tasks/main.yml
+++ b/roles/glance-controller/tasks/main.yml
@@ -11,6 +11,8 @@
         -e "GLANCE_HOST={{ hostvars[groups['glance-controller'][0]]['ansible_default_ipv4']['address'] }}"
         -e "GLANCE_USER=glance"
         -e "GLANCE_PASSWORD=geheim"
+        -e "RABBIT_USER=openstack"
+        -e "RABBIT_PASSWORD=geheim"
 
 - name: pull docker image
   docker_image:
diff --git a/roles/neutron-controller/tasks/main.yml b/roles/neutron-controller/tasks/main.yml
index 4dc396f..a28058d 100644
--- a/roles/neutron-controller/tasks/main.yml
+++ b/roles/neutron-controller/tasks/main.yml
@@ -21,7 +21,7 @@
         -e "NOVA_PASSWORD=geheim"
         -e "NOVA_USER=nova"
         -e "MEMCACHED_HOST={{ hostvars[groups['memcached'][0]]['ansible_default_ipv4']['address'] }}"
-        -e "PROVIDER_INTERFACE_NAME={{ hostvars[groups['neutron-controller'][0]]['ansible_default_ipv4']['interface'] }}"
+        -e "PROVIDER_INTERFACE_NAME={{ provider_interface_name }}"
         -e "RABBIT_PASSWORD=geheim"
         -e "RABBIT_USER=openstack"
   tags: env
diff --git a/roles/nova-compute/templates/nova-compute.service b/roles/nova-compute/templates/nova-compute.service
index 08adf9f..49c662c 100644
--- a/roles/nova-compute/templates/nova-compute.service
+++ b/roles/nova-compute/templates/nova-compute.service
@@ -21,17 +21,18 @@ ExecStart=/usr/bin/docker run --name %n \
     -e "MEMCACHED_HOST={{ hostvars[groups['memcached'][0]]['ansible_default_ipv4']['address'] }}" \
     -e "MYSQL_HOST={{ hostvars[groups['databases'][0]]['ansible_default_ipv4']['address'] }}" \
     -e "MYSQL_ROOT_PASSWORD=geheim" \
-    -e "NEUTRON_CONTROLLER_HOST={{ hostvars[groups['keystone'][0]]['ansible_default_ipv4']['address'] }}" \
+    -e "NEUTRON_CONTROLLER_HOST={{ hostvars[groups['neutron-controller'][0]]['ansible_default_ipv4']['address'] }}" \
     -e "NEUTRON_PASSWORD=geheim" \
     -e "NEUTRON_USER=neutron" \
     -e "NOVA_CONTROLLER_HOST={{ hostvars[groups['nova-controller'][0]]['ansible_default_ipv4']['address'] }}" \
-    -e "PROVIDER_INTERFACE_NAME={{ hostvars[groups['neutron-controller'][0]]['ansible_default_ipv4']['interface'] }}" \
+    -e "PROVIDER_INTERFACE_NAME={{ provider_interface_name }}" \
     -e "GLANCE_CONTROLLER_HOST={{ hostvars[groups['glance-controller'][0]]['ansible_default_ipv4']['address'] }}" \
     --add-host=keystone:{{ hostvars[groups['keystone'][0]]['ansible_default_ipv4']['address'] }} \
     --add-host=mariadb:{{ hostvars[groups['databases'][0]]['ansible_default_ipv4']['address'] }} \
     --privileged \
     -v /var/run/libvirt/libvirt-sock:/var/run/libvirt/libvirt-sock \
-    -v /srv/osdisks:/var/lib/nova/instances \
+    -v /var/lib/nova/instances:/var/lib/nova/instances \
+    -v /lib/modules:/lib/modules \
     --network host \
     {{ docker_image }} /etc/run.sh
 
diff --git a/roles/rabbitmq/tasks/main.yml b/roles/rabbitmq/tasks/main.yml
index a59518e..8ffb0f9 100644
--- a/roles/rabbitmq/tasks/main.yml
+++ b/roles/rabbitmq/tasks/main.yml
@@ -16,6 +16,10 @@
     name: rabbitmq.service
     state: started
 
+- name: wait for container to be started
+  wait_for:
+      port: 15671
+
 - name: setup the cluster
   command: "docker exec -i rabbitmq.service {{ item }}"
   with_items: