diff --git a/.gitignore b/.gitignore
index 1e1d2dc..f046773 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,8 +1,13 @@
-build/
-.local/
-.testrepository/
-.tox/
-func-results.json
-test-charm/
-**/__pycache__
+bin
+.coverage
+.testrepository
+.tox
+*.sw[nop]
+*.pyc
+.unit-state.db
 .stestr
+__pycache__
+func-results.json
+tests/id_rsa_zaza
+build
+*.charm
diff --git a/build-requirements.txt b/build-requirements.txt
new file mode 100644
index 0000000..b6d2452
--- /dev/null
+++ b/build-requirements.txt
@@ -0,0 +1,7 @@
+# NOTES(lourot):
+# * We don't install charmcraft via pip anymore because it anyway spins up a
+#   container and scp the system's charmcraft snap inside it. So the charmcraft
+#   snap is necessary on the system anyway.
+# * `tox -e build` successfully validated with charmcraft 1.2.1
+
+cffi==1.14.6; python_version < '3.6'  # cffi 1.15.0 drops support for py35.
diff --git a/charmcraft.yaml b/charmcraft.yaml
new file mode 100644
index 0000000..c9a0ed7
--- /dev/null
+++ b/charmcraft.yaml
@@ -0,0 +1,33 @@
+type: charm
+
+parts:
+  charm:
+    build-packages:
+      - tox
+      - git
+      - python3-dev
+    override-build: |
+      apt-get install ca-certificates -y
+      tox -e build-reactive
+    override-stage: |
+      echo "Copying charm to staging area: $CHARMCRAFT_STAGE"
+      NAME=$(ls $CHARMCRAFT_PART_BUILD/build/builds)
+      cp -r $CHARMCRAFT_PART_BUILD/build/builds/$NAME/* $CHARMCRAFT_STAGE/
+    override-prime: |
+      # For some reason, the normal priming chokes on the fact that there's a
+      # hooks directory.
+      cp -r $CHARMCRAFT_STAGE/* .
+
+bases:
+  - build-on:
+      - name: ubuntu
+        channel: "20.04"
+        architectures:
+          - amd64
+    run-on:
+      - name: ubuntu
+        channel: "20.04"
+        architectures: [amd64, s390x, ppc64el, arm64]
+      - name: ubuntu
+        channel: "22.04"
+        architectures: [amd64, s390x, ppc64el, arm64]
diff --git a/metadata.yaml b/metadata.yaml
new file mode 120000
index 0000000..0768683
--- /dev/null
+++ b/metadata.yaml
@@ -0,0 +1 @@
+src/metadata.yaml
\ No newline at end of file
diff --git a/osci.yaml b/osci.yaml
index b3075cd..b77c989 100644
--- a/osci.yaml
+++ b/osci.yaml
@@ -8,69 +8,71 @@
       - bionic-stein-40_trilio-horizon
       - bionic-queens-41_trilio-horizon
       - bionic-stein-41_trilio-horizon
-      # Non-voting due to:
-      # https://bugs.launchpad.net/charm-trilio-data-mover/+bug/1951999
-      - bionic-train-40_trilio-horizon:
-          voting: false
-      - bionic-train-41_trilio-horizon:
-          voting: false
-      - bionic-ussuri-41_trilio-horizon:
-          voting: false
-      - focal-ussuri-41_trilio-horizon:
-          voting: false
+      - bionic-train-40_trilio-horizon
+      - bionic-train-41_trilio-horizon
+      - bionic-ussuri-41_trilio-horizon
+      - focal-ussuri-41_trilio-horizon
     vars:
       needs_charm_build: true
       charm_build_name: trilio-horizon-plugin
+      build_type: charmcraft
 - job:
-    name: bionic-train-40_trilio-horizon
+    name: focal-ussuri-41_trilio-horizon
     parent: func-target
     dependencies:
       - osci-lint
       - tox-py36
       - tox-py38
-      - tox-py39
+      - charm-build
+    vars:
+      tox_extra_args: focal-ussuri-41
+- job:
+    name: bionic-ussuri-41_trilio-horizon
+    parent: func-target
+    dependencies:
+      - focal-ussuri-41_trilio-horizon
+    vars:
+      tox_extra_args: bionic-ussuri-41
+- job:
+    name: bionic-train-41_trilio-horizon
+    parent: func-target
+    dependencies:
+      - focal-ussuri-41_trilio-horizon
+    vars:
+      tox_extra_args: bionic-train-41
+- job:
+    name: bionic-train-40_trilio-horizon
+    parent: func-target
+    dependencies:
+      - bionic-ussuri-41_trilio-horizon
     vars:
       tox_extra_args: bionic-train-40
+- job:
+    name: bionic-stein-41_trilio-horizon
+    parent: func-target
+    dependencies:
+      - bionic-train-41_trilio-horizon
+    vars:
+      tox_extra_args: bionic-stein-41
 - job:
     name: bionic-stein-40_trilio-horizon
     parent: func-target
-    dependencies: &smoke-jobs
+    dependencies:
       - bionic-train-40_trilio-horizon
     vars:
       tox_extra_args: bionic-stein-40
-- job:
-    name: bionic-queens-40_trilio-horizon
-    parent: func-target
-    dependencies: *smoke-jobs
-    vars:
-      tox_extra_args: bionic-queens-40
-- job:
-    name: bionic-train-41_trilio-horizon
-    parent: func-target
-    dependencies: *smoke-jobs
-    vars:
-      tox_extra_args: bionic-train-41
-- job:
-    name: bionic-stein-41_trilio-horizon
-    parent: func-target
-    dependencies: *smoke-jobs
-    vars:
-      tox_extra_args: bionic-stein-41
 - job:
     name: bionic-queens-41_trilio-horizon
     parent: func-target
-    dependencies: *smoke-jobs
+    dependencies:
+      - bionic-stein-41_trilio-horizon
     vars:
       tox_extra_args: bionic-queens-41
+
 - job:
-    name: bionic-ussuri-41_trilio-horizon
+    name: bionic-queens-40_trilio-horizon
     parent: func-target
-    dependencies: *smoke-jobs
+    dependencies:
+      - bionic-stein-40_trilio-horizon
     vars:
-      tox_extra_args: bionic-ussuri-41
-- job:
-    name: focal-ussuri-41_trilio-horizon
-    parent: func-target
-    dependencies: *smoke-jobs
-    vars:
-      tox_extra_args: focal-ussuri-41
+      tox_extra_args: bionic-queens-40
diff --git a/rename.sh b/rename.sh
new file mode 100755
index 0000000..d0c35c9
--- /dev/null
+++ b/rename.sh
@@ -0,0 +1,13 @@
+#!/bin/bash
+charm=$(grep "charm_build_name" osci.yaml | awk '{print $2}')
+echo "renaming ${charm}_*.charm to ${charm}.charm"
+echo -n "pwd: "
+pwd
+ls -al
+echo "Removing bad downloaded charm maybe?"
+if [[ -e "${charm}.charm" ]];
+then
+    rm "${charm}.charm"
+fi
+echo "Renaming charm here."
+mv ${charm}_*.charm ${charm}.charm
diff --git a/src/test-requirements.txt b/src/test-requirements.txt
index e771023..9c7afb7 100644
--- a/src/test-requirements.txt
+++ b/src/test-requirements.txt
@@ -4,6 +4,9 @@
 #     https://github.com/openstack-charmers/release-tools
 #
 
+# Need tox to be available from tox... inception yes, but its a workaround for now
+tox
+
 # Functional Test Requirements (let Zaza's dependencies solve all dependencies here!)
 git+https://github.com/openstack-charmers/zaza.git#egg=zaza
 git+https://github.com/openstack-charmers/zaza-openstack-tests.git#egg=zaza.openstack
diff --git a/src/tests/bundles/bionic-queens-40.yaml b/src/tests/bundles/bionic-queens-40.yaml
index 9e04432..6752136 100644
--- a/src/tests/bundles/bionic-queens-40.yaml
+++ b/src/tests/bundles/bionic-queens-40.yaml
@@ -1,5 +1,11 @@
 variables:
   openstack-origin: &openstack-origin distro
+  openstack-charm-channel: &openstack-charm-channel 'queens/edge'
+  ceph-charm-channel: &ceph-charm-channel 'octopus/edge'
+  rabbit-charm-channel: &rabbit-charm-channel '3.8/edge'
+  mysql-charm-channel: &mysql-charm-channel '5.7/edge'
+  vault-charm-channel: &vault-charm-channel '1.7/edge'
+  trilio-charm-channel: &trilio-charm-channel 'latest/stable'
   trilio-openstack-origin: &trilio-openstack-origin 'cloud:bionic-stein'
   triliovault-pkg-source: &triliovault-pkg-source 'deb [trusted=yes] https://apt.fury.io/triliodata-4-0/ /'
 
@@ -110,55 +116,63 @@ relations:
     - 'mysql:shared-db'
 applications:
   glance:
-    charm: cs:~openstack-charmers-next/glance
+    charm: ch:glance
+    channel: *openstack-charm-channel
     num_units: 1
     options:
       openstack-origin: *openstack-origin
   cinder:
-    charm: cs:~openstack-charmers-next/cinder
+    charm: ch:cinder
+    channel: *openstack-charm-channel
     num_units: 1
     options:
       openstack-origin: *openstack-origin
       block-device: "None"
       glance-api-version: 2
   keystone:
-    charm: cs:~openstack-charmers-next/keystone
-    series: bionic
+    charm: ch:keystone
+    channel: *openstack-charm-channel
     num_units: 1
     options:
       openstack-origin: *openstack-origin
       admin-password: openstack
   mysql:
-    charm: cs:~openstack-charmers-next/percona-cluster
+    charm: ch:percona-cluster
+    channel: *mysql-charm-channel
     num_units: 1
     options:
       innodb-buffer-pool-size: 256M
       max-connections: 1000
   neutron-api:
-    charm: cs:~openstack-charmers-next/neutron-api
+    charm: ch:neutron-api
+    channel: *openstack-charm-channel
     num_units: 1
     options:
       openstack-origin: *openstack-origin
       flat-network-providers: physnet1
       neutron-security-groups: true
   neutron-gateway:
-    charm: cs:~openstack-charmers-next/neutron-gateway
+    charm: ch:neutron-gateway
+    channel: *openstack-charm-channel
     num_units: 1
     options:
       openstack-origin: *openstack-origin
       bridge-mappings: physnet1:br-ex
   neutron-openvswitch:
-    charm: cs:~openstack-charmers-next/neutron-openvswitch
+    charm: ch:neutron-openvswitch
+    channel: *openstack-charm-channel
     num_units: 0
   nova-cloud-controller:
-    charm: cs:~openstack-charmers-next/nova-cloud-controller
+    charm: ch:nova-cloud-controller
+    channel: *openstack-charm-channel
     num_units: 1
     options:
       openstack-origin: *openstack-origin
       network-manager: Neutron
       debug: true
   nova-compute:
-    charm: cs:~openstack-charmers-next/nova-compute
+    charm: ch:nova-compute
+    channel: *openstack-charm-channel
     num_units: 3
     constraints: mem=4G
     options:
@@ -173,37 +187,42 @@ applications:
       # Allow for more retries when testing ontop of openstack
       config-flags: block_device_allocate_retries=120
   rabbitmq-server:
-    charm: cs:~openstack-charmers-next/rabbitmq-server
+    charm: ch:rabbitmq-server
+    channel: *rabbit-charm-channel
     num_units: 1
   trilio-data-mover:
-    charm: cs:~openstack-charmers-next/trilio-data-mover
+    charm: ch:openstack-charmers-trilio-data-mover
+    channel: *trilio-charm-channel
     options:
       triliovault-pkg-source: *triliovault-pkg-source
   trilio-dm-api:
-    charm: cs:~openstack-charmers-next/trilio-dm-api
+    charm: ch:openstack-charmers-trilio-dm-api
+    channel: *trilio-charm-channel
     num_units: 1
     options:
       openstack-origin: *trilio-openstack-origin
       triliovault-pkg-source: *triliovault-pkg-source
   trilio-horizon-plugin:
-    charm: ../../../trilio-horizon-plugin
+    charm: ../../../trilio-horizon-plugin.charm
     options:
       triliovault-pkg-source: *triliovault-pkg-source
   trilio-wlm:
-    charm: cs:~openstack-charmers-next/trilio-wlm
-    series: bionic
+    charm: ch:openstack-charmers-trilio-wlm
+    channel: *trilio-charm-channel
     num_units: 1
     options:
       openstack-origin: *trilio-openstack-origin
       triliovault-pkg-source: *triliovault-pkg-source
   ceph-mon:
-    charm: cs:~openstack-charmers-next/ceph-mon
+    charm: ch:ceph-mon
+    channel: *ceph-charm-channel
     num_units: 3
     options:
       source: *openstack-origin
       expected-osd-count: 3
   ceph-osd:
-    charm: cs:~openstack-charmers-next/ceph-osd
+    charm: ch:ceph-osd
+    channel: *ceph-charm-channel
     constraints: mem=1G
     num_units: 3
     options:
@@ -213,17 +232,20 @@ applications:
     storage:
       osd-devices:  cinder,40G
   cinder-ceph:
-    charm: cs:~openstack-charmers-next/cinder-ceph
+    charm: ch:cinder-ceph
+    channel: *openstack-charm-channel
   vault:
+    charm: ch:vault
+    channel: *vault-charm-channel
     num_units: 1
-    charm: cs:~openstack-charmers-next/vault
   nfs-server-test-fixture:
     charm: cs:~openstack-charmers-next/nfs-server-test-fixture
     num_units: 1
     storage:
       share: cinder,40G
   openstack-dashboard:
-    charm: cs:~openstack-charmers-next/openstack-dashboard
+    charm: ch:openstack-dashboard
+    channel: *openstack-charm-channel
     num_units: 1
     options:
       openstack-origin: *openstack-origin
diff --git a/src/tests/bundles/bionic-queens-41.yaml b/src/tests/bundles/bionic-queens-41.yaml
index 5669934..0d36bb9 100644
--- a/src/tests/bundles/bionic-queens-41.yaml
+++ b/src/tests/bundles/bionic-queens-41.yaml
@@ -1,5 +1,11 @@
 variables:
   openstack-origin: &openstack-origin distro
+  openstack-charm-channel: &openstack-charm-channel 'queens/edge'
+  ceph-charm-channel: &ceph-charm-channel 'octopus/edge'
+  rabbit-charm-channel: &rabbit-charm-channel '3.8/edge'
+  mysql-charm-channel: &mysql-charm-channel '5.7/edge'
+  vault-charm-channel: &vault-charm-channel '1.7/edge'
+  trilio-charm-channel: &trilio-charm-channel 'latest/stable'
   trilio-openstack-origin: &trilio-openstack-origin 'cloud:bionic-stein'
   triliovault-pkg-source: &triliovault-pkg-source 'deb [trusted=yes] https://apt.fury.io/triliodata-4-1/ /'
 
@@ -110,55 +116,63 @@ relations:
     - 'mysql:shared-db'
 applications:
   glance:
-    charm: cs:~openstack-charmers-next/glance
+    charm: ch:glance
+    channel: *openstack-charm-channel
     num_units: 1
     options:
       openstack-origin: *openstack-origin
   cinder:
-    charm: cs:~openstack-charmers-next/cinder
+    charm: ch:cinder
+    channel: *openstack-charm-channel
     num_units: 1
     options:
       openstack-origin: *openstack-origin
       block-device: "None"
       glance-api-version: 2
   keystone:
-    charm: cs:~openstack-charmers-next/keystone
-    series: bionic
+    charm: ch:keystone
+    channel: *openstack-charm-channel
     num_units: 1
     options:
       openstack-origin: *openstack-origin
       admin-password: openstack
   mysql:
-    charm: cs:~openstack-charmers-next/percona-cluster
+    charm: ch:percona-cluster
+    channel: *mysql-charm-channel
     num_units: 1
     options:
       innodb-buffer-pool-size: 256M
       max-connections: 1000
   neutron-api:
-    charm: cs:~openstack-charmers-next/neutron-api
+    charm: ch:neutron-api
+    channel: *openstack-charm-channel
     num_units: 1
     options:
       openstack-origin: *openstack-origin
       flat-network-providers: physnet1
       neutron-security-groups: true
   neutron-gateway:
-    charm: cs:~openstack-charmers-next/neutron-gateway
+    charm: ch:neutron-gateway
+    channel: *openstack-charm-channel
     num_units: 1
     options:
       openstack-origin: *openstack-origin
       bridge-mappings: physnet1:br-ex
   neutron-openvswitch:
-    charm: cs:~openstack-charmers-next/neutron-openvswitch
+    charm: ch:neutron-openvswitch
+    channel: *openstack-charm-channel
     num_units: 0
   nova-cloud-controller:
-    charm: cs:~openstack-charmers-next/nova-cloud-controller
+    charm: ch:nova-cloud-controller
+    channel: *openstack-charm-channel
     num_units: 1
     options:
       openstack-origin: *openstack-origin
       network-manager: Neutron
       debug: true
   nova-compute:
-    charm: cs:~openstack-charmers-next/nova-compute
+    charm: ch:nova-compute
+    channel: *openstack-charm-channel
     num_units: 3
     constraints: mem=4G
     options:
@@ -173,37 +187,42 @@ applications:
       # Allow for more retries when testing ontop of openstack
       config-flags: block_device_allocate_retries=120
   rabbitmq-server:
-    charm: cs:~openstack-charmers-next/rabbitmq-server
+    charm: ch:rabbitmq-server
+    channel: *rabbit-charm-channel
     num_units: 1
   trilio-data-mover:
-    charm: cs:~openstack-charmers-next/trilio-data-mover
+    charm: ch:openstack-charmers-trilio-data-mover
+    channel: *trilio-charm-channel
     options:
       triliovault-pkg-source: *triliovault-pkg-source
   trilio-dm-api:
-    charm: cs:~openstack-charmers-next/trilio-dm-api
+    charm: ch:openstack-charmers-trilio-dm-api
+    channel: *trilio-charm-channel
     num_units: 1
     options:
       openstack-origin: *trilio-openstack-origin
       triliovault-pkg-source: *triliovault-pkg-source
   trilio-horizon-plugin:
-    charm: ../../../trilio-horizon-plugin
+    charm: ../../../trilio-horizon-plugin.charm
     options:
       triliovault-pkg-source: *triliovault-pkg-source
   trilio-wlm:
-    charm: cs:~openstack-charmers-next/trilio-wlm
-    series: bionic
+    charm: ch:openstack-charmers-trilio-wlm
+    channel: *trilio-charm-channel
     num_units: 1
     options:
       openstack-origin: *trilio-openstack-origin
       triliovault-pkg-source: *triliovault-pkg-source
   ceph-mon:
-    charm: cs:~openstack-charmers-next/ceph-mon
+    charm: ch:ceph-mon
+    channel: *ceph-charm-channel
     num_units: 3
     options:
       source: *openstack-origin
       expected-osd-count: 3
   ceph-osd:
-    charm: cs:~openstack-charmers-next/ceph-osd
+    charm: ch:ceph-osd
+    channel: *ceph-charm-channel
     constraints: mem=1G
     num_units: 3
     options:
@@ -213,17 +232,20 @@ applications:
     storage:
       osd-devices:  cinder,40G
   cinder-ceph:
-    charm: cs:~openstack-charmers-next/cinder-ceph
+    charm: ch:cinder-ceph
+    channel: *openstack-charm-channel
   vault:
+    charm: ch:vault
+    channel: *vault-charm-channel
     num_units: 1
-    charm: cs:~openstack-charmers-next/vault
   nfs-server-test-fixture:
     charm: cs:~openstack-charmers-next/nfs-server-test-fixture
     num_units: 1
     storage:
       share: cinder,40G
   openstack-dashboard:
-    charm: cs:~openstack-charmers-next/openstack-dashboard
+    charm: ch:openstack-dashboard
+    channel: *openstack-charm-channel
     num_units: 1
     options:
       openstack-origin: *openstack-origin
diff --git a/src/tests/bundles/bionic-stein-40.yaml b/src/tests/bundles/bionic-stein-40.yaml
index 2d66f25..e0f90f3 100644
--- a/src/tests/bundles/bionic-stein-40.yaml
+++ b/src/tests/bundles/bionic-stein-40.yaml
@@ -1,5 +1,11 @@
 variables:
   openstack-origin: &openstack-origin 'cloud:bionic-stein'
+  openstack-charm-channel: &openstack-charm-channel 'stein/edge'
+  ceph-charm-channel: &ceph-charm-channel 'octopus/edge'
+  rabbit-charm-channel: &rabbit-charm-channel '3.8/edge'
+  mysql-charm-channel: &mysql-charm-channel '5.7/edge'
+  vault-charm-channel: &vault-charm-channel '1.7/edge'
+  trilio-charm-channel: &trilio-charm-channel 'latest/stable'
   triliovault-pkg-source: &triliovault-pkg-source 'deb [trusted=yes] https://apt.fury.io/triliodata-4-0/ /'
 
 series: &series bionic
@@ -109,55 +115,63 @@ relations:
     - 'mysql:shared-db'
 applications:
   glance:
-    charm: cs:~openstack-charmers-next/glance
+    charm: ch:glance
+    channel: *openstack-charm-channel
     num_units: 1
     options:
       openstack-origin: *openstack-origin
   cinder:
-    charm: cs:~openstack-charmers-next/cinder
+    charm: ch:cinder
+    channel: *openstack-charm-channel
     num_units: 1
     options:
       openstack-origin: *openstack-origin
       block-device: "None"
       glance-api-version: 2
   keystone:
-    charm: cs:~openstack-charmers-next/keystone
-    series: bionic
+    charm: ch:keystone
+    channel: *openstack-charm-channel
     num_units: 1
     options:
       openstack-origin: *openstack-origin
       admin-password: openstack
   mysql:
-    charm: cs:~openstack-charmers-next/percona-cluster
+    charm: ch:percona-cluster
+    channel: *mysql-charm-channel
     num_units: 1
     options:
       innodb-buffer-pool-size: 256M
       max-connections: 1000
   neutron-api:
-    charm: cs:~openstack-charmers-next/neutron-api
+    charm: ch:neutron-api
+    channel: *openstack-charm-channel
     num_units: 1
     options:
       openstack-origin: *openstack-origin
       flat-network-providers: physnet1
       neutron-security-groups: true
   neutron-gateway:
-    charm: cs:~openstack-charmers-next/neutron-gateway
+    charm: ch:neutron-gateway
+    channel: *openstack-charm-channel
     num_units: 1
     options:
       openstack-origin: *openstack-origin
       bridge-mappings: physnet1:br-ex
   neutron-openvswitch:
-    charm: cs:~openstack-charmers-next/neutron-openvswitch
+    charm: ch:neutron-openvswitch
+    channel: *openstack-charm-channel
     num_units: 0
   nova-cloud-controller:
-    charm: cs:~openstack-charmers-next/nova-cloud-controller
+    charm: ch:nova-cloud-controller
+    channel: *openstack-charm-channel
     num_units: 1
     options:
       openstack-origin: *openstack-origin
       network-manager: Neutron
       debug: true
   nova-compute:
-    charm: cs:~openstack-charmers-next/nova-compute
+    charm: ch:nova-compute
+    channel: *openstack-charm-channel
     num_units: 3
     constraints: mem=4G
     options:
@@ -172,35 +186,40 @@ applications:
       # Allow for more retries when testing ontop of openstack
       config-flags: block_device_allocate_retries=120
   rabbitmq-server:
-    charm: cs:~openstack-charmers-next/rabbitmq-server
+    charm: ch:rabbitmq-server
+    channel: *rabbit-charm-channel
     num_units: 1
   trilio-data-mover:
-    charm: cs:~openstack-charmers-next/trilio-data-mover
+    charm: ch:openstack-charmers-trilio-data-mover
+    channel: *trilio-charm-channel
     options:
       triliovault-pkg-source: *triliovault-pkg-source
   trilio-dm-api:
-    charm: cs:~openstack-charmers-next/trilio-dm-api
+    charm: ch:openstack-charmers-trilio-dm-api
+    channel: *trilio-charm-channel
     num_units: 1
     options:
       triliovault-pkg-source: *triliovault-pkg-source
   trilio-horizon-plugin:
-    charm: ../../../trilio-horizon-plugin
+    charm: ../../../trilio-horizon-plugin.charm
     options:
       triliovault-pkg-source: *triliovault-pkg-source
   trilio-wlm:
-    charm: cs:~openstack-charmers-next/trilio-wlm
-    series: bionic
+    charm: ch:openstack-charmers-trilio-wlm
+    channel: *trilio-charm-channel
     num_units: 1
     options:
       triliovault-pkg-source: *triliovault-pkg-source
   ceph-mon:
-    charm: cs:~openstack-charmers-next/ceph-mon
+    charm: ch:ceph-mon
+    channel: *ceph-charm-channel
     num_units: 3
     options:
       source: *openstack-origin
       expected-osd-count: 3
   ceph-osd:
-    charm: cs:~openstack-charmers-next/ceph-osd
+    charm: ch:ceph-osd
+    channel: *ceph-charm-channel
     constraints: mem=1G
     num_units: 3
     options:
@@ -210,17 +229,20 @@ applications:
     storage:
       osd-devices:  cinder,40G
   cinder-ceph:
-    charm: cs:~openstack-charmers-next/cinder-ceph
+    charm: ch:cinder-ceph
+    channel: *openstack-charm-channel
   vault:
+    charm: ch:vault
+    channel: *vault-charm-channel
     num_units: 1
-    charm: cs:~openstack-charmers-next/vault
   nfs-server-test-fixture:
     charm: cs:~openstack-charmers-next/nfs-server-test-fixture
     num_units: 1
     storage:
       share: cinder,40G
   openstack-dashboard:
-    charm: cs:~openstack-charmers-next/openstack-dashboard
+    charm: ch:openstack-dashboard
+    channel: *openstack-charm-channel
     num_units: 1
     options:
       openstack-origin: *openstack-origin
diff --git a/src/tests/bundles/bionic-stein-41.yaml b/src/tests/bundles/bionic-stein-41.yaml
index 609d8f0..62adce1 100644
--- a/src/tests/bundles/bionic-stein-41.yaml
+++ b/src/tests/bundles/bionic-stein-41.yaml
@@ -1,5 +1,11 @@
 variables:
   openstack-origin: &openstack-origin 'cloud:bionic-stein'
+  openstack-charm-channel: &openstack-charm-channel 'stein/edge'
+  ceph-charm-channel: &ceph-charm-channel 'octopus/edge'
+  rabbit-charm-channel: &rabbit-charm-channel '3.8/edge'
+  mysql-charm-channel: &mysql-charm-channel '5.7/edge'
+  vault-charm-channel: &vault-charm-channel '1.7/edge'
+  trilio-charm-channel: &trilio-charm-channel 'latest/stable'
   triliovault-pkg-source: &triliovault-pkg-source 'deb [trusted=yes] https://apt.fury.io/triliodata-4-1/ /'
 
 series: &series bionic
@@ -109,55 +115,63 @@ relations:
     - 'mysql:shared-db'
 applications:
   glance:
-    charm: cs:~openstack-charmers-next/glance
+    charm: ch:glance
+    channel: *openstack-charm-channel
     num_units: 1
     options:
       openstack-origin: *openstack-origin
   cinder:
-    charm: cs:~openstack-charmers-next/cinder
+    charm: ch:cinder
+    channel: *openstack-charm-channel
     num_units: 1
     options:
       openstack-origin: *openstack-origin
       block-device: "None"
       glance-api-version: 2
   keystone:
-    charm: cs:~openstack-charmers-next/keystone
-    series: bionic
+    charm: ch:keystone
+    channel: *openstack-charm-channel
     num_units: 1
     options:
       openstack-origin: *openstack-origin
       admin-password: openstack
   mysql:
-    charm: cs:~openstack-charmers-next/percona-cluster
+    charm: ch:percona-cluster
+    channel: *mysql-charm-channel
     num_units: 1
     options:
       innodb-buffer-pool-size: 256M
       max-connections: 1000
   neutron-api:
-    charm: cs:~openstack-charmers-next/neutron-api
+    charm: ch:neutron-api
+    channel: *openstack-charm-channel
     num_units: 1
     options:
       openstack-origin: *openstack-origin
       flat-network-providers: physnet1
       neutron-security-groups: true
   neutron-gateway:
-    charm: cs:~openstack-charmers-next/neutron-gateway
+    charm: ch:neutron-gateway
+    channel: *openstack-charm-channel
     num_units: 1
     options:
       openstack-origin: *openstack-origin
       bridge-mappings: physnet1:br-ex
   neutron-openvswitch:
-    charm: cs:~openstack-charmers-next/neutron-openvswitch
+    charm: ch:neutron-openvswitch
+    channel: *openstack-charm-channel
     num_units: 0
   nova-cloud-controller:
-    charm: cs:~openstack-charmers-next/nova-cloud-controller
+    charm: ch:nova-cloud-controller
+    channel: *openstack-charm-channel
     num_units: 1
     options:
       openstack-origin: *openstack-origin
       network-manager: Neutron
       debug: true
   nova-compute:
-    charm: cs:~openstack-charmers-next/nova-compute
+    charm: ch:nova-compute
+    channel: *openstack-charm-channel
     num_units: 3
     constraints: mem=4G
     options:
@@ -172,35 +186,40 @@ applications:
       # Allow for more retries when testing ontop of openstack
       config-flags: block_device_allocate_retries=120
   rabbitmq-server:
-    charm: cs:~openstack-charmers-next/rabbitmq-server
+    charm: ch:rabbitmq-server
+    channel: *rabbit-charm-channel
     num_units: 1
   trilio-data-mover:
-    charm: cs:~openstack-charmers-next/trilio-data-mover
+    charm: ch:openstack-charmers-trilio-data-mover
+    channel: *trilio-charm-channel
     options:
       triliovault-pkg-source: *triliovault-pkg-source
   trilio-dm-api:
-    charm: cs:~openstack-charmers-next/trilio-dm-api
+    charm: ch:openstack-charmers-trilio-dm-api
+    channel: *trilio-charm-channel
     num_units: 1
     options:
       triliovault-pkg-source: *triliovault-pkg-source
   trilio-horizon-plugin:
-    charm: ../../../trilio-horizon-plugin
+    charm: ../../../trilio-horizon-plugin.charm
     options:
       triliovault-pkg-source: *triliovault-pkg-source
   trilio-wlm:
-    charm: cs:~openstack-charmers-next/trilio-wlm
-    series: bionic
+    charm: ch:openstack-charmers-trilio-wlm
+    channel: *trilio-charm-channel
     num_units: 1
     options:
       triliovault-pkg-source: *triliovault-pkg-source
   ceph-mon:
-    charm: cs:~openstack-charmers-next/ceph-mon
+    charm: ch:ceph-mon
+    channel: *ceph-charm-channel
     num_units: 3
     options:
       source: *openstack-origin
       expected-osd-count: 3
   ceph-osd:
-    charm: cs:~openstack-charmers-next/ceph-osd
+    charm: ch:ceph-osd
+    channel: *ceph-charm-channel
     constraints: mem=1G
     num_units: 3
     options:
@@ -210,17 +229,20 @@ applications:
     storage:
       osd-devices:  cinder,40G
   cinder-ceph:
-    charm: cs:~openstack-charmers-next/cinder-ceph
+    charm: ch:cinder-ceph
+    channel: *openstack-charm-channel
   vault:
+    charm: ch:vault
+    channel: *vault-charm-channel
     num_units: 1
-    charm: cs:~openstack-charmers-next/vault
   nfs-server-test-fixture:
     charm: cs:~openstack-charmers-next/nfs-server-test-fixture
     num_units: 1
     storage:
       share: cinder,40G
   openstack-dashboard:
-    charm: cs:~openstack-charmers-next/openstack-dashboard
+    charm: ch:openstack-dashboard
+    channel: *openstack-charm-channel
     num_units: 1
     options:
       openstack-origin: *openstack-origin
diff --git a/src/tests/bundles/bionic-train-40.yaml b/src/tests/bundles/bionic-train-40.yaml
index e9c8667..9812efe 100644
--- a/src/tests/bundles/bionic-train-40.yaml
+++ b/src/tests/bundles/bionic-train-40.yaml
@@ -1,7 +1,14 @@
 variables:
   openstack-origin: &openstack-origin 'cloud:bionic-train'
+  openstack-charm-channel: &openstack-charm-channel 'train/edge'
+  ceph-charm-channel: &ceph-charm-channel 'octopus/edge'
+  rabbit-charm-channel: &rabbit-charm-channel '3.8/edge'
+  mysql-charm-channel: &mysql-charm-channel '5.7/edge'
+  vault-charm-channel: &vault-charm-channel '1.7/edge'
+  trilio-charm-channel: &trilio-charm-channel 'latest/stable'
   triliovault-pkg-source: &triliovault-pkg-source 'deb [trusted=yes] https://apt.fury.io/triliodata-4-0/ /'
 
+
 series: &series bionic
 
 relations:
@@ -117,55 +124,63 @@ relations:
     - 'mysql:shared-db'
 applications:
   glance:
-    charm: cs:~openstack-charmers-next/glance
+    charm: ch:glance
+    channel: *openstack-charm-channel
     num_units: 1
     options:
       openstack-origin: *openstack-origin
   cinder:
-    charm: cs:~openstack-charmers-next/cinder
+    charm: ch:cinder
+    channel: *openstack-charm-channel
     num_units: 1
     options:
       openstack-origin: *openstack-origin
       block-device: "None"
       glance-api-version: 2
   keystone:
-    charm: cs:~openstack-charmers-next/keystone
-    series: bionic
+    charm: ch:keystone
+    channel: *openstack-charm-channel
     num_units: 1
     options:
       openstack-origin: *openstack-origin
       admin-password: openstack
   mysql:
-    charm: cs:~openstack-charmers-next/percona-cluster
+    charm: ch:percona-cluster
+    channel: *mysql-charm-channel
     num_units: 1
     options:
       innodb-buffer-pool-size: 256M
       max-connections: 1000
   neutron-api:
-    charm: cs:~openstack-charmers-next/neutron-api
+    charm: ch:neutron-api
+    channel: *openstack-charm-channel
     num_units: 1
     options:
       openstack-origin: *openstack-origin
       flat-network-providers: physnet1
       neutron-security-groups: true
   neutron-gateway:
-    charm: cs:~openstack-charmers-next/neutron-gateway
+    charm: ch:neutron-gateway
+    channel: *openstack-charm-channel
     num_units: 1
     options:
       openstack-origin: *openstack-origin
       bridge-mappings: physnet1:br-ex
   neutron-openvswitch:
-    charm: cs:~openstack-charmers-next/neutron-openvswitch
+    charm: ch:neutron-openvswitch
+    channel: *openstack-charm-channel
     num_units: 0
   nova-cloud-controller:
-    charm: cs:~openstack-charmers-next/nova-cloud-controller
+    charm: ch:nova-cloud-controller
+    channel: *openstack-charm-channel
     num_units: 1
     options:
       openstack-origin: *openstack-origin
       network-manager: Neutron
       debug: true
   nova-compute:
-    charm: cs:~openstack-charmers-next/nova-compute
+    charm: ch:nova-compute
+    channel: *openstack-charm-channel
     num_units: 3
     constraints: mem=4G
     options:
@@ -180,37 +195,42 @@ applications:
       # Allow for more retries when testing ontop of openstack
       config-flags: block_device_allocate_retries=120
   rabbitmq-server:
-    charm: cs:~openstack-charmers-next/rabbitmq-server
+    charm: ch:rabbitmq-server
+    channel: *rabbit-charm-channel
     num_units: 1
   trilio-data-mover:
-    charm: cs:~openstack-charmers-next/trilio-data-mover
+    charm: ch:openstack-charmers-trilio-data-mover
+    channel: *trilio-charm-channel
     options:
       triliovault-pkg-source: *triliovault-pkg-source
   trilio-dm-api:
-    charm: cs:~openstack-charmers-next/trilio-dm-api
+    charm: ch:openstack-charmers-trilio-dm-api
+    channel: *trilio-charm-channel
     num_units: 1
     options:
       openstack-origin: *openstack-origin
       triliovault-pkg-source: *triliovault-pkg-source
   trilio-horizon-plugin:
-    charm: ../../../trilio-horizon-plugin
+    charm: ../../../trilio-horizon-plugin.charm
     options:
       triliovault-pkg-source: *triliovault-pkg-source
   trilio-wlm:
-    charm: cs:~openstack-charmers-next/trilio-wlm
-    series: bionic
+    charm: ch:openstack-charmers-trilio-wlm
+    channel: *trilio-charm-channel
     num_units: 1
     options:
       openstack-origin: *openstack-origin
       triliovault-pkg-source: *triliovault-pkg-source
   ceph-mon:
-    charm: cs:~openstack-charmers-next/ceph-mon
+    charm: ch:ceph-mon
+    channel: *ceph-charm-channel
     num_units: 3
     options:
       source: *openstack-origin
       expected-osd-count: 3
   ceph-osd:
-    charm: cs:~openstack-charmers-next/ceph-osd
+    charm: ch:ceph-osd
+    channel: *ceph-charm-channel
     constraints: mem=1G
     num_units: 3
     options:
@@ -220,12 +240,15 @@ applications:
     storage:
       osd-devices:  cinder,40G
   cinder-ceph:
-    charm: cs:~openstack-charmers-next/cinder-ceph
+    charm: ch:cinder-ceph
+    channel: *openstack-charm-channel
   vault:
+    charm: ch:vault
+    channel: *vault-charm-channel
     num_units: 1
-    charm: cs:~openstack-charmers-next/vault
   placement:
-    charm: cs:~openstack-charmers-next/placement
+    charm: ch:placement
+    channel: *openstack-charm-channel
     num_units: 1
     options:
       openstack-origin: *openstack-origin
@@ -235,7 +258,8 @@ applications:
     storage:
       share: cinder,40G
   openstack-dashboard:
-    charm: cs:~openstack-charmers-next/openstack-dashboard
+    charm: ch:openstack-dashboard
+    channel: *openstack-charm-channel
     num_units: 1
     options:
       openstack-origin: *openstack-origin
diff --git a/src/tests/bundles/bionic-train-41.yaml b/src/tests/bundles/bionic-train-41.yaml
index 2d00756..4664c14 100644
--- a/src/tests/bundles/bionic-train-41.yaml
+++ b/src/tests/bundles/bionic-train-41.yaml
@@ -1,7 +1,14 @@
 variables:
   openstack-origin: &openstack-origin 'cloud:bionic-train'
+  openstack-charm-channel: &openstack-charm-channel 'train/edge'
+  ceph-charm-channel: &ceph-charm-channel 'octopus/edge'
+  rabbit-charm-channel: &rabbit-charm-channel '3.8/edge'
+  mysql-charm-channel: &mysql-charm-channel '5.7/edge'
+  vault-charm-channel: &vault-charm-channel '1.7/edge'
+  trilio-charm-channel: &trilio-charm-channel 'latest/stable'
   triliovault-pkg-source: &triliovault-pkg-source 'deb [trusted=yes] https://apt.fury.io/triliodata-4-1/ /'
 
+
 series: &series bionic
 
 relations:
@@ -117,55 +124,63 @@ relations:
     - 'mysql:shared-db'
 applications:
   glance:
-    charm: cs:~openstack-charmers-next/glance
+    charm: ch:glance
+    channel: *openstack-charm-channel
     num_units: 1
     options:
       openstack-origin: *openstack-origin
   cinder:
-    charm: cs:~openstack-charmers-next/cinder
+    charm: ch:cinder
+    channel: *openstack-charm-channel
     num_units: 1
     options:
       openstack-origin: *openstack-origin
       block-device: "None"
       glance-api-version: 2
   keystone:
-    charm: cs:~openstack-charmers-next/keystone
-    series: bionic
+    charm: ch:keystone
+    channel: *openstack-charm-channel
     num_units: 1
     options:
       openstack-origin: *openstack-origin
       admin-password: openstack
   mysql:
-    charm: cs:~openstack-charmers-next/percona-cluster
+    charm: ch:percona-cluster
+    channel: *mysql-charm-channel
     num_units: 1
     options:
       innodb-buffer-pool-size: 256M
       max-connections: 1000
   neutron-api:
-    charm: cs:~openstack-charmers-next/neutron-api
+    charm: ch:neutron-api
+    channel: *openstack-charm-channel
     num_units: 1
     options:
       openstack-origin: *openstack-origin
       flat-network-providers: physnet1
       neutron-security-groups: true
   neutron-gateway:
-    charm: cs:~openstack-charmers-next/neutron-gateway
+    charm: ch:neutron-gateway
+    channel: *openstack-charm-channel
     num_units: 1
     options:
       openstack-origin: *openstack-origin
       bridge-mappings: physnet1:br-ex
   neutron-openvswitch:
-    charm: cs:~openstack-charmers-next/neutron-openvswitch
+    charm: ch:neutron-openvswitch
+    channel: *openstack-charm-channel
     num_units: 0
   nova-cloud-controller:
-    charm: cs:~openstack-charmers-next/nova-cloud-controller
+    charm: ch:nova-cloud-controller
+    channel: *openstack-charm-channel
     num_units: 1
     options:
       openstack-origin: *openstack-origin
       network-manager: Neutron
       debug: true
   nova-compute:
-    charm: cs:~openstack-charmers-next/nova-compute
+    charm: ch:nova-compute
+    channel: *openstack-charm-channel
     num_units: 3
     constraints: mem=4G
     options:
@@ -180,37 +195,42 @@ applications:
       # Allow for more retries when testing ontop of openstack
       config-flags: block_device_allocate_retries=120
   rabbitmq-server:
-    charm: cs:~openstack-charmers-next/rabbitmq-server
+    charm: ch:rabbitmq-server
+    channel: *rabbit-charm-channel
     num_units: 1
   trilio-data-mover:
-    charm: cs:~openstack-charmers-next/trilio-data-mover
+    charm: ch:openstack-charmers-trilio-data-mover
+    channel: *trilio-charm-channel
     options:
       triliovault-pkg-source: *triliovault-pkg-source
   trilio-dm-api:
-    charm: cs:~openstack-charmers-next/trilio-dm-api
+    charm: ch:openstack-charmers-trilio-dm-api
+    channel: *trilio-charm-channel
     num_units: 1
     options:
       openstack-origin: *openstack-origin
       triliovault-pkg-source: *triliovault-pkg-source
   trilio-horizon-plugin:
-    charm: ../../../trilio-horizon-plugin
+    charm: ../../../trilio-horizon-plugin.charm
     options:
       triliovault-pkg-source: *triliovault-pkg-source
   trilio-wlm:
-    charm: cs:~openstack-charmers-next/trilio-wlm
-    series: bionic
+    charm: ch:openstack-charmers-trilio-wlm
+    channel: *trilio-charm-channel
     num_units: 1
     options:
       openstack-origin: *openstack-origin
       triliovault-pkg-source: *triliovault-pkg-source
   ceph-mon:
-    charm: cs:~openstack-charmers-next/ceph-mon
+    charm: ch:ceph-mon
+    channel: *ceph-charm-channel
     num_units: 3
     options:
       source: *openstack-origin
       expected-osd-count: 3
   ceph-osd:
-    charm: cs:~openstack-charmers-next/ceph-osd
+    charm: ch:ceph-osd
+    channel: *ceph-charm-channel
     constraints: mem=1G
     num_units: 3
     options:
@@ -220,12 +240,15 @@ applications:
     storage:
       osd-devices:  cinder,40G
   cinder-ceph:
-    charm: cs:~openstack-charmers-next/cinder-ceph
+    charm: ch:cinder-ceph
+    channel: *openstack-charm-channel
   vault:
+    charm: ch:vault
+    channel: *vault-charm-channel
     num_units: 1
-    charm: cs:~openstack-charmers-next/vault
   placement:
-    charm: cs:~openstack-charmers-next/placement
+    charm: ch:placement
+    channel: *openstack-charm-channel
     num_units: 1
     options:
       openstack-origin: *openstack-origin
@@ -235,7 +258,8 @@ applications:
     storage:
       share: cinder,40G
   openstack-dashboard:
-    charm: cs:~openstack-charmers-next/openstack-dashboard
+    charm: ch:openstack-dashboard
+    channel: *openstack-charm-channel
     num_units: 1
     options:
       openstack-origin: *openstack-origin
diff --git a/src/tests/bundles/bionic-ussuri-41.yaml b/src/tests/bundles/bionic-ussuri-41.yaml
index aaaf4ea..fbcdb56 100644
--- a/src/tests/bundles/bionic-ussuri-41.yaml
+++ b/src/tests/bundles/bionic-ussuri-41.yaml
@@ -1,7 +1,14 @@
 variables:
   openstack-origin: &openstack-origin 'cloud:bionic-ussuri'
+  openstack-charm-channel: &openstack-charm-channel 'ussuri/edge'
+  ceph-charm-channel: &ceph-charm-channel 'octopus/edge'
+  rabbit-charm-channel: &rabbit-charm-channel '3.8/edge'
+  mysql-charm-channel: &mysql-charm-channel '5.7/edge'
+  vault-charm-channel: &vault-charm-channel '1.7/edge'
+  trilio-charm-channel: &trilio-charm-channel 'latest/stable'
   triliovault-pkg-source: &triliovault-pkg-source 'deb [trusted=yes] https://apt.fury.io/triliodata-4-1/ /'
 
+
 series: &series bionic
 
 relations:
@@ -117,32 +124,36 @@ relations:
     - 'mysql:shared-db'
 applications:
   glance:
-    charm: cs:~openstack-charmers-next/glance
+    charm: ch:glance
+    channel: *openstack-charm-channel
     num_units: 1
     options:
       openstack-origin: *openstack-origin
   cinder:
-    charm: cs:~openstack-charmers-next/cinder
+    charm: ch:cinder
+    channel: *openstack-charm-channel
     num_units: 1
     options:
       openstack-origin: *openstack-origin
       block-device: "None"
       glance-api-version: 2
   keystone:
-    charm: cs:~openstack-charmers-next/keystone
-    series: bionic
+    charm: ch:keystone
+    channel: *openstack-charm-channel
     num_units: 1
     options:
       openstack-origin: *openstack-origin
       admin-password: openstack
   mysql:
-    charm: cs:~openstack-charmers-next/percona-cluster
+    charm: ch:percona-cluster
+    channel: *mysql-charm-channel
     num_units: 1
     options:
       innodb-buffer-pool-size: 256M
       max-connections: 1000
   neutron-api:
-    charm: cs:~openstack-charmers-next/neutron-api
+    charm: ch:neutron-api
+    channel: *openstack-charm-channel
     num_units: 1
     options:
       openstack-origin: *openstack-origin
@@ -150,23 +161,27 @@ applications:
       neutron-security-groups: true
       manage-neutron-plugin-legacy-mode: True
   neutron-gateway:
-    charm: cs:~openstack-charmers-next/neutron-gateway
+    charm: ch:neutron-gateway
+    channel: *openstack-charm-channel
     num_units: 1
     options:
       openstack-origin: *openstack-origin
       bridge-mappings: physnet1:br-ex
   neutron-openvswitch:
-    charm: cs:~openstack-charmers-next/neutron-openvswitch
+    charm: ch:neutron-openvswitch
+    channel: *openstack-charm-channel
     num_units: 0
   nova-cloud-controller:
-    charm: cs:~openstack-charmers-next/nova-cloud-controller
+    charm: ch:nova-cloud-controller
+    channel: *openstack-charm-channel
     num_units: 1
     options:
       openstack-origin: *openstack-origin
       network-manager: Neutron
       debug: true
   nova-compute:
-    charm: cs:~openstack-charmers-next/nova-compute
+    charm: ch:nova-compute
+    channel: *openstack-charm-channel
     num_units: 3
     constraints: mem=4G
     options:
@@ -181,37 +196,42 @@ applications:
       # Allow for more retries when testing ontop of openstack
       config-flags: block_device_allocate_retries=120
   rabbitmq-server:
-    charm: cs:~openstack-charmers-next/rabbitmq-server
+    charm: ch:rabbitmq-server
+    channel: *rabbit-charm-channel
     num_units: 1
   trilio-data-mover:
-    charm: cs:~openstack-charmers-next/trilio-data-mover
+    charm: ch:openstack-charmers-trilio-data-mover
+    channel: *trilio-charm-channel
     options:
       triliovault-pkg-source: *triliovault-pkg-source
   trilio-dm-api:
-    charm: cs:~openstack-charmers-next/trilio-dm-api
+    charm: ch:openstack-charmers-trilio-dm-api
+    channel: *trilio-charm-channel
     num_units: 1
     options:
       openstack-origin: *openstack-origin
       triliovault-pkg-source: *triliovault-pkg-source
   trilio-horizon-plugin:
-    charm: ../../../trilio-horizon-plugin
+    charm: ../../../trilio-horizon-plugin.charm
     options:
       triliovault-pkg-source: *triliovault-pkg-source
   trilio-wlm:
-    charm: cs:~openstack-charmers-next/trilio-wlm
-    series: bionic
+    charm: ch:openstack-charmers-trilio-wlm
+    channel: *trilio-charm-channel
     num_units: 1
     options:
       openstack-origin: *openstack-origin
       triliovault-pkg-source: *triliovault-pkg-source
   ceph-mon:
-    charm: cs:~openstack-charmers-next/ceph-mon
+    charm: ch:ceph-mon
+    channel: *ceph-charm-channel
     num_units: 3
     options:
       source: *openstack-origin
       expected-osd-count: 3
   ceph-osd:
-    charm: cs:~openstack-charmers-next/ceph-osd
+    charm: ch:ceph-osd
+    channel: *ceph-charm-channel
     constraints: mem=1G
     num_units: 3
     options:
@@ -221,12 +241,15 @@ applications:
     storage:
       osd-devices:  cinder,40G
   cinder-ceph:
-    charm: cs:~openstack-charmers-next/cinder-ceph
+    charm: ch:cinder-ceph
+    channel: *openstack-charm-channel
   vault:
+    charm: ch:vault
+    channel: *vault-charm-channel
     num_units: 1
-    charm: cs:~openstack-charmers-next/vault
   placement:
-    charm: cs:~openstack-charmers-next/placement
+    charm: ch:placement
+    channel: *openstack-charm-channel
     num_units: 1
     options:
       openstack-origin: *openstack-origin
@@ -236,7 +259,8 @@ applications:
     storage:
       share: cinder,40G
   openstack-dashboard:
-    charm: cs:~openstack-charmers-next/openstack-dashboard
+    charm: ch:openstack-dashboard
+    channel: *openstack-charm-channel
     num_units: 1
     options:
       openstack-origin: *openstack-origin
diff --git a/src/tests/bundles/focal-ussuri-41.yaml b/src/tests/bundles/focal-ussuri-41.yaml
index 09dfd39..b341b23 100644
--- a/src/tests/bundles/focal-ussuri-41.yaml
+++ b/src/tests/bundles/focal-ussuri-41.yaml
@@ -1,5 +1,11 @@
 variables:
   openstack-origin: &openstack-origin distro
+  openstack-charm-channel: &openstack-charm-channel 'ussuri/edge'
+  ceph-charm-channel: &ceph-charm-channel 'octopus/edge'
+  rabbit-charm-channel: &rabbit-charm-channel '3.9/edge'
+  mysql-charm-channel: &mysql-charm-channel '8.0/edge'
+  vault-charm-channel: &vault-charm-channel '1.7/edge'
+  trilio-charm-channel: &trilio-charm-channel 'latest/stable'
   triliovault-pkg-source: &triliovault-pkg-source 'deb [trusted=yes] https://apt.fury.io/triliodata-4-1/ /'
 
 series: &series focal
@@ -143,50 +149,65 @@ relations:
     - 'mysql-innodb-cluster:db-router'
 applications:
   keystone-mysql-router:
-    charm: cs:~openstack-charmers-next/mysql-router
+    charm: ch:mysql-router
+    channel: *mysql-charm-channel
   cinder-mysql-router:
-    charm: cs:~openstack-charmers-next/mysql-router
+    charm: ch:mysql-router
+    channel: *mysql-charm-channel
   neutron-api-mysql-router:
-    charm: cs:~openstack-charmers-next/mysql-router
+    charm: ch:mysql-router
+    channel: *mysql-charm-channel
   glance-mysql-router:
-    charm: cs:~openstack-charmers-next/mysql-router
+    charm: ch:mysql-router
+    channel: *mysql-charm-channel
   nova-cloud-controller-mysql-router:
-    charm: cs:~openstack-charmers-next/mysql-router
+    charm: ch:mysql-router
+    channel: *mysql-charm-channel
   trilio-dm-api-mysql-router:
-    charm: cs:~openstack-charmers-next/mysql-router
+    charm: ch:mysql-router
+    channel: *mysql-charm-channel
   trilio-dm-mysql-router:
-    charm: cs:~openstack-charmers-next/mysql-router
+    charm: ch:mysql-router
+    channel: *mysql-charm-channel
   trilio-wlm-mysql-router:
-    charm: cs:~openstack-charmers-next/mysql-router
+    charm: ch:mysql-router
+    channel: *mysql-charm-channel
   vault-mysql-router:
-    charm: cs:~openstack-charmers-next/mysql-router
+    charm: ch:mysql-router
+    channel: *mysql-charm-channel
   placement-mysql-router:
-    charm: cs:~openstack-charmers-next/mysql-router
+    charm: ch:mysql-router
+    channel: *mysql-charm-channel
   mysql-innodb-cluster:
-    charm: cs:~openstack-charmers-next/mysql-innodb-cluster
+    charm: ch:mysql-innodb-cluster
+    channel: *mysql-charm-channel
     num_units: 3
     options:
       source: *openstack-origin
   glance:
-    charm: cs:~openstack-charmers-next/glance
+    charm: ch:glance
+    channel: *openstack-charm-channel
     num_units: 1
     options:
       openstack-origin: *openstack-origin
   cinder:
-    charm: cs:~openstack-charmers-next/cinder
+    charm: ch:cinder
+    channel: *openstack-charm-channel
     num_units: 1
     options:
       openstack-origin: *openstack-origin
       block-device: "None"
       glance-api-version: 2
   keystone:
-    charm: cs:~openstack-charmers-next/keystone
+    charm: ch:keystone
+    channel: *openstack-charm-channel
     num_units: 1
     options:
       openstack-origin: *openstack-origin
       admin-password: openstack
   neutron-api:
-    charm: cs:~openstack-charmers-next/neutron-api
+    charm: ch:neutron-api
+    channel: *openstack-charm-channel
     num_units: 1
     options:
       openstack-origin: *openstack-origin
@@ -194,25 +215,29 @@ applications:
       neutron-security-groups: true
       manage-neutron-plugin-legacy-mode: True
   neutron-gateway:
-    charm: cs:~openstack-charmers-next/neutron-gateway
+    charm: ch:neutron-gateway
+    channel: *openstack-charm-channel
     num_units: 1
     options:
       openstack-origin: *openstack-origin
       bridge-mappings: physnet1:br-ex
   neutron-openvswitch:
-    charm: cs:~openstack-charmers-next/neutron-openvswitch
+    charm: ch:neutron-openvswitch
+    channel: *openstack-charm-channel
     num_units: 0
   nova-cloud-controller:
-    charm: cs:~openstack-charmers-next/nova-cloud-controller
+    charm: ch:nova-cloud-controller
+    channel: *openstack-charm-channel
     num_units: 1
     options:
       openstack-origin: *openstack-origin
       network-manager: Neutron
       debug: true
   nova-compute:
-    charm: cs:~openstack-charmers-next/nova-compute
+    charm: ch:nova-compute
+    channel: *openstack-charm-channel
     num_units: 3
-    consussurits: mem=4G
+    constraints: mem=4G
     options:
       openstack-origin: *openstack-origin
       config-flags: default_ephemeral_format=ext4
@@ -225,37 +250,43 @@ applications:
       # Allow for more retries when testing ontop of openstack
       config-flags: block_device_allocate_retries=120
   rabbitmq-server:
-    charm: cs:~openstack-charmers-next/rabbitmq-server
+    charm: ch:rabbitmq-server
+    channel: *rabbit-charm-channel
     num_units: 1
   trilio-data-mover:
-    charm: cs:~openstack-charmers-next/trilio-data-mover
+    charm: ch:openstack-charmers-trilio-data-mover
+    channel: *trilio-charm-channel
     options:
       triliovault-pkg-source: *triliovault-pkg-source
   trilio-dm-api:
-    charm: cs:~openstack-charmers-next/trilio-dm-api
+    charm: ch:openstack-charmers-trilio-dm-api
+    channel: *trilio-charm-channel
     num_units: 1
     options:
       openstack-origin: *openstack-origin
       triliovault-pkg-source: *triliovault-pkg-source
   trilio-horizon-plugin:
-    charm: ../../../trilio-horizon-plugin
+    charm: ../../../trilio-horizon-plugin.charm
     options:
       triliovault-pkg-source: *triliovault-pkg-source
   trilio-wlm:
-    charm: cs:~openstack-charmers-next/trilio-wlm
+    charm: ch:openstack-charmers-trilio-wlm
+    channel: *trilio-charm-channel
     num_units: 1
     options:
       openstack-origin: *openstack-origin
       triliovault-pkg-source: *triliovault-pkg-source
   ceph-mon:
-    charm: cs:~openstack-charmers-next/ceph-mon
+    charm: ch:ceph-mon
+    channel: *ceph-charm-channel
     num_units: 3
     options:
       source: *openstack-origin
       expected-osd-count: 3
   ceph-osd:
-    charm: cs:~openstack-charmers-next/ceph-osd
-    consussurits: mem=1G
+    charm: ch:ceph-osd
+    channel: *ceph-charm-channel
+    constraints: mem=1G
     num_units: 3
     options:
       source: *openstack-origin
@@ -264,12 +295,15 @@ applications:
     storage:
       osd-devices:  cinder,40G
   cinder-ceph:
-    charm: cs:~openstack-charmers-next/cinder-ceph
+    charm: ch:cinder-ceph
+    channel: *openstack-charm-channel
   vault:
+    charm: ch:vault
+    channel: *vault-charm-channel
     num_units: 1
-    charm: cs:~openstack-charmers-next/vault
   placement:
-    charm: cs:~openstack-charmers-next/placement
+    charm: ch:placement
+    channel: *openstack-charm-channel
     num_units: 1
     options:
       openstack-origin: *openstack-origin
@@ -279,7 +313,8 @@ applications:
     storage:
       share: cinder,40G
   openstack-dashboard:
-    charm: cs:~openstack-charmers-next/openstack-dashboard
+    charm: ch:openstack-dashboard
+    channel: *openstack-charm-channel
     num_units: 1
     options:
       openstack-origin: *openstack-origin
diff --git a/src/tests/tests.yaml b/src/tests/tests.yaml
index be49810..57c87b9 100644
--- a/src/tests/tests.yaml
+++ b/src/tests/tests.yaml
@@ -4,6 +4,7 @@ tests:
 configure:
   - zaza.openstack.charm_tests.trilio.setup.basic_setup
   - zaza.openstack.charm_tests.vault.setup.auto_initialize
+  - zaza.openstack.charm_tests.trilio.setup.restart_tvault_contego
   - zaza.openstack.charm_tests.glance.setup.add_cirros_image
   - zaza.openstack.charm_tests.glance.setup.add_lts_image
   - zaza.openstack.charm_tests.neutron.setup.basic_overcloud_network
@@ -39,6 +40,7 @@ target_deploy_status:
   trilio-data-mover:
     workload-status: blocked
     workload-status-message: "nfs-shares configuration not set"
+    workload-status-message-regex: "^.*configuration not set|Unit is ready|Services not running that should be: tvault-contego"
   glance:
     workload-status: waiting
     workload-status-message: "Incomplete relations: storage-backend"
diff --git a/src/wheelhouse.txt b/src/wheelhouse.txt
index 9131674..3b44ace 100644
--- a/src/wheelhouse.txt
+++ b/src/wheelhouse.txt
@@ -1,4 +1,24 @@
+# Temporary pins to reflects existing charm builds. Need updating when
+# channels and tracks are setup.
+# flit_core tactival workaround to ensure the wheel is not present irrespective of
+# the build env as the flit_core wheel causes a pip failure.
+flit_core;python_version >= '4.0'
+pyaml==20.4.0
+PyYAML==5.2
+setuptools==41.6.0
+netifaces==0.11.0
+six==1.16.0
+pbr==5.6.0
+psutil==5.8.0
+dnspython==1.16.0
+pip==18.1
+wheel==0.33.6
+Tempita==0.4
+Jinja2==2.10.1
+charms.reactive==1.4.1
+netaddr==0.7.19
+setuptools_scm==1.17.0
+MarkupSafe==1.1.1
+git+https://github.com/juju/charm-helpers.git@d404354d1d350e66dcb43bdb5a72c504583497f9#egg=charmhelpers
+git+https://opendev.org/openstack/charms.openstack.git@6c8eb01162edef5e3f8e3af6cb90905e8b2a3065#egg=charms.openstack
 
-git+https://opendev.org/openstack/charms.openstack.git#egg=charms.openstack
-
-git+https://github.com/juju/charm-helpers.git#egg=charmhelpers
diff --git a/test-requirements.txt b/test-requirements.txt
index bb1307f..a11a7d0 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -51,3 +51,4 @@ pbr==5.6.0       # vault
 cryptography<3.4 # vault, keystone-saml-mellon
 lxml             # keystone-saml-mellon
 hvac             # vault, barbican-vault
+psutil           # cinder-lvm
diff --git a/tox.ini b/tox.ini
index faf6092..7fe1689 100644
--- a/tox.ini
+++ b/tox.ini
@@ -34,14 +34,27 @@ setenv = VIRTUAL_ENV={envdir}
          LAYER_PATH={toxinidir}/layers
          INTERFACE_PATH={toxinidir}/interfaces
          JUJU_REPOSITORY={toxinidir}/build
-passenv = http_proxy https_proxy INTERFACE_PATH LAYER_PATH JUJU_REPOSITORY
+passenv = no_proxy http_proxy https_proxy INTERFACE_PATH LAYER_PATH JUJU_REPOSITORY
 install_command =
   {toxinidir}/pip.sh install {opts} {packages}
+allowlist_externals =
+    charmcraft
+    bash
+    tox
+    rename.sh
 deps =
     -r{toxinidir}/requirements.txt
 
 [testenv:build]
 basepython = python3
+deps = -r{toxinidir}/build-requirements.txt
+commands =
+    charmcraft clean
+    charmcraft -v build
+    {toxinidir}/rename.sh
+
+[testenv:build-reactive]
+basepython = python3
 commands =
     charm-build --log-level DEBUG --use-lock-file-branches -o {toxinidir}/build/builds src {posargs}
 
@@ -83,9 +96,21 @@ commands = stestr run --slowest {posargs}
 [testenv:pep8]
 basepython = python3
 deps = flake8==3.9.2
-       charm-tools==2.8.3
+       git+https://github.com/juju/charm-tools.git
 commands = flake8 {posargs} src unit_tests
 
+[testenv:func-target]
+# Hack to get functional tests working in the charmcraft
+# world. We should fix this.
+basepython = python3
+passenv = HOME TERM CS_* OS_* TEST_*
+deps = -r{toxinidir}/src/test-requirements.txt
+changedir = {toxinidir}/src
+commands =
+  bash -c "if [ ! -f ../*.charm ]; then echo 'Charm does not exist. Run tox -e build'; exit 1; fi"
+  tox --version
+  tox -e func-target {posargs}
+
 [testenv:cover]
 # Technique based heavily upon
 # https://github.com/openstack/nova/blob/master/tox.ini