diff --git a/osci.yaml b/osci.yaml
index 09af1cb..b92ad18 100644
--- a/osci.yaml
+++ b/osci.yaml
@@ -1,21 +1,11 @@
 - project:
     templates:
-      - charm-unit-jobs
-    check:
-      jobs:
-        - bionic-train
-        - bionic-ussuri
-        - focal-ussuri
-        - focal-victoria
-        - focal-wallaby
-        - focal-xena
-        - focal-yoga:
-            voting: false
-        - hirsute-wallaby
-        - impish-xena:
-            voting: false
-        - jammy-yoga:
-            voting: false
+      - charm-yoga-unit-jobs
+      - charm-yoga-functional-jobs
+      - charm-xena-functional-jobs
+      - charm-wallaby-functional-jobs
+      - charm-victoria-functional-jobs
+      - charm-ussuri-functional-jobs
     vars:
       needs_charm_build: true
       charm_build_name: manila-dashboard
diff --git a/tox.ini b/tox.ini
index 22159df..faf6092 100644
--- a/tox.ini
+++ b/tox.ini
@@ -75,6 +75,11 @@ basepython = python3.8
 deps = -r{toxinidir}/test-requirements.txt
 commands = stestr run --slowest {posargs}
 
+[testenv:py39]
+basepython = python3.9
+deps = -r{toxinidir}/test-requirements.txt
+commands = stestr run --slowest {posargs}
+
 [testenv:pep8]
 basepython = python3
 deps = flake8==3.9.2