diff --git a/.gitreview b/.gitreview
index 2f89e66..1d9cd85 100644
--- a/.gitreview
+++ b/.gitreview
@@ -2,3 +2,4 @@
 host=review.opendev.org
 port=29418
 project=openstack/ansible-role-qdrouterd.git
+defaultbranch=stable/wallaby
diff --git a/examples/playbook.yml b/examples/playbook.yml
new file mode 100644
index 0000000..0ebc3c5
--- /dev/null
+++ b/examples/playbook.yml
@@ -0,0 +1,11 @@
+---
+
+- name: Install qdrouterd server
+  hosts: "{{ qdrouterd_host_group | default('qdrouterd_all') }}"
+  serial: 20%
+  gather_facts: false
+  environment: "{{ deployment_environment_variables | default({}) }}"
+  tags:
+    - qdrouterd
+  roles:
+    - role: "qdrouterd"
diff --git a/meta/main.yml b/meta/main.yml
index 08c2bac..c772c69 100644
--- a/meta/main.yml
+++ b/meta/main.yml
@@ -23,8 +23,8 @@ galaxy_info:
     - 7
   - name: Ubuntu
     versions:
-    - xenial
     - bionic
+    - focal
   categories:
   - messaging
   - cloud
diff --git a/tests/ansible-role-requirements.yml b/tests/ansible-role-requirements.yml
index 49618c1..3f89694 100644
--- a/tests/ansible-role-requirements.yml
+++ b/tests/ansible-role-requirements.yml
@@ -2,16 +2,20 @@
 - name: apt_package_pinning
   src: https://opendev.org/openstack/openstack-ansible-apt_package_pinning
   scm: git
-  version: master
+  version: stable/wallaby
 - name: openstack_hosts
   src: https://opendev.org/openstack/openstack-ansible-openstack_hosts
   scm: git
-  version: master
+  version: stable/wallaby
 - name: lxc_hosts
   src: https://opendev.org/openstack/openstack-ansible-lxc_hosts
   scm: git
-  version: master
+  version: stable/wallaby
 - name: lxc_container_create
   src: https://opendev.org/openstack/openstack-ansible-lxc_container_create
   scm: git
-  version: master
+  version: stable/wallaby
+- name: pki
+  src: https://opendev.org/openstack/ansible-role-pki
+  scm: git
+  version: stable/wallaby
diff --git a/tox.ini b/tox.ini
index 8af44db..e2f9ef1 100644
--- a/tox.ini
+++ b/tox.ini
@@ -30,7 +30,7 @@ setenv =
 [testenv:docs]
 basepython = python3
 deps =
-  -c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master}
+  -c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/wallaby}
   -r{toxinidir}/doc/requirements.txt
 commands=
     bash -c "rm -rf doc/build"
diff --git a/zuul.d/project.yaml b/zuul.d/project.yaml
index 3528d38..94907ac 100644
--- a/zuul.d/project.yaml
+++ b/zuul.d/project.yaml
@@ -14,14 +14,13 @@
 
 - project:
     templates:
+      - openstack-ansible-linters-jobs
       - check-requirements
       - publish-openstack-docs-pti
       - build-release-notes-jobs-python3
     check:
       jobs:
-        - openstack-ansible-linters
         - openstack-ansible-functional-centos-7
-        - openstack-ansible-functional-centos-8
         - openstack-ansible-functional-ubuntu-bionic
         - openstack-ansible-functional-ubuntu-focal
     experimental:
@@ -29,8 +28,6 @@
         - openstack-ansible-integrated-deploy-aio
     gate:
       jobs:
-        - openstack-ansible-linters
         - openstack-ansible-functional-centos-7
-        - openstack-ansible-functional-centos-8
         - openstack-ansible-functional-ubuntu-bionic
         - openstack-ansible-functional-ubuntu-focal