diff --git a/hooks/fabfile.py b/hooks/fabfile.py
index 3b234ee..26d9639 100644
--- a/hooks/fabfile.py
+++ b/hooks/fabfile.py
@@ -31,8 +31,8 @@ def restart_service(service):
     sudo('service %s restart' % service)
 
 
-def add_bridge():
-    sudo('ovs-vsctl -- --may-exist add-br br-int')
+def add_bridge(bridge_name):
+    sudo('ovs-vsctl -- --may-exist add-br %' % bridge_name)
 
 
 def enable_shell(user):
diff --git a/hooks/nova_compute_hooks.py b/hooks/nova_compute_hooks.py
index 8c5f3f9..a502dc6 100755
--- a/hooks/nova_compute_hooks.py
+++ b/hooks/nova_compute_hooks.py
@@ -102,6 +102,7 @@ def relation_broken():
 
 @hooks.hook('upgrade-charm')
 def upgrade_charm():
+    proxy.install()
     for r_id in relation_ids('amqp'):
         amqp_joined(relation_id=r_id)
 
diff --git a/hooks/nova_compute_proxy.py b/hooks/nova_compute_proxy.py
index 07fc93e..7c9fdd4 100644
--- a/hooks/nova_compute_proxy.py
+++ b/hooks/nova_compute_proxy.py
@@ -105,7 +105,7 @@ class POWERProxy():
         execute(fix_ml2_plugin_config)
 
     def configure(self):
-        self.add_bridge()
+        self.add_bridges()
 
     def copy_file(self, target):
         execute(copy_file_as_root,
@@ -115,8 +115,9 @@ class POWERProxy():
     def restart_service(self, service):
         execute(restart_service, service)
 
-    def add_bridge(self):
-        execute(add_bridge)
+    def add_bridges(self):
+        execute(add_bridge, 'br-int')
+        execute(add_bridge, 'br-data')
 
     def enable_shell(self, user):
         execute(enable_shell, user)