diff --git a/.gitreview b/.gitreview
new file mode 100644
index 0000000..2f8086b
--- /dev/null
+++ b/.gitreview
@@ -0,0 +1,4 @@
+[gerrit]
+host=review.opendev.org
+port=29418
+project=openstack/charm-cinder-nimblestorage.git
diff --git a/.zuul.yaml b/.zuul.yaml
new file mode 100644
index 0000000..0eed196
--- /dev/null
+++ b/.zuul.yaml
@@ -0,0 +1,4 @@
+- project:
+    templates:
+      - openstack-python3-ussuri-jobs
+      - openstack-cover-jobs
diff --git a/tests/bundles/bionic-rocky.yaml b/tests/bundles/bionic-rocky.yaml
index d82c72d..2187318 100644
--- a/tests/bundles/bionic-rocky.yaml
+++ b/tests/bundles/bionic-rocky.yaml
@@ -1,4 +1,6 @@
 series: bionic
+variables:
+  openstack-origin: &openstack-origin cloud:bionic-rocky
 comment:
 - 'machines section to decide order of deployment. database sooner = faster'
 machines:
@@ -18,19 +20,18 @@ applications:
     charm: cs:~openstack-charmers-next/keystone
     num_units: 1
     options:
-      openstack-origin: cloud:bionic-rocky
+      openstack-origin: *openstack-origin 
     to:
     - '1'
   cinder:
     charm: cs:~openstack-charmers-next/cinder
     num_units: 1
     options:
-      openstack-origin: cloud:bionic-rocky
+      openstack-origin: *openstack-origin 
     to:
     - '2'
   cinder-nimblestorage:
-    series: bionic
-    charm: cinder-nimblestorage
+    charm: ../../cinder-nimblestorage
     options:
       volume-driver: 'iscsi'
       volume-backend-name: 'nimble-storage-iscsi'
diff --git a/tests/bundles/focal-ussuri.yaml b/tests/bundles/focal-ussuri.yaml
index d09d761..45c586a 100644
--- a/tests/bundles/focal-ussuri.yaml
+++ b/tests/bundles/focal-ussuri.yaml
@@ -58,7 +58,7 @@ applications:
     charm: cs:~openstack-charmers-next/mysql-router
   
   cinder-nimblestorage:
-    charm: cinder-nimblestorage
+    charm: ../../cinder-nimblestorage
     options:
       volume-driver: 'iscsi'
       volume-backend-name: 'nimble-storage-iscsi'
diff --git a/tests/bundles/xenial-ocata.yaml b/tests/bundles/xenial-ocata.yaml
index b3cd106..9d907ab 100644
--- a/tests/bundles/xenial-ocata.yaml
+++ b/tests/bundles/xenial-ocata.yaml
@@ -1,4 +1,6 @@
 series: xenial
+variables:
+  openstack-origin: &openstack-origin cloud:xenial-ocata
 comment:
 - 'machines section to decide order of deployment. database sooner = faster'
 machines:
@@ -18,19 +20,19 @@ applications:
     charm: cs:~openstack-charmers-next/keystone
     num_units: 1
     options:
-      openstack-origin: cloud:xenial-ocata
+      openstack-origin: *openstack-origin
     to:
     - '1'
   cinder:
     charm: cs:~openstack-charmers-next/cinder
     num_units: 1
     options:
-      openstack-origin: cloud:xenial-ocata
+      openstack-origin: *openstack-origin
     to:
     - '2'
   cinder-nimblestorage:
     series: xenial
-    charm: cinder-nimblestorage
+    charm: ../../cinder-nimblestorage
     options:
       volume-driver: 'iscsi'
       volume-backend-name: 'nimble-storage-iscsi'
diff --git a/tests/tests.yaml b/tests/tests.yaml
index a25b864..bc02c59 100644
--- a/tests/tests.yaml
+++ b/tests/tests.yaml
@@ -4,6 +4,8 @@ tests:
 configure:
   - zaza.openstack.charm_tests.keystone.setup.add_demo_user
 gate_bundles:
+  - xenial-ocata
+  - bionic-rocky
   - focal-ussuri
 smoke_bundles:
   - focal-ussuri
diff --git a/tests/tests_cinder_nimblestorage.py b/tests/tests_cinder_nimblestorage.py
index 7154b78..543e696 100644
--- a/tests/tests_cinder_nimblestorage.py
+++ b/tests/tests_cinder_nimblestorage.py
@@ -66,7 +66,8 @@ class CinderNimblestorageTest(test_utils.OpenStackBaseTest):
             model_name=self.model_name,
             timeout=2)
 
-    def test_create_volume(self):
+    # Disabled while there is no hardware Nimblestorage appliance
+    def _disabled_test_create_volume(self):
         test_vol_name = "zaza{}".format(uuid.uuid1().fields[0])
         vol_new = self.cinder_client.volumes.create(
             name=test_vol_name,