diff --git a/files/cord_juju_config.yml b/roles/juju-setup/files/cord_juju_config.yml
similarity index 80%
rename from files/cord_juju_config.yml
rename to roles/juju-setup/files/cord_juju_config.yml
index 199cda7..a400f84 100644
--- a/files/cord_juju_config.yml
+++ b/roles/juju-setup/files/cord_juju_config.yml
@@ -4,26 +4,31 @@
 ceilometer:
   openstack-origin: cloud:trusty-kilo
 
+ceilometer-agent: {}
+
 glance:
   ha-mcastport: 5402
   openstack-origin: cloud:trusty-kilo
 
 keystone:
   ha-mcastport: 5403
-  https-service-endpoints: False
+  https-service-endpoints: "False"
   openstack-origin: cloud:trusty-kilo
-  use-https: no
+  use-https: "no"
 
-mysql:
-   max-connections: 20000
+mongodb: {}
+
+nagios: {}
 
 neutron-api:
   neutron-plugin: onosvtn
   onos-vtn-ip: onos-cord
-  neutron-security-groups: true
+  neutron-security-groups: True
   openstack-origin: cloud:trusty-kilo
   overlay-network-type: vxlan
 
+neutron-openvswitch: {}
+
 nova-cloud-controller:
   config-flags: "force_config_drive=always"
   console-access-protocol: novnc
@@ -35,9 +40,17 @@
   disable-neutron-security-groups: True
   openstack-origin: cloud:trusty-kilo
 
+nrpe: {}
+
+ntp: {}
+
 openstack-dashboard:
   openstack-origin: cloud:trusty-kilo
 
+percona-cluster:
+   max-connections: 20000
+
 rabbitmq-server:
   ssl: 'off'
 
+
diff --git a/files/opencloud_juju_config.yml b/roles/juju-setup/files/opencloud_juju_config.yml
similarity index 92%
rename from files/opencloud_juju_config.yml
rename to roles/juju-setup/files/opencloud_juju_config.yml
index 8031f13..79f9dd7 100644
--- a/files/opencloud_juju_config.yml
+++ b/roles/juju-setup/files/opencloud_juju_config.yml
@@ -1,6 +1,10 @@
 ---
 # juju configuration file for OpenCloud deployments
 
+ceilometer: {}
+
+ceilometer-agent: {}
+
 glance:
   openstack-origin: "cloud:trusty-kilo"
 
@@ -9,6 +13,10 @@
   https-service-endpoints: "True"
   openstack-origin: "cloud:trusty-kilo"
 
+mongodb: {}
+
+nagios: {}
+
 neutron-api:
   flat-network-providers: "*"
   openstack-origin: "cloud:trusty-kilo"
@@ -38,12 +46,16 @@
   disable-neutron-security-groups: "True"
   openstack-origin: "cloud:trusty-kilo"
 
+nrpe: {}
+
 ntp:
   source: "0.ubuntu.pool.ntp.org 1.ubuntu.pool.ntp.org 2.ubuntu.pool.ntp.org 3.ubuntu.pool.ntp.org"
 
 openstack-dashboard:
   openstack-origin: "cloud:trusty-kilo"
 
+percona-cluster: {}
+
 rabbitmq-server:
   ssl: "on"
 
diff --git a/roles/juju-setup/tasks/main.yml b/roles/juju-setup/tasks/main.yml
index 075467e..dd08a42 100644
--- a/roles/juju-setup/tasks/main.yml
+++ b/roles/juju-setup/tasks/main.yml
@@ -82,15 +82,15 @@
   juju_facts:
 
 - name: Deploy services that are hosted in their own VM
-  command: "juju deploy {{ charm_version[item] | default(item) }} --to {{ juju_machines[item]['machine_id'] }} --config={{ juju_config_path }}"
+  command: "juju deploy {{ charm_versions[item] | default(item) }} --to {{ juju_machines[item]['machine_id'] }} --config={{ juju_config_path }}"
   with_items: "{{ vm_service_list | difference( juju_services.keys() ) }}"
 
 - name: Deploy mongodb to ceilometer VM
-  command: "juju deploy {{ charm_version['mongodb'] | default('mongodb') }} --to {{ juju_machines['ceilometer']['machine_id'] }} --config={{ juju_config_path }}"
+  command: "juju deploy {{ charm_versions['mongodb'] | default('mongodb') }} --to {{ juju_machines['ceilometer']['machine_id'] }} --config={{ juju_config_path }}"
   when: juju_services['mongodb'] is undefined
 
 - name: Deploy services that don't have their own VM
-  command: "juju deploy {{ charm_version[item] | default(item) }} --config={{ juju_config_path }}"
+  command: "juju deploy {{ charm_versions[item] | default(item) }} --config={{ juju_config_path }}"
   with_items: "{{ standalone_service_list | difference( juju_services.keys() ) }}"
 
 # FIXME: ignoring errors when creating relationships.