diff --git a/openstack/openstack.yaml.template b/openstack/openstack.yaml.template
index 8beedf0a..ebed8672 100644
--- a/openstack/openstack.yaml.template
+++ b/openstack/openstack.yaml.template
@@ -79,6 +79,7 @@ applications:
       ssl_ca: *ssl_ca
       ssl_cert: *ssl_cert
       ssl_key: *ssl_key
+---
 relations:
   - [ nova-cloud-controller:shared-db, __MYSQL_INTERFACE__ ]
   - [ nova-cloud-controller:amqp, rabbitmq-server ]
diff --git a/tools/juju-bundle-applications.py b/tools/juju-bundle-applications.py
index a721c921..2ac1600d 100755
--- a/tools/juju-bundle-applications.py
+++ b/tools/juju-bundle-applications.py
@@ -7,8 +7,8 @@
 
 for filename in sys.argv[1:]:
     with open(filename, 'r') as f:
-        data = yaml.load(f, Loader=yaml.SafeLoader)
-        if 'applications' in data:
-            application_list.update(data['applications'].keys())
-
+        data = yaml.load_all(f, Loader=yaml.SafeLoader)
+        for d in data:
+            if 'applications' in d:
+                application_list.update(d['applications'].keys())
 print('\n'.join(application_list))