diff --git a/defaults/main.yml b/defaults/main.yml
index ca32842..d88bc96 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -86,6 +86,7 @@ zun_kuryr_lock_path: "/var/lock/kuryr"
 zun_docker_package_version: "{{ _zun_docker_package_version }}"
 zun_containerd_package_version: "{{ _zun_containerd_package_version }}"
 zun_kata_package_version: "{{ _zun_kata_package_version }}"
+zun_kata_enabled: "{{ _zun_kata_enabled }}"
 
 # Set a list of users that are permitted to execute the docker binary.
 zun_docker_users:
@@ -362,7 +363,7 @@ zun_docker_init_defaults:
   Service:
     ExecStart:
       - ""
-      - "/usr/bin/dockerd --group {{ zun_system_group_name }} -H tcp://{{ zun_docker_bind_host }}:{{ zun_docker_bind_port }} -H unix:///var/run/docker.sock --cluster-store etcd://{% for item in groups['zun_api'] %}{{ hostvars[item]['ansible_host'] }}:2379{% if not loop.last %},{% endif %}{% endfor %} --add-runtime kata=/usr/bin/kata-runtime"
+      - "/usr/bin/dockerd --group {{ zun_system_group_name }} -H tcp://{{ zun_docker_bind_host }}:{{ zun_docker_bind_port }} -H unix:///var/run/docker.sock --cluster-store etcd://{% for item in groups['zun_api'] %}{{ hostvars[item]['ansible_host'] }}:2379{% if not loop.last %},{% endif %}{% endfor %}{% if zun_kata_enabled %} --add-runtime kata=/usr/bin/kata-runtime{% endif %}"
 
 ## Tunable overrides for service unit files.
 zun_api_paste_ini_overrides: {}
diff --git a/vars/debian-11.yml b/vars/debian-11.yml
new file mode 100644
index 0000000..5c60382
--- /dev/null
+++ b/vars/debian-11.yml
@@ -0,0 +1,46 @@
+---
+# Copyright 2018, Rackspace US, Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+_zun_docker_package_version: "5:20.10.6~*"
+_zun_containerd_package_version: "1.4.4-1"
+_zun_kata_package_version: "{{ (ansible_facts['distribution_release'] | lower == 'focal') | ternary('1.12.0-2', '1.11.5-9') }}"
+# Kata packages are not currently available for Debian Bullseye
+_zun_kata_enabled: False
+
+zun_docker_repo:
+  - name: "docker-ce"
+    repo: "deb [arch=amd64] https://download.docker.com/linux/{{ ansible_facts['distribution'] | lower }} {{ ansible_facts['distribution_release'] | lower }} stable"
+    gpg_uri: "https://download.docker.com/linux/{{ ansible_facts['distribution'] | lower }}/gpg"
+
+# Common apt packages
+zun_distro_packages:
+  - ca-certificates
+  - curl
+  - git
+  - libsystemd-dev
+  - software-properties-common
+
+zun_distro_compute_packages:
+  - containerd.io
+  - docker-ce-cli
+  - docker-ce
+  - pciutils
+  - numactl
+  - multipath-tools
+
+zun_docker_groupname: docker
+
+## APT Cache options
+cache_timeout: 600
diff --git a/vars/debian.yml b/vars/debian.yml
index 3a81928..9816361 100644
--- a/vars/debian.yml
+++ b/vars/debian.yml
@@ -16,6 +16,7 @@
 _zun_docker_package_version: "5:19.03.14~*"
 _zun_containerd_package_version: "1.4.3-1"
 _zun_kata_package_version: "{{ (ansible_facts['distribution_release'] | lower == 'focal') | ternary('1.12.0-2', '1.11.5-9') }}"
+_zun_kata_enabled: True
 
 zun_kata_repo_version: "{{ (ansible_facts['distribution_release'] | lower == 'focal') | ternary('stable-1.12', 'stable-1.11') }}"
 zun_kata_repo_distro: "{{ (ansible_facts['distribution'] | lower == 'ubuntu') | ternary('x', '') }}{{ ansible_facts['distribution'] | capitalize }}"
diff --git a/vars/redhat.yml b/vars/redhat.yml
index 042a153..94cef6e 100644
--- a/vars/redhat.yml
+++ b/vars/redhat.yml
@@ -16,6 +16,7 @@
 _zun_docker_package_version: "19.03.14-3"
 _zun_containerd_package_version: "1.4.3-3.1"
 _zun_kata_package_version: "1.11.3-1"
+_zun_kata_enabled: True
 
 zun_docker_repo:
   - name: "docker-ce"
@@ -31,6 +32,7 @@ zun_docker_repo:
 zun_distro_packages:
   - git
   - systemd-devel
+  - tar
 
 zun_distro_compute_packages:
   - "containerd.io-{{ zun_containerd_package_version }}.el{{ ansible_facts['distribution_major_version'] }}.x86_64"
diff --git a/zuul.d/project.yaml b/zuul.d/project.yaml
index 749bb60..3059bb7 100644
--- a/zuul.d/project.yaml
+++ b/zuul.d/project.yaml
@@ -17,6 +17,22 @@
     templates:
       - check-requirements
       - openstack-ansible-linters-jobs
-      - openstack-ansible-deploy-aio_metal-jobs
       - publish-openstack-docs-pti
       - build-release-notes-jobs-python3
+    check:
+      jobs:
+        - openstack-ansible-deploy-aio_metal-debian-buster
+        - openstack-ansible-deploy-aio_metal-centos-8
+        - openstack-ansible-deploy-aio_metal-centos-8-stream
+        - openstack-ansible-deploy-aio_metal-ubuntu-bionic
+        - openstack-ansible-deploy-aio_metal-ubuntu-focal
+        - openstack-ansible-upgrade-aio_metal-centos-8-stream:
+            voting: false
+        - openstack-ansible-upgrade-aio_metal-ubuntu-focal
+    gate:
+      jobs:
+        - openstack-ansible-deploy-aio_metal-debian-buster
+        - openstack-ansible-deploy-aio_metal-centos-8
+        - openstack-ansible-deploy-aio_metal-centos-8-stream
+        - openstack-ansible-deploy-aio_metal-ubuntu-bionic
+        - openstack-ansible-deploy-aio_metal-ubuntu-focal