diff --git a/config/bundle_bionic.yaml b/config/bundle_bionic.yaml
index 353ed62..3a8a928 100644
--- a/config/bundle_bionic.yaml
+++ b/config/bundle_bionic.yaml
@@ -684,352 +684,16 @@ applications:
     - lxd:101
     - lxd:102
 
-# LMA stack applications
-  landscape-server:
-    charm: cs:landscape-server
+  lma-server:
+    charm: cs:ubuntu
     series: bionic
     bindings:
       "": *oam-space
-    options:
-      install_sources: |-
-        - 'deb http://192.168.1.12/ppa.launchpad.net/landscape/19.10/ubuntu bionic main'
-      install_keys: |-
-         - |
-           -----BEGIN PGP PUBLIC KEY BLOCK-----
-           Version: SKS 1.1.6
-           Comment: Hostname: keyserver.ubuntu.com
-           mI0ESXN/egEEAOgRYISU9dnQm4BB5ZEEwKT+NKUDNd/DhMYdtBMw9Yk7S5cyoqpbtwoPJVzK
-           AXxq+ng5e3yYypSv98pLMr5UF09FGaeyGlD4s1uaVFWkFCO4jsTg7pWIY6qzO/jMxB5+Yu/G
-           0GjWQMNKxFk0oHMa0PhNBZtdPacVz65mOVmCsh/lABEBAAG0G0xhdW5jaHBhZCBQUEEgZm9y
-           IExhbmRzY2FwZYi2BBMBAgAgBQJJc396AhsDBgsJCAcDAgQVAggDBBYCAwECHgECF4AACgkQ
-           boWobkZStOb+rwP+ONKUWeX+MTIPqGWkknBPV7jm8nyyIUojC4IhS+9YR6GYnn0hMABSkEHm
-           IV73feKmrT2GESYI1UdYeKiOkWsPN/JyBk+eTvKet0qsw5TluqiHSW+LEi/+zUyrS3dDMX3o
-           yaLgYa+UkjIyxnaKLkQuCiS+D+fYwnJulIkhaKObtdE=
-           =UwRd
-           -----END PGP PUBLIC KEY BLOCK-----
-      license-file: include-base64://../secrets/ldslicense.txt
-      #root-url: http://landscape.example.com/
     num_units: 3
     to:
     - 300
     - 301
     - 302
-  landscape-rabbitmq-server:
-    charm: cs:rabbitmq-server
-    bindings:
-      "": *oam-space
-      cluster: *oam-space
-      amqp: *oam-space
-    num_units: 3
-    options:
-      source: *openstack-origin
-      min-cluster-size: 3
-      cluster-partition-handling: pause_minority
-    to:
-    - lxd:300
-    - lxd:301
-    - lxd:302
-  landscape-postgresql:
-    charm: cs:postgresql
-    series: bionic
-    bindings:
-      "": *oam-space
-    options:
-      extra_packages: python-apt postgresql-contrib postgresql-.*-debversion postgresql-plpython.*
-      max_connections: 500
-      max_prepared_transactions: 500
-    num_units: 2
-    to:
-    - lxd:300
-    - lxd:301
-  landscape-haproxy:
-    charm: cs:haproxy
-    bindings:
-      "": *oam-space
-    options:
-      default_timeouts: "queue 60000, connect 5000, client 120000, server 120000"
-      services: ""
-      source: backports
-      ssl_cert: SELFSIGNED
-      global_default_bind_options: "no-tlsv10"
-    num_units: 1
-    to:
-    - lxd:302
-  graylog:
-    charm: cs:graylog
-    bindings:
-      "": *oam-space
-    num_units: 1
-    options:
-      channel: "3/stable"
-      jvm_heap_size: '1G'
-      rest_transport_uri: http://graylog.example.com:9001
-      index_rotation_period: PT3H
-    to:
-    - 200
-  graylog-mongodb:
-    charm: cs:mongodb
-    bindings:
-      "": *oam-space
-    num_units: 1
-    options:
-      nagios_context: *nagios-context
-    to:
-    - lxd:200
-  elasticsearch:
-    charm: cs:elasticsearch
-    bindings:
-      "": *oam-space
-    num_units: 2
-    options:
-      firewall_enabled: False
-      es-heap-size: 2
-      gpg-key: |
-        -----BEGIN PGP PUBLIC KEY BLOCK-----
-        Version: SKS 1.1.6
-        Comment: Hostname: keyserver.ubuntu.com
-
-        mQENBFI3HsoBCADXDtbNJnxbPqB1vDNtCsqhe49vFYsZN9IOZsZXgp7aHjh6CJBDA+bGFOwy
-        hbd7at35jQjWAw1O3cfYsKAmFy+Ar3LHCMkV3oZspJACTIgCrwnkic/9CUliQe324qvObU2Q
-        RtP4Fl0zWcfb/S8UYzWXWIFuJqMvE9MaRY1bwUBvzoqavLGZj3SF1SPO+TB5QrHkrQHBsmX+
-        Jda6d4Ylt8/t6CvMwgQNlrlzIO9WT+YN6zS+sqHd1YK/aY5qhoLNhp9G/HxhcSVCkLq8SStj
-        1ZZ1S9juBPoXV1ZWNbxFNGwOh/NYGldD2kmBf3YgCqeLzHahsAEpvAm8TBa7Q9W21C8vABEB
-        AAG0RUVsYXN0aWNzZWFyY2ggKEVsYXN0aWNzZWFyY2ggU2lnbmluZyBLZXkpIDxkZXZfb3Bz
-        QGVsYXN0aWNzZWFyY2gub3JnPokBOAQTAQIAIgUCUjceygIbAwYLCQgHAwIGFQgCCQoLBBYC
-        AwECHgECF4AACgkQ0n1mbNiOQrRzjAgAlTUQ1mgo3nK6BGXbj4XAJvuZDG0HILiUt+pPnz75
-        nsf0NWhqR4yGFlmpuctgCmTD+HzYtV9fp9qW/bwVuJCNtKXk3sdzYABY+Yl0Cez/7C2GuGCO
-        lbn0luCNT9BxJnh4mC9h/cKI3y5jvZ7wavwe41teqG14V+EoFSn3NPKmTxcDTFrV7SmVPxCB
-        cQze00cJhprKxkuZMPPVqpBS+JfDQtzUQD/LSFfhHj9eD+Xe8d7sw+XvxB2aN4gnTlRzjL1n
-        TRp0h2/IOGkqYfIG9rWmSLNlxhB2t+c0RsjdGM4/eRlPWylFbVMc5pmDpItrkWSnzBfkmXL3
-        vO2X3WvwmSFiQbkBDQRSNx7KAQgA5JUlzcMW5/cuyZR8alSacKqhSbvoSqqbzHKcUQZmlzNM
-        KGTABFG1yRx9r+wa/fvqP6OTRzRDvVS/cycws8YX7Ddum7x8uI95b9ye1/Xy5noPEm8cD+hp
-        lnpU+PBQZJ5XJ2I+1l9Nixx47wPGXeClLqcdn0ayd+v+Rwf3/XUJrvccG2YZUiQ4jWZkoxsA
-        07xx7Bj+Lt8/FKG7sHRFvePFU0ZS6JFx9GJqjSBbHRRkam+4emW3uWgVfZxuwcUCn1ayNgRt
-        KiFv9jQrg2TIWEvzYx9tywTCxc+FFMWAlbCzi+m4WD+QUWWfDQ009U/WM0ks0KwwEwSk/UDu
-        ToxGnKU2dQARAQABiQEfBBgBAgAJBQJSNx7KAhsMAAoJENJ9ZmzYjkK0c3MIAIE9hAR20mqJ
-        WLcsxLtrRs6uNF1VrpB+4n/55QU7oxA1iVBO6IFu4qgsF12JTavnJ5MLaETlggXY+zDef9sy
-        TPXoQctpzcaNVDmedwo1SiL03uMoblOvWpMR/Y0j6rm7IgrMWUDXDPvoPGjMl2q1iTeyHkMZ
-        EyUJ8SKsaHh4jV9wp9KmC8C+9CwMukL7vM5w8cgvJoAwsp3Fn59AxWthN3XJYcnMfStkIuWg
-        R7U2r+a210W6vnUxU4oN0PmMcursYPyeV0NX/KQeUeNMwGTFB6QHS/anRaGQewijkrYYoTNt
-        fllxIu9XYmiBERQ/qPDlGRlOgVTd9xUfHFkzB52c70E=
-        =92oX
-        -----END PGP PUBLIC KEY BLOCK-----
-      apt-repository: 'deb http://192.168.1.12/artifacts.elastic.co/packages/6.x/apt stable main'
-    to:
-    - 201
-    - 202
-  filebeat:
-    charm: cs:filebeat
-    options:
-      logpath: "/var/log/*.log /var/log/*/*.log /var/log/syslog"
-      install_keys: |-
-        - |
-          -----BEGIN PGP PUBLIC KEY BLOCK-----
-          Version: SKS 1.1.6
-          Comment: Hostname: keyserver.ubuntu.com
-          mQENBFI3HsoBCADXDtbNJnxbPqB1vDNtCsqhe49vFYsZN9IOZsZXgp7aHjh6CJBDA+bGFOwy
-          hbd7at35jQjWAw1O3cfYsKAmFy+Ar3LHCMkV3oZspJACTIgCrwnkic/9CUliQe324qvObU2Q
-          RtP4Fl0zWcfb/S8UYzWXWIFuJqMvE9MaRY1bwUBvzoqavLGZj3SF1SPO+TB5QrHkrQHBsmX+
-          Jda6d4Ylt8/t6CvMwgQNlrlzIO9WT+YN6zS+sqHd1YK/aY5qhoLNhp9G/HxhcSVCkLq8SStj
-          1ZZ1S9juBPoXV1ZWNbxFNGwOh/NYGldD2kmBf3YgCqeLzHahsAEpvAm8TBa7Q9W21C8vABEB
-          AAG0RUVsYXN0aWNzZWFyY2ggKEVsYXN0aWNzZWFyY2ggU2lnbmluZyBLZXkpIDxkZXZfb3Bz
-          QGVsYXN0aWNzZWFyY2gub3JnPokBOAQTAQIAIgUCUjceygIbAwYLCQgHAwIGFQgCCQoLBBYC
-          AwECHgECF4AACgkQ0n1mbNiOQrRzjAgAlTUQ1mgo3nK6BGXbj4XAJvuZDG0HILiUt+pPnz75
-          nsf0NWhqR4yGFlmpuctgCmTD+HzYtV9fp9qW/bwVuJCNtKXk3sdzYABY+Yl0Cez/7C2GuGCO
-          lbn0luCNT9BxJnh4mC9h/cKI3y5jvZ7wavwe41teqG14V+EoFSn3NPKmTxcDTFrV7SmVPxCB
-          cQze00cJhprKxkuZMPPVqpBS+JfDQtzUQD/LSFfhHj9eD+Xe8d7sw+XvxB2aN4gnTlRzjL1n
-          TRp0h2/IOGkqYfIG9rWmSLNlxhB2t+c0RsjdGM4/eRlPWylFbVMc5pmDpItrkWSnzBfkmXL3
-          vO2X3WvwmSFiQbkBDQRSNx7KAQgA5JUlzcMW5/cuyZR8alSacKqhSbvoSqqbzHKcUQZmlzNM
-          KGTABFG1yRx9r+wa/fvqP6OTRzRDvVS/cycws8YX7Ddum7x8uI95b9ye1/Xy5noPEm8cD+hp
-          lnpU+PBQZJ5XJ2I+1l9Nixx47wPGXeClLqcdn0ayd+v+Rwf3/XUJrvccG2YZUiQ4jWZkoxsA
-          07xx7Bj+Lt8/FKG7sHRFvePFU0ZS6JFx9GJqjSBbHRRkam+4emW3uWgVfZxuwcUCn1ayNgRt
-          KiFv9jQrg2TIWEvzYx9tywTCxc+FFMWAlbCzi+m4WD+QUWWfDQ009U/WM0ks0KwwEwSk/UDu
-          ToxGnKU2dQARAQABiQEfBBgBAgAJBQJSNx7KAhsMAAoJENJ9ZmzYjkK0c3MIAIE9hAR20mqJ
-          WLcsxLtrRs6uNF1VrpB+4n/55QU7oxA1iVBO6IFu4qgsF12JTavnJ5MLaETlggXY+zDef9sy
-          TPXoQctpzcaNVDmedwo1SiL03uMoblOvWpMR/Y0j6rm7IgrMWUDXDPvoPGjMl2q1iTeyHkMZ
-          EyUJ8SKsaHh4jV9wp9KmC8C+9CwMukL7vM5w8cgvJoAwsp3Fn59AxWthN3XJYcnMfStkIuWg
-          R7U2r+a210W6vnUxU4oN0PmMcursYPyeV0NX/KQeUeNMwGTFB6QHS/anRaGQewijkrYYoTNt
-          fllxIu9XYmiBERQ/qPDlGRlOgVTd9xUfHFkzB52c70E=
-          =92oX
-          -----END PGP PUBLIC KEY BLOCK-----
-      install_sources: |
-          - 'deb http://192.168.1.12/artifacts.elastic.co/packages/6.x/apt stable main'
-  nagios:
-    charm: cs:nagios
-    series: bionic
-    bindings:
-      "": *oam-space
-    num_units: 1
-    options:
-      enable_livestatus: true
-      check_timeout: 50
-    to:
-    - lxd:200
-  openstack-service-checks:
-    charm: cs:~canonical-bootstack/openstack-service-checks
-    constraints: *oam-space-constr
-    bindings:
-      "": *public-space
-      identity-credentials: *internal-space
-    num_units: 1
-    to:
-    - lxd:200
-  nrpe-host:
-    charm: cs:nrpe
-    bindings:
-      monitors: *oam-space
-    options:
-      nagios_hostname_type: "host"
-      nagios_host_context: *nagios-context
-      xfs_errors: "30"
-      netlinks: |
-        - bond0 mtu:1500 speed:1000
-        - bond1 mtu:9000 speed:50000
-        - eno1 mtu:1500 speed:1000
-        - eno2 mtu:1500 speed:1000
-        - enp25s0f0 mtu:9000 speed:25000
-        - enp25s0f1 mtu:9000 speed:25000
-  nrpe-container:
-    charm: cs:nrpe
-    bindings:
-      monitors: *oam-space
-    options:
-      nagios_hostname_type: unit
-      nagios_host_context: *nagios-context
-      disk_root: ''
-      load: ''
-      swap: ''
-      swap_activity: ''
-      mem: ''
-  landscape-client:
-    charm: cs:landscape-client
-    options:
-      account-name: "standalone"
-      origin: |
-        deb http://192.168.1.12/ppa.launchpad.net/landscape/19.10/ubuntu bionic main|-----BEGIN PGP PUBLIC KEY BLOCK-----
-        Version: SKS 1.1.6
-        Comment: Hostname: keyserver.ubuntu.com
-        mI0ESXN/egEEAOgRYISU9dnQm4BB5ZEEwKT+NKUDNd/DhMYdtBMw9Yk7S5cyoqpbtwoPJVzK
-        AXxq+ng5e3yYypSv98pLMr5UF09FGaeyGlD4s1uaVFWkFCO4jsTg7pWIY6qzO/jMxB5+Yu/G
-        0GjWQMNKxFk0oHMa0PhNBZtdPacVz65mOVmCsh/lABEBAAG0G0xhdW5jaHBhZCBQUEEgZm9y
-        IExhbmRzY2FwZYi2BBMBAgAgBQJJc396AhsDBgsJCAcDAgQVAggDBBYCAwECHgECF4AACgkQ
-        boWobkZStOb+rwP+ONKUWeX+MTIPqGWkknBPV7jm8nyyIUojC4IhS+9YR6GYnn0hMABSkEHm
-        IV73feKmrT2GESYI1UdYeKiOkWsPN/JyBk+eTvKet0qsw5TluqiHSW+LEi/+zUyrS3dDMX3o
-        yaLgYa+UkjIyxnaKLkQuCiS+D+fYwnJulIkhaKObtdE=
-        =UwRd
-        -----END PGP PUBLIC KEY BLOCK-----
-      #registration-key: include-file://../secrets/landscape-registration.txt
-      disable-unattended-upgrades: True
-      # the reason that this has to be done manually is because Landscape server needs an admin user to be
-      # created first (manual step, see above). Once the user and registration key is set configure the clients' url and ping-url options.
-      #ping-url: http://landscape.example.com/ping
-      #url: https://landscape.example.com/message-system
-  prometheus:
-    charm: cs:prometheus2
-    bindings:
-      "": *oam-space
-    num_units: 1
-    to:
-    - lxd:201
-  prometheus-openstack-exporter:
-    charm: cs:prometheus-openstack-exporter
-    constraints: *oam-space-constr
-    bindings:
-      "": *public-space
-      identity-credentials: *internal-space
-      prometheus-openstack-exporter-service: *oam-space
-    num_units: 1
-    to:
-    - lxd:201
-  grafana:
-    charm: cs:~prometheus-charmers/grafana
-    bindings:
-      "": *oam-space
-    options:
-      port: "3000"
-      install_method: snap
-    num_units: 1
-    to:
-    - lxd:201
-  telegraf:
-    charm: cs:telegraf
-    options:
-      # Contrail services are listening on 8094
-      socket_listener_port: '8095'
-      install_sources: |
-        - 'deb http://192.168.1.12/ppa.launchpad.net/telegraf-devs/ppa/ubuntu bionic main'
-      install_keys: |-
-        - |
-          -----BEGIN PGP PUBLIC KEY BLOCK-----
-          Version: SKS 1.1.6
-          Comment: Hostname: keyserver.ubuntu.com
-          mQINBFcVSuIBEAC80aj0tAQ6+NhGV/bkSwu6Oj+BpDR50Be3uBv7ttdtvChL5zHTnaxjdK3h
-          LKSyrDLlmSOkffQ2uO7CxvqeF09MsHhyvrDDx0EY54//xxoAB++PoB2OQqmqldg3Al5Hp4Dz
-          rllV5CIX5PD8NGX8UpO3HXk5wEwn9G81l8cia3vPveU82EIkHMiJGpk6+L86OMlwXzxkSI3M
-          xXgNFKQc+ELDYLvGSseYC9vPN3kdmFoo/UjznPPE4fxr4bXit3N8Abl1jYjBa0x6SWkK1BAb
-          s8w3BXtvyk90z9Oyme69wPD4zAYfFp+kN2nDmTDBMtNCyMu9oatdI5SukMNK4Lcm8eAE6VNs
-          04j7BKvGk9+17M8WP9Pw8nIisOwScS9gUlJlLUpnBaJ+sxoOvGQ4mzZxYMKzJh0E58aEX3bS
-          AyzQfsae8bZLNOTcgotyzzIDJFF9npzu3wmKjeOt/706p4LiDqKUbQK6cI+QcJ/y80ZUK8pB
-          M043ttSHWLmTBFX2drp6zQGae9+02fX89ZD+5c+MPlubJMYCCKkvQT4OssHfC+dVDQ66rwUy
-          OObrzsVgikdpIxQVitL3J+Dms56xAkdFfoo+qdxxdv9S/eakc5mfavc/4WVvmFDaJiqJnJRR
-          Ryw1zApRtuweEEdVn8niy1mahoKpWaw1pTI4AazjWI6xJH1JyQARAQABtB9MYXVuY2hwYWQg
-          UFBBIGZvciBUZWxlZ3JhZiBEZXZziQI4BBMBAgAiBQJXFUriAhsDBgsJCAcDAgYVCAIJCgsE
-          FgIDAQIeAQIXgAAKCRDxDL4ByUQG9UgbEACa4IzdeYxH/S5I6MrZfvWNo/JTZ/MZWDD+QlMW
-          60ThAemCUSE+NJvZZ1q7ovGFpYnHJT9GQXOwJAX1quDUqyM1uXNmLlOyIVNnmjUTINoLhw2V
-          iC8E7dMWC9w4Na2fKezmNHH00kNl43ncstIjjZ3pLnDGYm1y0ItiCUcTRgHhx2cUZ/vStz1S
-          Pdqj4P3i8vuspoYJ2T3VPlM/0G+u9Yjuy3Uzu9RugOyO3UJPoi3+4O2VTNosSBy5MILVCp49
-          eigyFVGpq5sT/c86qd1zqmsNWEubrlzDfETS4LMj9epr46ZKPXGQkeryt1m2Oe0HkIdNZ+IQ
-          5p+i9fnEy7/1uKTXWQYsg2UWsLA2PvTvwY8JxxMhUFgv12q2w7STntqJyi9PLItYNtbtKoS3
-          XZCCMqQLCWMXHY+2ol6rRSfs06H/wzlR8LjDaEXkDVuDmqMtcbgTboZYblsGxst7I/Y4Wgfi
-          J52uiIyobQ69uJbG0XeRTLZ3WyrBkopEsTX/+sQjVqbADXYU4hBVDgnCf2uN/5dcwSEvDj8/
-          +WsToAfEJkscRBsQjTLVzf+eFqHLrbqz/yoYIqBc//IJMBSbxIf5mrOHHLdbOuMCB6PVwpTI
-          vLFOSDNPuVDX+S1goA8KJTnXpm8jWDynn3XaXx3AlYw4iZ0ETSgQLQLRd6JuPOEGXsGdBA==
-          =ufaX
-          -----END PGP PUBLIC KEY BLOCK-----
-      extra_plugins: |
-        [[inputs.exec]]
-           commands = [ "/usr/bin/awk '{print int($1)}' /proc/uptime" ]
-           name_override = "exec_uptime"
-           data_format = "value"
-    bindings:
-      # overrides private-address exposed to prometheus
-      prometheus-client: *oam-space
-  telegraf-prometheus:
-    charm: cs:telegraf
-    bindings:
-      # overrides private-address exposed to prometheus
-      prometheus-client: *oam-space
-    options:
-      install_sources: |
-        - 'deb http://192.168.1.12/ppa.launchpad.net/telegraf-devs/ppa/ubuntu bionic main'
-      install_keys: |-
-        - |
-          -----BEGIN PGP PUBLIC KEY BLOCK-----
-          Version: SKS 1.1.6
-          Comment: Hostname: keyserver.ubuntu.com
-          mQINBFcVSuIBEAC80aj0tAQ6+NhGV/bkSwu6Oj+BpDR50Be3uBv7ttdtvChL5zHTnaxjdK3h
-          LKSyrDLlmSOkffQ2uO7CxvqeF09MsHhyvrDDx0EY54//xxoAB++PoB2OQqmqldg3Al5Hp4Dz
-          rllV5CIX5PD8NGX8UpO3HXk5wEwn9G81l8cia3vPveU82EIkHMiJGpk6+L86OMlwXzxkSI3M
-          xXgNFKQc+ELDYLvGSseYC9vPN3kdmFoo/UjznPPE4fxr4bXit3N8Abl1jYjBa0x6SWkK1BAb
-          s8w3BXtvyk90z9Oyme69wPD4zAYfFp+kN2nDmTDBMtNCyMu9oatdI5SukMNK4Lcm8eAE6VNs
-          04j7BKvGk9+17M8WP9Pw8nIisOwScS9gUlJlLUpnBaJ+sxoOvGQ4mzZxYMKzJh0E58aEX3bS
-          AyzQfsae8bZLNOTcgotyzzIDJFF9npzu3wmKjeOt/706p4LiDqKUbQK6cI+QcJ/y80ZUK8pB
-          M043ttSHWLmTBFX2drp6zQGae9+02fX89ZD+5c+MPlubJMYCCKkvQT4OssHfC+dVDQ66rwUy
-          OObrzsVgikdpIxQVitL3J+Dms56xAkdFfoo+qdxxdv9S/eakc5mfavc/4WVvmFDaJiqJnJRR
-          Ryw1zApRtuweEEdVn8niy1mahoKpWaw1pTI4AazjWI6xJH1JyQARAQABtB9MYXVuY2hwYWQg
-          UFBBIGZvciBUZWxlZ3JhZiBEZXZziQI4BBMBAgAiBQJXFUriAhsDBgsJCAcDAgYVCAIJCgsE
-          FgIDAQIeAQIXgAAKCRDxDL4ByUQG9UgbEACa4IzdeYxH/S5I6MrZfvWNo/JTZ/MZWDD+QlMW
-          60ThAemCUSE+NJvZZ1q7ovGFpYnHJT9GQXOwJAX1quDUqyM1uXNmLlOyIVNnmjUTINoLhw2V
-          iC8E7dMWC9w4Na2fKezmNHH00kNl43ncstIjjZ3pLnDGYm1y0ItiCUcTRgHhx2cUZ/vStz1S
-          Pdqj4P3i8vuspoYJ2T3VPlM/0G+u9Yjuy3Uzu9RugOyO3UJPoi3+4O2VTNosSBy5MILVCp49
-          eigyFVGpq5sT/c86qd1zqmsNWEubrlzDfETS4LMj9epr46ZKPXGQkeryt1m2Oe0HkIdNZ+IQ
-          5p+i9fnEy7/1uKTXWQYsg2UWsLA2PvTvwY8JxxMhUFgv12q2w7STntqJyi9PLItYNtbtKoS3
-          XZCCMqQLCWMXHY+2ol6rRSfs06H/wzlR8LjDaEXkDVuDmqMtcbgTboZYblsGxst7I/Y4Wgfi
-          J52uiIyobQ69uJbG0XeRTLZ3WyrBkopEsTX/+sQjVqbADXYU4hBVDgnCf2uN/5dcwSEvDj8/
-          +WsToAfEJkscRBsQjTLVzf+eFqHLrbqz/yoYIqBc//IJMBSbxIf5mrOHHLdbOuMCB6PVwpTI
-          vLFOSDNPuVDX+S1goA8KJTnXpm8jWDynn3XaXx3AlYw4iZ0ETSgQLQLRd6JuPOEGXsGdBA==
-          =ufaX
-          -----END PGP PUBLIC KEY BLOCK-----
 #  canonical-livepatch:
 #    charm: cs:canonical-livepatch
 #    options:
@@ -1069,14 +733,6 @@ applications:
 #        DCE3Nw==
 #        =Kaig
 #        -----END PGP PUBLIC KEY BLOCK-----
-  prometheus-ceph-exporter:
-    charm: cs:prometheus-ceph-exporter
-    bindings:
-      "": *oam-space
-      ceph: *ceph-public-space
-    num_units: 1
-    to:
-    - lxd:200
 #  external-policy-routing:
 #    charm: cs:~canonical-bootstack/policy-routing
 #    options:
@@ -1264,218 +920,11 @@ relations:
   - [ "etcd:certificates", "easyrsa:client" ]
   - [ "etcd:db", "vault:etcd" ]
 
-  # vault lma/monitoring
-  - [ "telegraf:juju-info", "vault:juju-info" ]
-  - [ "filebeat:beats-host", "vault:juju-info" ]
-  - [ "nrpe-container:nrpe-external-master", "vault:nrpe-external-master" ]
-  - [ "landscape-client:container", "vault:juju-info" ]
-
-  - [ "telegraf:juju-info", "etcd:juju-info" ]
-  - [ "filebeat:beats-host", "etcd:juju-info" ]
-  - [ "nrpe-container:nrpe-external-master", "etcd:nrpe-external-master" ]
-  - [ "landscape-client:container", "etcd:juju-info" ]
-
-  - [ "telegraf:juju-info", "easyrsa:juju-info" ]
-  - [ "filebeat:beats-host", "easyrsa:juju-info" ]
-  - [ "nrpe-container:general-info", "easyrsa:juju-info" ]
-  - [ "landscape-client:container", "easyrsa:juju-info" ]
-
   # memcached
   - [ "memcached:nrpe-external-master", "nrpe-container:nrpe-external-master" ]
   - [ "memcached:juju-info", "telegraf:juju-info" ]
   - [ "memcached:juju-info", "filebeat:beats-host" ]
   - [ "memcached:juju-info", "landscape-client:container" ]
 
-  # grafana
-  - [ "grafana:juju-info", "filebeat:beats-host" ]
-  - [ "grafana:nrpe-external-master", "nrpe-container:nrpe-external-master" ]
-  - [ "grafana:juju-info", "telegraf:juju-info" ]
-  - [ "grafana:juju-info", "landscape-client:container" ]
-
-  # graylog
-  - [ "graylog:elasticsearch", "elasticsearch:client" ]
-  - [ "graylog:mongodb", "graylog-mongodb:database" ]
-  - [ "graylog:beats", "filebeat:logstash" ]
-  - [ "graylog:nrpe-external-master", "nrpe-host:nrpe-external-master" ]
-  - [ "graylog:juju-info", "telegraf:juju-info" ]
-  - [ "graylog:juju-info", "landscape-client:container" ]
-
-  # nagios
-  - [ "nagios:juju-info", "filebeat:beats-host" ]
-  - [ "nagios:juju-info", "telegraf:juju-info" ]
-  - [ "nagios:monitors", "nrpe-container:monitors" ]
-  - [ "nagios:monitors", "nrpe-host:monitors" ]
-  - [ "nagios:juju-info", "landscape-client:container" ]
-
-  # openstack-service-checks
-  - [ "openstack-service-checks:identity-credentials", "keystone:identity-credentials" ]
-  - [ "openstack-service-checks:nrpe-external-master", "nrpe-container:nrpe-external-master" ]
-  - [ "openstack-service-checks:juju-info", "telegraf:juju-info" ]
-  - [ "openstack-service-checks:juju-info", "filebeat:beats-host" ]
-  - [ "openstack-service-checks:juju-info", "landscape-client:container" ]
-
-  # graylog-mongodb
-  - [ "graylog-mongodb:juju-info", "telegraf:juju-info" ]
-  - [ "graylog-mongodb:juju-info", "filebeat:beats-host" ]
-  - [ "graylog-mongodb:nrpe-external-master", "nrpe-container:nrpe-external-master" ]
-  - [ "graylog-mongodb:juju-info", "landscape-client:container" ]
-
-  # elasticsearch
-  - [ "elasticsearch:juju-info", "filebeat:beats-host" ]
-  - [ "elasticsearch:juju-info", "telegraf:juju-info" ]
-  - [ "elasticsearch:nrpe-external-master", "nrpe-host:nrpe-external-master" ]
-  - [ "elasticsearch:juju-info", "landscape-client:container" ]
-
-  # prometheus
-  - [ "prometheus:juju-info", "filebeat:beats-host" ]
-  - [ "prometheus:nrpe-external-master", "nrpe-container:nrpe-external-master" ]
-  - [ "prometheus:juju-info", "telegraf-prometheus:juju-info" ]
-  - [ "prometheus:grafana-source", "grafana:grafana-source" ]
-  - [ "prometheus:target", "telegraf:prometheus-client" ]
-  - [ "prometheus:juju-info", "landscape-client:container" ]
-
-  # prometheus-openstack-exporter
-  - [ "prometheus-openstack-exporter:identity-credentials", "keystone:identity-credentials" ]
-  - [ "prometheus-openstack-exporter:nrpe-external-master", "nrpe-container:nrpe-external-master" ]
-  - [ "prometheus-openstack-exporter:prometheus-openstack-exporter-service", "prometheus:target" ]
-  - [ "prometheus-openstack-exporter:juju-info", "filebeat:beats-host" ]
-  - [ "prometheus-openstack-exporter:juju-info", "telegraf:juju-info" ]
-  - [ "prometheus-openstack-exporter:juju-info", "landscape-client:container" ]
-
-  # prometheus-ceph-exporter
-  - [ "prometheus-ceph-exporter:ceph", "ceph-mon:client" ]
-  - [ "prometheus-ceph-exporter:nrpe-external-master", "nrpe-container:nrpe-external-master" ]
-  - [ "prometheus-ceph-exporter:ceph-exporter", "prometheus:target" ]
-  - [ "prometheus-ceph-exporter:juju-info", "filebeat:beats-host" ]
-  - [ "prometheus-ceph-exporter:juju-info", "telegraf:juju-info" ]
-  - [ "prometheus-ceph-exporter:juju-info", "landscape-client:container" ]
-
   # juniper server
   - [ "juniper-server:juju-info", "ntp:juju-info" ]
-
-  # LMA/landscape subordinates
-  - [ "nova-compute:juju-info", "filebeat:beats-host" ]
-  - [ "nova-compute:juju-info", "telegraf:juju-info" ]
-  - [ "nova-compute:nrpe-external-master", "nrpe-host:nrpe-external-master" ]
-  - [ "nova-compute:juju-info", "landscape-client:container" ]
-
-  - [ "neutron-gateway:juju-info", "filebeat:beats-host" ]
-  - [ "neutron-gateway:juju-info", "telegraf:juju-info" ]
-  - [ "neutron-gateway:nrpe-external-master", "nrpe-host:nrpe-external-master" ]
-  - [ "neutron-gateway:juju-info", "landscape-client:container" ]
-
-  - [ "keystone:juju-info", "filebeat:beats-host" ]
-  - [ "keystone:juju-info", "telegraf:juju-info" ]
-  - [ "keystone:nrpe-external-master", "nrpe-container:nrpe-external-master" ]
-  - [ "keystone:juju-info", "landscape-client:container" ]
-
-  - [ "glance:juju-info", "filebeat:beats-host" ]
-  - [ "glance:juju-info", "telegraf:juju-info" ]
-  - [ "glance:nrpe-external-master", "nrpe-container:nrpe-external-master" ]
-  - [ "glance:juju-info", "landscape-client:container" ]
-
-  - [ "cinder:juju-info", "filebeat:beats-host" ]
-  - [ "cinder:juju-info", "telegraf:juju-info" ]
-  - [ "cinder:nrpe-external-master", "nrpe-container:nrpe-external-master" ]
-  - [ "cinder:juju-info", "landscape-client:container" ]
-
-#  - [ "cinder2:juju-info", "filebeat:beats-host" ]
-#  - [ "cinder2:juju-info", "telegraf:juju-info" ]
-#  - [ "cinder2:nrpe-external-master", "nrpe-container:nrpe-external-master" ]
-#  - [ "cinder2:juju-info", "landscape-client:container" ]
-
-  - [ "heat:juju-info", "filebeat:beats-host" ]
-  - [ "heat:juju-info", "telegraf:juju-info" ]
-  - [ "heat:juju-info", "nrpe-container:general-info" ]
-  - [ "heat:juju-info", "landscape-client:container" ]
-
-  - [ "mysql:juju-info", "filebeat:beats-host" ]
-  - [ "mysql:juju-info", "telegraf:juju-info" ]
-  - [ "mysql:juju-info", "nrpe-container:general-info" ]
-  - [ "mysql:juju-info", "landscape-client:container" ]
-
-  - [ "ceph-mon:juju-info", "filebeat:beats-host" ]
-  - [ "ceph-mon:juju-info", "telegraf:juju-info" ]
-  - [ "ceph-mon:nrpe-external-master", "nrpe-container:nrpe-external-master" ]
-  - [ "ceph-mon:juju-info", "landscape-client:container" ]
-
-  - [ "neutron-api:juju-info", "filebeat:beats-host" ]
-  - [ "neutron-api:juju-info", "telegraf:juju-info" ]
-  - [ "neutron-api:nrpe-external-master", "nrpe-container:nrpe-external-master" ]
-  - [ "neutron-api:juju-info", "landscape-client:container" ]
-
-  - [ "rabbitmq-server:juju-info", "filebeat:beats-host" ]
-  - [ "rabbitmq-server:juju-info", "telegraf:juju-info" ]
-  - [ "rabbitmq-server:nrpe-external-master", "nrpe-container:nrpe-external-master" ]
-  - [ "rabbitmq-server:juju-info", "landscape-client:container" ]
-
-  - [ "openstack-dashboard:juju-info", "filebeat:beats-host" ]
-  - [ "openstack-dashboard:juju-info", "telegraf:juju-info" ]
-  - [ "openstack-dashboard:nrpe-external-master", "nrpe-container:nrpe-external-master" ]
-  - [ "openstack-dashboard:juju-info", "landscape-client:container" ]
-
-  - [ "nova-cloud-controller:juju-info", "filebeat:beats-host" ]
-  - [ "nova-cloud-controller:juju-info", "telegraf:juju-info" ]
-  - [ "nova-cloud-controller:nrpe-external-master", "nrpe-container:nrpe-external-master" ]
-  - [ "nova-cloud-controller:juju-info", "landscape-client:container" ]
-
-  - [ "gnocchi:juju-info", "filebeat:beats-host" ]
-  - [ "gnocchi:juju-info", "telegraf:juju-info" ]
-  - [ "gnocchi:juju-info", "nrpe-container:general-info" ]
-  - [ "gnocchi:juju-info", "landscape-client:container" ]
-
-  - [ "ceilometer:juju-info", "filebeat:beats-host" ]
-  - [ "ceilometer:juju-info", "telegraf:juju-info" ]
-  - [ "ceilometer:nrpe-external-master", "nrpe-container:nrpe-external-master" ]
-  - [ "ceilometer:juju-info", "landscape-client:container" ]
-
-  - [ "aodh:juju-info", "filebeat:beats-host" ]
-  - [ "aodh:juju-info", "telegraf:juju-info" ]
-  - [ "aodh:juju-info", "nrpe-container:general-info" ]
-  - [ "aodh:juju-info", "landscape-client:container" ]
-
-  - [ "juniper-server:juju-info", "filebeat:beats-host" ]
-  - [ "juniper-server:juju-info", "telegraf:juju-info" ]
-  - [ "juniper-server:juju-info", "landscape-client:container" ]
-  - [ "juniper-server:juju-info", "nrpe-host:general-info" ]
-
-  - [ "hacluster-aodh:nrpe-external-master", "nrpe-container:nrpe-external-master" ]
-  - [ "hacluster-cinder:nrpe-external-master", "nrpe-container:nrpe-external-master" ]
-  - [ "hacluster-glance:nrpe-external-master", "nrpe-container:nrpe-external-master" ]
-  - [ "hacluster-gnocchi:nrpe-external-master", "nrpe-container:nrpe-external-master" ]
-  - [ "hacluster-heat:nrpe-external-master", "nrpe-container:nrpe-external-master" ]
-  - [ "hacluster-horizon:nrpe-external-master", "nrpe-container:nrpe-external-master" ]
-  - [ "hacluster-keystone:nrpe-external-master", "nrpe-container:nrpe-external-master" ]
-  - [ "hacluster-mysql:nrpe-external-master", "nrpe-container:nrpe-external-master" ]
-  - [ "hacluster-neutron:nrpe-external-master", "nrpe-container:nrpe-external-master" ]
-  - [ "hacluster-nova:nrpe-external-master", "nrpe-container:nrpe-external-master" ]
-
-  # Landscape
-  - [ "landscape-server:juju-info", "ntp:juju-info" ]
-  - [ "landscape-server:juju-info", "filebeat:beats-host" ]
-  - [ "landscape-server:juju-info", "nrpe-host:general-info" ]
-  - [ "landscape-server:juju-info", "telegraf:juju-info" ]
-  - [ "landscape-server:juju-info", "landscape-client:container" ]
-
-  - [ "landscape-rabbitmq-server:juju-info", "ntp:juju-info" ]
-  - [ "landscape-rabbitmq-server:juju-info", "filebeat:beats-host" ]
-  - [ "landscape-rabbitmq-server:nrpe-external-master", "nrpe-host:nrpe-external-master" ]
-  - [ "landscape-rabbitmq-server:juju-info", "telegraf:juju-info" ]
-  - [ "landscape-rabbitmq-server:juju-info", "landscape-client:container" ]
-
-  - [ "landscape-postgresql:juju-info", "ntp:juju-info" ]
-  - [ "landscape-postgresql:juju-info", "filebeat:beats-host" ]
-  - [ "landscape-postgresql:local-monitors", "nrpe-host:local-monitors" ]
-  - [ "landscape-postgresql:juju-info", "nrpe-host:general-info" ]
-  - [ "landscape-postgresql:juju-info", "telegraf:juju-info" ]
-  - [ "landscape-postgresql:juju-info", "landscape-client:container" ]
-
-  - [ "landscape-haproxy:juju-info", "filebeat:beats-host" ]
-  - [ "landscape-haproxy:juju-info", "nrpe-host:general-info" ]
-  - [ "landscape-haproxy:local-monitors", "nrpe-host:local-monitors" ]
-  - [ "landscape-haproxy:juju-info", "telegraf:juju-info" ]
-  - [ "landscape-haproxy:juju-info", "landscape-client:container" ]
-
-  - [ "landscape-server:amqp", "landscape-rabbitmq-server:amqp" ]
-  - [ "landscape-server:website", "landscape-haproxy:reverseproxy" ]
-  - [ "landscape-server:db", "landscape-postgresql:db-admin" ]
diff --git a/config/juju_deploy_bionic.sh b/config/juju_deploy_bionic.sh
index a734ac1..8837d13 100755
--- a/config/juju_deploy_bionic.sh
+++ b/config/juju_deploy_bionic.sh
@@ -7,13 +7,20 @@ juju model-config juju-model-default.yaml
 juju model-config default-series=${series}
 
 juju deploy ./bundle_${series}.yaml \
