diff --git a/charms/magnum-k8s/.zuul.yaml b/charms/magnum-k8s/.zuul.yaml
new file mode 100644
index 00000000..d7f00c8e
--- /dev/null
+++ b/charms/magnum-k8s/.zuul.yaml
@@ -0,0 +1,11 @@
+- project:
+    templates:
+      - openstack-python3-charm-yoga-jobs
+      - openstack-cover-jobs
+      - microk8s-func-test
+    vars:
+      charm_build_name: magnum-k8s
+      juju_channel: 3.1/stable
+      juju_classic_mode: false
+      microk8s_channel: 1.26-strict/stable
+      microk8s_classic_mode: false
diff --git a/charms/magnum-k8s/metadata.yaml b/charms/magnum-k8s/metadata.yaml
index ed063a39..169ca656 100644
--- a/charms/magnum-k8s/metadata.yaml
+++ b/charms/magnum-k8s/metadata.yaml
@@ -26,13 +26,13 @@ resources:
   magnum-api-image:
     type: oci-image
     description: OCI image for OpenStack magnum
-    # ghcr.io/openstack-snaps/magnum-consolidated:2023.1
-    upstream-source: ghcr.io/openstack-snaps/magnum-consolidated:2023.1
+    # ghcr.io/canonical/magnum-consolidated:2023.1
+    upstream-source: ghcr.io/canonical/magnum-consolidated:2023.1
   magnum-conductor-image:
     type: oci-image
     description: OCI image for OpenStack magnum
-    # ghcr.io/openstack-snaps/magnum-consolidated:2023.1
-    upstream-source: ghcr.io/openstack-snaps/magnum-consolidated:2023.1
+    # ghcr.io/canonical/magnum-consolidated:2023.1
+    upstream-source: ghcr.io/canonical/magnum-consolidated:2023.1
 
 requires:
   database:
diff --git a/charms/magnum-k8s/test-requirements.txt b/charms/magnum-k8s/test-requirements.txt
index 8057d2c6..23e005bd 100644
--- a/charms/magnum-k8s/test-requirements.txt
+++ b/charms/magnum-k8s/test-requirements.txt
@@ -1,17 +1,17 @@
-# This file is managed centrally.  If you find the need to modify this as a
-# one-off, please don't.  Intead, consult #openstack-charms and ask about
-# requirements management in charms via bot-control.  Thank you.
-charm-tools>=2.4.4
-coverage>=3.6
-mock>=1.2
-flake8>=2.2.4,<=2.4.1
-pyflakes==2.1.1
-stestr>=2.2.0
-requests>=2.18.4
-psutil
-# oslo.i18n dropped py35 support
-oslo.i18n<4.0.0
-git+https://github.com/openstack-charmers/zaza.git#egg=zaza
+# This file is managed centrally by release-tools and should not be modified
+# within individual charm repos.  See the 'global' dir contents for available
+# choices of *requirements.txt files for OpenStack Charms:
+#     https://github.com/openstack-charmers/release-tools
+#
+
+pwgen
+coverage
+mock
+flake8
+stestr
+git+https://github.com/openstack-charmers/zaza.git@libjuju-3.1#egg=zaza
 git+https://github.com/openstack-charmers/zaza-openstack-tests.git#egg=zaza.openstack
-pytz    # workaround for 14.04 pip/tox
-pyudev  # for ceph-* charm unit tests (not mocked?)
+git+https://opendev.org/openstack/tempest.git#egg=tempest
+ops
+# Subunit 1.4.3+ requires extras
+extras
diff --git a/charms/magnum-k8s/tests/bundles/smoke.yaml b/charms/magnum-k8s/tests/bundles/smoke.yaml
index ad7ee35a..853c8fbe 100644
--- a/charms/magnum-k8s/tests/bundles/smoke.yaml
+++ b/charms/magnum-k8s/tests/bundles/smoke.yaml
@@ -16,7 +16,7 @@ applications:
     options:
       kubernetes-service-annotations: metallb.universe.tf/address-pool=public
 
-  # required for barbican and magnum
+  # required for magnum
   rabbitmq:
     charm: ch:rabbitmq-k8s
     channel: 3.9/edge
@@ -34,16 +34,14 @@ applications:
       fernet-keys: 5M
       credential-keys: 5M
 
-  vault:
-    charm: ch:vault-k8s
+  glance:
+    charm: ch:glance-k8s
+    channel: 2023.1/edge
     scale: 1
     trust: false
+    storage:
+      local-repository: 5G
 
-  barbican:
-    charm: ch:barbican-k8s
-    scale: 1
-    trust: false
-  
   magnum:
     charm: ../../magnum-k8s.charm
     scale: 1
@@ -62,19 +60,14 @@ relations:
 - - mysql:database
   - keystone:database
 
-- - mysql:database
-  - barbican:database
 - - rabbitmq:amqp
-  - barbican:amqp
+  - glance:amqp
 - - keystone:identity-service
-  - barbican:identity-service
+  - glance:identity-service
 - - traefik:ingress
-  - barbican:ingress-internal
-- - traefik:ingress
-  - barbican:ingress-public
-
-- - vault:secrets
-  - barbican:secrets
+  - glance:ingress-public
+- - mysql:database
+  - glance:database
 
 - - mysql:database
   - magnum:database
@@ -82,6 +75,8 @@ relations:
   - magnum:amqp
 - - keystone:identity-service
   - magnum:identity-service
+- - keystone:identity-ops
+  - magnum:identity-ops
 - - traefik:ingress
   - magnum:ingress-internal
 - - traefik:ingress
diff --git a/charms/magnum-k8s/tests/tests.yaml b/charms/magnum-k8s/tests/tests.yaml
index b13244c3..257a55eb 100644
--- a/charms/magnum-k8s/tests/tests.yaml
+++ b/charms/magnum-k8s/tests/tests.yaml
@@ -4,9 +4,9 @@ smoke_bundles:
   - smoke
 # There is no storage provider at the moment so cannot run tests.
 configure:
-  - zaza.charm_tests.noop.setup.basic_setup
+  - zaza.openstack.charm_tests.keystone.setup.add_tempest_roles
 tests:
-  - zaza.openstack.charm_tests.magnum.tests.magnumTempestTestK8S
+  - zaza.openstack.charm_tests.magnum.tests.MagnumTempestTestK8S
 tests_options:
   trust:
     - smoke
@@ -30,15 +30,12 @@ target_deploy_status:
   keystone:
     workload-status: active
     workload-status-message-regex: '^$'
+  glance:
+    workload-status: active
+    workload-status-message-regex: '^$'
   mysql:
     workload-status: active
     workload-status-message-regex: '^.*$'
-  barbican:
-    workload-status: active
-    workload-status-message-regex: '^$'
-  vault:
-    workload-status: active
-    workload-status-message-regex: '^$'
   magnum:
     workload-status: active
     workload-status-message-regex: '^$'