diff --git a/metadata.yaml b/metadata.yaml
index 0011610..ea47f3e 100644
--- a/metadata.yaml
+++ b/metadata.yaml
@@ -14,6 +14,7 @@ extra-bindings:
   public:
 subordinate: true
 series:
+- bionic
 - focal
 - groovy
 - hirsute
diff --git a/osci.yaml b/osci.yaml
index 019527d..46cf1ec 100644
--- a/osci.yaml
+++ b/osci.yaml
@@ -3,6 +3,7 @@
       - charm-unit-jobs
     check:
       jobs:
+      - bionic-octopus
       - focal-octopus
       - hirsute-pacific
     vars:
@@ -21,9 +22,15 @@
     vars:
       tox_extra_args: focal
 - job:
-    name: hirsute-pacific
+    name: bionic-octopus
     parent: func-target
     dependencies: &smoke-jobs
       - focal-octopus
+    vars:
+      tox_extra_args: bionic-octopus
+- job:
+    name: hirsute-pacific
+    parent: func-target
+    dependencies: *smoke-jobs
     vars:
       tox_extra_args: hirsute
diff --git a/requirements.txt b/requirements.txt
index eafe2d3..991628a 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,3 +1,4 @@
+importlib-resources
 ops >= 1.2.0
 tenacity
 git+https://github.com/openstack/charms.ceph#egg=charms_ceph
diff --git a/tests/bundles/bionic-octopus.yaml b/tests/bundles/bionic-octopus.yaml
new file mode 100644
index 0000000..9982e4e
--- /dev/null
+++ b/tests/bundles/bionic-octopus.yaml
@@ -0,0 +1,101 @@
+local_overlay_enabled: False
+series: bionic
+applications:
+  percona-cluster:
+    charm: cs:~openstack-charmers-next/percona-cluster
+    num_units: 1
+    options:
+      dataset-size: 25%
+      max-connections: 1000
+      source: cloud:bionic-ussuri
+  ceph-osd:
+    charm: cs:~openstack-charmers-next/ceph-osd
+    num_units: 6
+    storage:
+      osd-devices: 'cinder,10G'
+    options:
+      osd-devices: '/dev/test-non-existent'
+      source: cloud:bionic-ussuri
+  ceph-mon:
+    charm: cs:~openstack-charmers-next/ceph-mon
+    num_units: 3
+    options:
+      monitor-count: '3'
+      source: cloud:bionic-ussuri
+  vault:
+    num_units: 1
+    charm: cs:~openstack-charmers-next/vault
+  ceph-dashboard:
+    charm: ../../ceph-dashboard.charm
+    options:
+      public-hostname: 'ceph-dashboard.zaza.local'
+  prometheus:
+    charm: cs:prometheus2
+    num_units: 1
+  grafana:
+    # SSL and allow_embedding are not released into cs:grafana yet, due 
+    # Octrober 2021
+    charm: cs:~llama-charmers-next/grafana
+    num_units: 1
+    options:
+      anonymous: True
+      install_plugins: https://storage.googleapis.com/plugins-community/vonage-status-panel/release/1.0.11/vonage-status-panel-1.0.11.zip,https://storage.googleapis.com/plugins-community/grafana-piechart-panel/release/1.6.2/grafana-piechart-panel-1.6.2.zip
+      install_method: snap
+      allow_embedding: True
+  telegraf:
+    charm: telegraf
+    channel: stable
+    options:
+       hostname: "{host}"
+  prometheus-alertmanager:
+    charm: cs:prometheus-alertmanager
+    num_units: 1
+  ceph-radosgw:
+    charm: cs:~openstack-charmers-next/ceph-radosgw
+    num_units: 3
+    options:
+      source: cloud:bionic-ussuri
+  ceph-fs:
+    charm: cs:~openstack-charmers-next/ceph-fs
+    num_units: 1
+    options:
+      source: cloud:bionic-ussuri
+relations:
+  - - 'ceph-osd:mon'
+    - 'ceph-mon:osd'
+  - - 'vault:shared-db'
+    - 'percona-cluster:shared-db'
+  - - 'ceph-dashboard:dashboard'
+    - 'ceph-mon:dashboard'
+  - - 'ceph-dashboard:certificates'
+    - 'vault:certificates'
+  - - 'ceph-mon:prometheus'
+    - 'prometheus:target'
+  - - 'grafana:grafana-source'
+    - 'prometheus:grafana-source'
+  - - 'grafana:certificates'
+    - 'vault:certificates'
+  - - 'ceph-osd:juju-info'
+    - 'telegraf:juju-info'
+  - - 'ceph-mon:juju-info'
+    - 'telegraf:juju-info'
+  - - 'telegraf:prometheus-client'
+    - 'prometheus:target'
+  - - 'telegraf:dashboards'
+    - 'grafana:dashboards'
+  - - 'ceph-dashboard:grafana-dashboard'
+    - 'grafana:dashboards'
+  - - 'ceph-dashboard:alertmanager-service'
+    - 'prometheus-alertmanager:alertmanager-service'
+  - - 'ceph-dashboard:prometheus'
+    - 'prometheus:website'
+  - - 'prometheus:alertmanager-service'
+    - 'prometheus-alertmanager:alertmanager-service'
+  - - 'ceph-radosgw:mon'
+    - 'ceph-mon:radosgw'
+  - - 'ceph-radosgw:certificates'
+    - 'vault:certificates'
+  - - 'ceph-dashboard:radosgw-dashboard'
+    - 'ceph-radosgw:radosgw-user'
+  - - 'ceph-mon:mds'
+    - 'ceph-fs:ceph-mds'
diff --git a/tests/bundles/overlays/bionic-octopus.yaml.j2 b/tests/bundles/overlays/bionic-octopus.yaml.j2
new file mode 100644
index 0000000..3539227
--- /dev/null
+++ b/tests/bundles/overlays/bionic-octopus.yaml.j2
@@ -0,0 +1,5 @@
+applications:
+  grafana:
+    options:
+        http_proxy: '{{ TEST_HTTP_PROXY }}'
+        install_plugins: {{ TEST_GRAFANA_PLUGIN_VONAGE_URL }},{{ TEST_GRAFANA_PLUGIN_PIECHART_URL }}
diff --git a/tests/tests.yaml b/tests/tests.yaml
index e18b224..8434950 100644
--- a/tests/tests.yaml
+++ b/tests/tests.yaml
@@ -1,6 +1,7 @@
 charm_name: ceph-dasboard
 gate_bundles:
   - focal
+  - bionic-octopus
   - hirsute
 smoke_bundles:
   - focal