-    --overlay ./overlays/ovs.yaml \
+    --overlay ./overlays/ovs_${series}.yaml \
     --overlay ./overlays/hostnames.yaml \
     --overlay ./overlays/ldap.yaml \
     --overlay ./overlays/resources.yaml \
     --overlay ./overlays/openstack_versioned_overlay_${series}.yaml \
     --overlay ./overlays/stsstack.yaml $*
 
+#    --overlay ./overlays/advanced-routing.yaml \
+#    --overlay ./overlays/lma.yaml \
+#    --overlay ./overlays/lma_${series}.yaml \
+#    --overlay ./overlays/landscape.yaml \
+#    --overlay ./overlays/ssl.yaml \
+#    --overlay ./overlays/ssl_${series}.yaml \
+
 #    --overlay ./overlays/contrail.yaml \
 #    --overlay ./overlays/openstack_versioned_overlay.yaml \
 #    --overlay ./overlays/openstack_versioned_overlay_gemini.yaml \
diff --git a/config/overlays/lma_bionic.yaml b/config/overlays/lma_bionic.yaml
new file mode 100644
index 0000000..2316dc3
--- /dev/null
+++ b/config/overlays/lma_bionic.yaml
@@ -0,0 +1,22 @@
+variables:
+  oam-space:           &oam-space           oam
+  ceph-public-space:   &ceph-public-space   ceph-access
+
+applications:
+  prometheus-ceph-exporter:
+    charm: cs:prometheus-ceph-exporter
+    bindings:
+      "": *oam-space
+      ceph: *ceph-public-space
+    num_units: 1
+    to:
+    - lxd:200
+
+relations:
+  - [ "prometheus-ceph-exporter:ceph", "ceph-mon:client" ]
+  - [ "prometheus-ceph-exporter:nrpe-external-master", "nrpe-container:nrpe-external-master" ]
+  - [ "prometheus-ceph-exporter:ceph-exporter", "prometheus:target" ]
+  - [ "prometheus-ceph-exporter:juju-info", "filebeat:beats-host" ]
+  - [ "prometheus-ceph-exporter:juju-info", "telegraf:juju-info" ]
+  - [ "prometheus-ceph-exporter:juju-info", "landscape-client:container" ]
+
diff --git a/config/overlays/openstack_versioned_overlay_bionic.yaml b/config/overlays/openstack_versioned_overlay_bionic.yaml
index b18c5f5..1ad9e65 100644
--- a/config/overlays/openstack_versioned_overlay_bionic.yaml
+++ b/config/overlays/openstack_versioned_overlay_bionic.yaml
@@ -79,6 +79,8 @@ applications:
     charm: cs:keystone-ldap-23
   juniper-server:
     charm: cs:ubuntu-15
+  lma-server:
+    charm: cs:ubuntu-15
   keystone:
     charm: cs:keystone-309
   landscape-client:
diff --git a/config/overlays/ovs.yaml b/config/overlays/ovs_bionic.yaml
similarity index 99%
rename from config/overlays/ovs.yaml
rename to config/overlays/ovs_bionic.yaml
index 681fabf..6e7b756 100644
--- a/config/overlays/ovs.yaml
+++ b/config/overlays/ovs_bionic.yaml
@@ -18,4 +18,3 @@ applications:
   neutron-api:
     options:
       vlan-ranges: *vlan-ranges
-