diff --git a/files/etc/libvirt/hooks/daemon b/files/etc/libvirt/hooks/daemon
index cff3fb7..61a4faf 100644
--- a/files/etc/libvirt/hooks/daemon
+++ b/files/etc/libvirt/hooks/daemon
@@ -13,7 +13,7 @@
     DPORT=$1
     VM=$2
     TOPORT=$3
-    
+
     VMIP=$( getent ahosts $VM|head -1|awk '{print $1}' )
     iptables -t nat -C PREROUTING -p tcp -i $NIC --dport $DPORT -j DNAT --to-destination $VMIP:$TOPORT
     if [ "$?" -ne 0 ]
@@ -29,7 +29,7 @@
     add_port_fwd_rule 4990 keystone 4990
     add_port_fwd_rule 5000 keystone 5000
     add_port_fwd_rule 8774 nova-cloud-controller 8774
-    add_port_fwd_rule 9696 nova-cloud-controller 9696
+    add_port_fwd_rule 9696 neutron-api 9696
     add_port_fwd_rule 9292 glance 9292
     add_port_fwd_rule 8080 openstack-dashboard 80
     add_port_fwd_rule 3128 nagios 80
@@ -37,4 +37,4 @@
 
     # Also flush the filter table before rules re-added
     iptables -F
-fi	
+fi
diff --git a/files/openstack.cfg b/files/openstack.cfg
index 9503b4d..ae83d46 100644
--- a/files/openstack.cfg
+++ b/files/openstack.cfg
@@ -1,17 +1,20 @@
 glance:
-   openstack-origin: "cloud:trusty-icehouse"
+   openstack-origin: "cloud:trusty-kilo"
 keystone:
    admin-password: ""
-   openstack-origin: "cloud:trusty-icehouse"
+   openstack-origin: "cloud:trusty-kilo"
 nova-cloud-controller:
    network-manager: "Neutron"
-   openstack-origin: "cloud:trusty-icehouse"
+   openstack-origin: "cloud:trusty-kilo"
 nova-compute:
    config-flags: "firewall_driver=nova.virt.firewall.NoopFirewallDriver"
-   openstack-origin: "cloud:trusty-icehouse"
+   openstack-origin: "cloud:trusty-kilo"
 ntp:
    source: "ntp.cs.princeton.edu"
 openstack-dashboard:
-   openstack-origin: "cloud:trusty-icehouse"
-quantum-gateway:
-   openstack-origin: "cloud:trusty-icehouse"
+   openstack-origin: "cloud:trusty-kilo"
+neutron-gateway:
+   openstack-origin: "cloud:trusty-kilo"
+neutron-api:
+   openstack-origin: "cloud:trusty-kilo"
+neutron-openvswitch: