diff --git a/playbooks/roles/common/defaults/main.yml b/playbooks/roles/common/defaults/main.yml
index a73238d27..f85bf810a 100644
--- a/playbooks/roles/common/defaults/main.yml
+++ b/playbooks/roles/common/defaults/main.yml
@@ -5,6 +5,7 @@ amp_image_tag: "amphora-image"
 amp_ssh_key_name: "octavia-ssh-key"
 amp_ssh_key_path: ""
 amp_to_raw: False
+amp_hw_arch: "x86_64"
 auth_username: "octavia"
 auth_project_name: "service"
 lb_mgmt_net_name: "lb-mgmt-net"
diff --git a/playbooks/roles/octavia-undercloud/tasks/image_mgmt.yml b/playbooks/roles/octavia-undercloud/tasks/image_mgmt.yml
index a73073f57..769940618 100644
--- a/playbooks/roles/octavia-undercloud/tasks/image_mgmt.yml
+++ b/playbooks/roles/octavia-undercloud/tasks/image_mgmt.yml
@@ -72,6 +72,7 @@
       openstack image create --disk-format {{ raw_format|default('qcow2') }} \
         --container-format bare --tag {{ amp_image_tag }} \
         --file {{ raw_filename|default(image_filename) }} \
+        --property hw_architecture={{ amp_hw_arch }} \
         {{ amphora_image }}
     register: image_result
     changed_when: "image_result.stdout != ''"
diff --git a/workbooks/octavia_post.yaml b/workbooks/octavia_post.yaml
index 47b31f96d..870040313 100644
--- a/workbooks/octavia_post.yaml
+++ b/workbooks/octavia_post.yaml
@@ -15,6 +15,7 @@ workflows:
       - amp_ssh_key_path
       - amp_ssh_key_data
       - amp_to_raw
+      - amp_hw_arch
       - auth_username
       - auth_password
       - auth_project_name
@@ -105,6 +106,7 @@ workflows:
             amp_ssh_key_path: <% $.amp_ssh_key_path %>
             amp_ssh_key_data: <% $.amp_ssh_key_data %>
             amp_to_raw: <% $.amp_to_raw %>
+            amp_hw_arch: <% $.amp_hw_arch %>
             auth_username: <% $.auth_username %>
             auth_password: <% $.auth_password %>
             auth_project_name: <% $.auth_project_name %>