diff --git a/bundles/openstack/bundle-config.yaml b/bundles/openstack/bundle-config.yaml
index 5d6f7e69d6647c7583c06f664d76bb35f3df717f..a13224440f716fe01c1b2fab29e77b31348eb2de 100644
--- a/bundles/openstack/bundle-config.yaml
+++ b/bundles/openstack/bundle-config.yaml
@@ -4,14 +4,20 @@
 parameters:
   # Region settings
   region: &region                               <region>
-  nagios_context: &nagios_context               <nagios_context>
   access-network: &access_network               <network_used_by_rabbit_and_percona>
   source_ntp: &source_ntp             <NTP_server>
   os-data-network: &os_data_network   <OS_data_network>
 
+  # Nagios
+  nagios_context: &nagios_context               <nagios_context>
+  nagios_admin_email: &nagios_admin_email       <nagiosadmin@domain.org>
+  nagios_admin_pwd: &nagiosadmin_pwd            <aVeryDifficultPwd>
+  nagios_readonly_pwd: &nagiosro_pwd            <aDifficultPwd>
+
   # Ceph configs
   ceph-fsid: &ceph_fsid   <FSID_here>
   ceph-monitor-hosts: &ceph_monitor_hosts    [cephmon1:port[ cephmon2:port cephmon3:port]]
+  ceph-admin-key: &ceph_admin_key    <ceph_admin_key_here>
 
   ceph-radosgw-ceph-osd-replication-count: &ceph_radosgw_replication_count  2
 
@@ -26,9 +32,14 @@ parameters:
   vip-neutron: &vip_neutron             <VIP_priv_6> <VIP_pub_6>
   vip-nova: &vip_nova_cloud_controller  <VIP_priv_3> <VIP_pub_3>
   console-proxy-ip: &console_proxy_ip   <VIP_pub_3>
+  # This is the gateway for public VIPs
+  default_public_gateway: &default_public_gateway  <default_public_gateway_in_CIDR_notation>
 
   # hostnames
   os-public-hostname: &os_public_hostname  <keystone_public_hostname>
+  os-internal-hostname: &os_internal_hostname  <keystone_internal_hostname>
+  # this one could be identical to internal-hostname
+  os-admin-hostname: &os_admin_hostname  <keystone_admin_hostname>
 
   # network setup: should be the same cross-sites
   ### Use network-space-* in bindings unless os-admin-* is usable instead
@@ -37,6 +48,10 @@ parameters:
   network-space-os-data: &network_space_os_data	<MAAS_OS_data_space>
   network-space-os-mgmt: &network_space_os_mgmt	<MAAS_OS_mgmt_space>
 
+  # Change as appropriate
+  bridge-mappings: &bridge_mappings             ext_net:br-ex
+  data-port: &data_port				br-ex:bond0.188
+
   # secrets and passwords:
   root-password: &root_password  <root_password>
   sst-password:  &sst_password   <sst_password>
@@ -60,10 +75,10 @@ services:
 
   ntp:
     options:
-      source: <NTP_server>
+      source: *source_ntp
   defaultgw:
     options:
-      gateway: <default_public_gateway_in_CIDR_notation>
+      gateway: *default_public_gateway
 
   ceph-radosgw-hacluster:
     bindings:
@@ -104,7 +119,6 @@ services:
     bindings:
       "": *network_space_os_mgmt
     options:
-      corosync_transport: 'unicast'
       corosync_key: *corosync_key
       nagios_context: *nagios_context
 
@@ -127,11 +141,9 @@ services:
       "": *network_space_os_mgmt
       website: *network_space_pub
     options:
-      action-managed-upgrade: True
-      admin_email: cloud-support@garr.it
-      monitor_self: true
-      password: <theNagiosPwd>
-      ro-password: <nagiosadmin>
+      admin_email: *nagios_admin_email
+      password: *nagiosadmin_pwd
+      ro-password: *nagiosro_pwd
 
   rabbitmq-server:
     bindings:
@@ -171,7 +183,6 @@ services:
       worker-multiplier: *worker_multiplier
       preferred-api-version: *preferred_api_version
       region: *region
-      use-syslog: True
       vip: *vip_keystone
 
   openstack-dashboard:
@@ -248,7 +259,6 @@ services:
       vip: *vip_neutron
 
   neutron-openvswitch:
-    charm: cs:neutron-openvswitch
     series: *series
     bindings:
       "": *network_space_default
diff --git a/bundles/openstack/bundle.yaml b/bundles/openstack/bundle.yaml
index 33058f1215a69f57289857a41ed79775dac665ff..6de0f91cf25f358f363350b28bb71cad0f6611d1 100644
--- a/bundles/openstack/bundle.yaml
+++ b/bundles/openstack/bundle.yaml
@@ -19,7 +19,6 @@ defaults:
   # network defaults:
   flat-network-providers: &flat_network_providers  ext_net
   neutron-external-network: &neutron_external_network ext_net
-  bridge-mappings: &bridge_mappings                ext_net:br-ex
   network-device-mtu: &network_device_mtu  1500
   instance-mtu: &instance_mtu	1400
   enable-dvr: &dvr-mode		True
@@ -38,8 +37,6 @@ defaults:
   libvirt-image-backend: &libvirt_image_backend
   cpu-mode: &cpu-mode
 
-  data-port: &data_port				br-ex:bond0.188
-
 # Ceilometer
   event-time-to-live: &celiometer_event_time_to_live -1
   metering-time-to-live: &celiometer_metering_time_to_live -1
@@ -58,9 +55,6 @@ machines:
   '3':
     constraints: arch=amd64 tags=compute
     series: *series
-  '4':
-    constraints: arch=amd64 tags=compute
-    series: *series
 
 # ------------------------------------------------------------------------------
 services:
@@ -79,10 +73,9 @@ services:
   compute-host:
     charm: cs:ubuntu
     series: *series
-    num_units: 2
+    num_units: 1
     to:
       - '3'
-      - '4'
     annotations:
       gui-x: '2000'
       gui-y: '500'
@@ -208,7 +201,6 @@ services:
     num_units: 1
     options:
       action-managed-upgrade: True
-      admin_email: cloud-support@garr.it
       monitor_self: true
     to:
       - 'lxd:2'
@@ -358,7 +350,7 @@ services:
   nova-compute:
     charm: cs:nova-compute
     series: *series
-    num_units: 2
+    num_units: 1
     options:
       openstack-origin: *openstack_origin
       action-managed-upgrade: True
@@ -375,7 +367,6 @@ services:
       enable-live-migration: True
     to:
       - '3'
-      - '4'
     annotations:
       gui-x: '0'
       gui-y: '200'
@@ -557,7 +548,7 @@ services:
       gui-x: '0'
       gui-y: '1100'
 
-ceilometer:
+  ceilometer:
     charm: cs:ceilometer
     series: xenial
     num_units: 1