diff --git a/devstack/files/debs/ironic b/devstack/files/debs/ironic
index 65c3dc9a66..50fa67d7f7 100644
--- a/devstack/files/debs/ironic
+++ b/devstack/files/debs/ironic
@@ -28,7 +28,6 @@ qemu-kvm
 qemu-utils
 sgabios
 shellinabox
-syslinux # dist:xenial,bionic
 syslinux-common # dist:xenial,bionic
 tftpd-hpa
 xinetd
diff --git a/devstack/lib/ironic b/devstack/lib/ironic
index 0d84764169..6c68e44dd1 100644
--- a/devstack/lib/ironic
+++ b/devstack/lib/ironic
@@ -1014,8 +1014,12 @@ function configure_ironic_dirs {
     fi
 
     # Copy PXE binary
-    cp $IRONIC_PXE_BOOT_IMAGE $IRONIC_TFTPBOOT_DIR
-    setup_syslinux_modules
+    # NOTE(mjturek): The PXE binary is x86_64 specific. So it should only be copied when
+    #                deploying to an x86_64 node.
+    if [[ $IRONIC_HW_ARCH == "x86_64" ]]; then
+        cp $IRONIC_PXE_BOOT_IMAGE $IRONIC_TFTPBOOT_DIR
+        setup_syslinux_modules
+    fi
 
     if [[ "$IRONIC_BOOT_MODE" == "uefi" ]]; then
         local uefi_ipxe_boot_file