diff --git a/scripts/juju-setup.py b/scripts/juju-setup.py
index ca5cbfe..d56368c 100755
--- a/scripts/juju-setup.py
+++ b/scripts/juju-setup.py
@@ -8,15 +8,19 @@
 
 # Assumption: VMs have same hostname as service that runs inside
 machines = ["mysql", "rabbitmq-server", "keystone", "glance", "nova-cloud-controller",
-            "quantum-gateway", "openstack-dashboard", "ceilometer", "nagios"]
+            "neutron-gateway", "openstack-dashboard", "ceilometer", "nagios", "neutron-api"]
 
 services = {
     "mysql" : "mysql",
     "rabbitmq-server" : "rabbitmq-server",
     "keystone" : "--config=%s keystone" % jujuconfig,
     "glance" : "--config=%s glance" % jujuconfig,
-    "nova-cloud-controller" : "--config=%s cs:~andybavier/trusty/nova-cloud-controller" % jujuconfig,
-    "quantum-gateway" : "--config=%s cs:~andybavier/trusty/quantum-gateway" % jujuconfig,
+#    "nova-cloud-controller" : "--config=%s cs:~andybavier/trusty/nova-cloud-controller" % jujuconfig,
+#    "quantum-gateway" : "--config=%s cs:~andybavier/trusty/quantum-gateway" % jujuconfig,
+    "nova-cloud-controller" : "--config=%s nova-cloud-controller" % jujuconfig,
+    "neutron-gateway" : "--config=%s neutron-gateway" % jujuconfig,
+    "neutron-api" : "--config=%s neutron-api" % jujuconfig,
+    "neutron-openvswitch" : "--config=%s neutron-openvswitch" % jujuconfig,
     "openstack-dashboard" : "--config=%s openstack-dashboard" % jujuconfig,
     "nagios" : "nagios",
     "mongodb" : "mongodb",   # deploy to ceilometer machine