diff --git a/setup/install.yaml b/setup/install.yaml
index 0919f4c0a..6e2dae4f7 100644
--- a/setup/install.yaml
+++ b/setup/install.yaml
@@ -38,7 +38,7 @@
       local_action: apt name={{ item }}
       with_items:
         - pxelinux
-      when: ansible_distribution_version == "14.10"
+      when: ansible_distribution_version|version_compare('14.10', '>=')
     - name: "Ensuring /opt/stack is present"
       local_action: file name=/opt/stack state=directory owner=root group=root
     # This won't be necessary in the long run, however until a suitable version
@@ -178,12 +178,12 @@
         - /tftpboot
         - /tftpboot/pxelinux.cfg
         - "{{ http_boot_folder }}"
-    - name: "Placing pxelinux.0"
+    - name: "Placing pxelinux.0 (pre-14.10)"
       local_action: copy src=/usr/lib/syslinux/pxelinux.0 dest=/tftpboot
-      when: ansible_distribution_version != "14.10"
+      when: ansible_distribution_version|version_compare('14.10', '<')
     - name: "Placing pxelinux.0 (>=14.10)"
       local_action: copy src=/usr/lib/PXELINUX/pxelinux.0 dest=/tftpboot
-      when: ansible_distribution_version == "14.10"
+      when: ansible_distribution_version|version_compare('14.10', '>=')
     - name: "Place tftp config file"
       local_action: copy src=files/xinetd.tftp dest=/etc/xinetd.d/tftp
     - name: "Copy iPXE image into place"