diff --git a/defaults/main.yml b/defaults/main.yml
index efc7d53..fe5d109 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -86,11 +86,22 @@ zun_kuryr_log_dir: "/var/log/kuryr"
 
 ## Docker setup information
 zun_docker_package_version: "{{ _zun_docker_package_version }}"
+zun_architecture_mapping:
+  x86_64: amd64
+  ppc64le: ppc64el
+  s390x: s390x
+  armv7l: armhf
+  aarch64: arm64
 zun_containerd_package_version: "{{ _zun_containerd_package_version }}"
 zun_kata_package_version: "3.16.0"
 zun_kata_package_source: >-
-  https://github.com/kata-containers/kata-containers/releases/download/{{ zun_kata_package_version }}/kata-static-{{ zun_kata_package_version }}-amd64.tar.xz
-zun_kata_package_checksum: sha256:56cb69a7bb6d3364e92155e06283972e71654a88c70816a55f891f209a8f74db
+  https://github.com/kata-containers/kata-containers/releases/download/{{ zun_kata_package_version }}/kata-static-{{ zun_kata_package_version }}-{{
+    zun_architecture_mapping.get(ansible_facts['architecture']) }}.tar.xz
+zun_kata_package_checksum_mapping:
+  x86_64: sha256:56cb69a7bb6d3364e92155e06283972e71654a88c70816a55f891f209a8f74db
+  ppc64le: sha256:858a95491a6764b95e5540423935e14b39b335287ef7d861a90b046f644d7d8e
+  s390x: sha256:b866b73f4af6b7418febb87c0c5d7af825f9e91066c3629dea3196b3b85b0192
+  aarch64: sha256:161875f74282015a5f4d86ca9d06f4e47626402eddaf5cccd288a5a3e82d87e0
 zun_kata_enabled: "True"
 
 # Set a list of users that are permitted to execute the docker binary.
diff --git a/tasks/zun_compute.yml b/tasks/zun_compute.yml
index c130883..603d967 100644
--- a/tasks/zun_compute.yml
+++ b/tasks/zun_compute.yml
@@ -132,7 +132,7 @@
         url: "{{ zun_kata_package_source }}"
         dest: "/opt/{{ zun_kata_package_source | basename }}"
         mode: "0440"
-        checksum: "{{ zun_kata_package_checksum }}"
+        checksum: "{{ zun_kata_package_checksum_mapping.get(ansible_facts['architecture']) }}"
       register: _kata_downloaded
 
     - name: Unpack package  # noqa: no-handler
diff --git a/vars/debian.yml b/vars/debian.yml
index f9a5620..ae5126a 100644
--- a/vars/debian.yml
+++ b/vars/debian.yml
@@ -16,20 +16,13 @@
 _zun_docker_package_version: "5:27.5.1-1~*"
 _zun_containerd_package_version: "1.7.27-1"
 
-_zun_architecture_mapping:
-  x86_64: amd64
-  ppc64le: ppc64el
-  s390x: s390x
-  armv7l: armhf
-  aarch64: arm64
-
 zun_docker_repo:
   - name: "docker-ce"
     suites: "{{ ansible_facts['distribution_release'] | lower }}"
     uris: "https://download.docker.com/linux/{{ ansible_facts['distribution'] | lower }}"
     signed_by: "{{ lookup('file', 'gpg/0EBFCD88') }}"
     components: stable
-    architectures: "{{ _zun_architecture_mapping.get(ansible_facts['architecture']) }}"
+    architectures: "{{ zun_architecture_mapping.get(ansible_facts['architecture']) }}"
     state: present
 
 # Common apt packages