diff --git a/playbooks/manual/ocp4-place-ignitionfiles.yml b/playbooks/manual/ocp4-place-ignitionfiles.yml
index 80d6a5a935..de8050472e 100644
--- a/playbooks/manual/ocp4-place-ignitionfiles.yml
+++ b/playbooks/manual/ocp4-place-ignitionfiles.yml
@@ -50,10 +50,9 @@
             dest: /var/www/html/rhcos/
             mode: 0755
             url: "https://mirror.openshift.com/pub/openshift-v4/dependencies/rhcos/latest/{{ rhcos_version }}/{{ item }}"
-          run_once: True  
+          run_once: True
           with_items:
             - "rhcos-{{ rhcos_version }}-x86_64-live-initramfs.x86_64.img"
-            - "rhcos-{{ rhcos_version }}-x86_64-live-kernel-x86_64"
             - "rhcos-{{ rhcos_version }}-x86_64-live-rootfs.x86_64.img"
             - "rhcos-{{ rhcos_version }}-x86_64-metal.x86_64.raw.gz"
         - name: == OCP KVM provisioning == Ensuring symlink for correct version {{ rhcos_version }}
@@ -66,6 +65,19 @@
         - repo
       when: inventory_hostname in groups['os_control_stg']
 
+    - name: == OCP KVM provisioning == Downloading RHCOS deploy files
+      get_url:
+        dest: /srv/web/infra/bigfiles/tftpboot/rhcos/
+        mode: 0755
+        url: "https://mirror.openshift.com/pub/openshift-v4/dependencies/rhcos/latest/{{ rhcos_version }}/{{ item }}"
+      run_once: True
+      with_items:
+        - "rhcos-{{ rhcos_version }}-x86_64-live-kernel-x86_64"
+      delegate_to: 127.0.0.1
+      tags:
+        - ignition
+        - repo
+
     - name: == Hardware provisioning == Generating the tftp configuration boot file
       template:
         src: ocp_pxeboot.j2
diff --git a/playbooks/manual/templates/ocp_pxeboot.j2 b/playbooks/manual/templates/ocp_pxeboot.j2
index 44da1834cf..ec7bb41339 100644
--- a/playbooks/manual/templates/ocp_pxeboot.j2
+++ b/playbooks/manual/templates/ocp_pxeboot.j2
@@ -11,5 +11,5 @@ LABEL local
 
 LABEL {{ inventory_hostname}}-deploy
         MENU LABEL RHCOS {{ rhcos_version }} {{ arch }}- Kickstart for {{ inventory_hostname }}
-        KERNEL rhcos-{{ rhcos_version }}-{{ arch }}-installer-kernel-{{ arch }}
+        KERNEL rhcos/rhcos-{{ rhcos_version }}-{{ arch }}-installer-kernel-{{ arch }}
         APPEND ip={{ eth0_ip }}::{{ gw }}:{{ nm }}:{{ inventory_hostname }}:{{ pxe_bootdev }}:none nameserver={{ dns }} rd.neednet=1 initrd=rhcos-{{ rhcos_version }}-{{ arch }}-installer-initramfs.{{ arch }}.img console={{ kernel_console | default('tty0')}} coreos.inst=yes rd.md=1 rd.auto coreos.inst.install_dev={{ install_dev }} coreos.inst.image_url={{ rhcos_install_img_url }} coreos.inst.ignition_url={{ rhcos_ignition_file_url }}