diff --git a/roles/product_common/defaults/main.yml b/roles/product_common/defaults/main.yml
index 4e9f728..f8a46fd 100644
--- a/roles/product_common/defaults/main.yml
+++ b/roles/product_common/defaults/main.yml
@@ -5,3 +5,11 @@ postgres_version: "9.6"
 # Disable these when using the product installer, otherwise we end up
 # fighting with it.
 atl_use_system_jdk: false
+
+# Ubuntu and Ansible use different architecture nomenclature; provide
+# an easy method for translating between them
+debian_architecture_translations:
+  x86_64: amd64
+  aarch64: arm64
+
+debian_architecture: "{{ debian_architecture_translations[ansible_architecture] | default(ansible_architecture) }}"
diff --git a/roles/product_common/tasks/ubuntu.yml b/roles/product_common/tasks/ubuntu.yml
index dfd8331..c90b6bc 100644
--- a/roles/product_common/tasks/ubuntu.yml
+++ b/roles/product_common/tasks/ubuntu.yml
@@ -3,21 +3,6 @@
 - name: Add AdoptOpenJDK repo and install if necessary on Ubuntu
   block:
 
-    - name: Create translation matrix for ansible_architecture values to Ubuntu/Debian nomenclature
-      set_fact:
-        debian_architecture_translations:
-          x86_64: amd64
-          aarch64: arm64
-
-    - name: Set debian_architecture based on ansible_architecture
-      set_fact:
-        debian_architecture: >-
-          {%- if ansible_architecture in debian_architecture_translations -%}
-          {{ debian_architecture_translations[ansible_architecture] }}
-          {%- else -%}
-          {{ ansible_architecture }}
-          {%- endif %}
-
     - name: Install gnupg
       apt:
         name: gnupg