diff --git a/roles/cinder-storage/tasks/main.yml b/roles/cinder-storage/tasks/main.yml
index e65f906..e023f11 100644
--- a/roles/cinder-storage/tasks/main.yml
+++ b/roles/cinder-storage/tasks/main.yml
@@ -20,6 +20,7 @@
         -e "OS_PASSWORD={{ secrets['OS_PASSWORD'] }}"
         -e "RABBIT_HOST={{ listen_ip | default(hostvars[groups['rabbitmq'][0]]['ansible_default_ipv4']['address']) }}"
         -e "RABBIT_PASSWORD={{ secrets['RABBIT_PASSWORD'] }}"
+        -e "AVAILABILITY_ZONE={{ ansible_nodename }}"
         -e "RABBIT_USER=openstack"
   tags: vars
 
diff --git a/roles/cinder-storage/templates/cinder-storage.service b/roles/cinder-storage/templates/cinder-storage.service
index 9690eb4..9e4dde1 100644
--- a/roles/cinder-storage/templates/cinder-storage.service
+++ b/roles/cinder-storage/templates/cinder-storage.service
@@ -16,8 +16,6 @@ ExecStart=/usr/bin/docker run --name %n \
   -v "{{ storage_volume }}":/dev/cinder_storage_volume \
   -v "/dev/lvm":/dev/lvm \
   -v "/srv/cinder-storage/volumes/:/var/lib/cinder/volumes/" \
-  -p 8777:8776 \
-  -p 3260:3260 \
   --network=host \
   {{ docker_image }}
 
diff --git a/roles/nova-compute/templates/nova-compute.service b/roles/nova-compute/templates/nova-compute.service
index 7ae08b9..dde3176 100644
--- a/roles/nova-compute/templates/nova-compute.service
+++ b/roles/nova-compute/templates/nova-compute.service
@@ -31,6 +31,7 @@ ExecStart=/usr/bin/docker run --name %n \
     -e "RABBIT_HOST={{ hostvars[groups['rabbitmq'][0]]['listen_ip'] | default(hostvars[groups['rabbitmq'][0]]['ansible_default_ipv4']['address']) }}" \
     -e "RABBIT_PASSWORD={{ secrets['RABBIT_PASSWORD'] }}" \
     -e "RABBIT_USER=openstack" \
+    -e "AVAILABILITY_ZONE={{ ansible_nodename }}" \
     --add-host=keystone:{{ hostvars[groups['keystone'][0]]['listen_ip'] | default(hostvars[groups['keystone'][0]]['ansible_default_ipv4']['address']) }} \
     --add-host=mariadb:{{ hostvars[groups['databases'][0]]['listen_ip'] | default(hostvars[groups['databases'][0]]['ansible_default_ipv4']['address']) }} \
     --privileged \