diff --git a/playbooks/manual/ocp4-place-ignitionfiles.yml b/playbooks/manual/ocp4-place-ignitionfiles.yml
index c408f72e07..e0254b1f0e 100644
--- a/playbooks/manual/ocp4-place-ignitionfiles.yml
+++ b/playbooks/manual/ocp4-place-ignitionfiles.yml
@@ -69,7 +69,7 @@
 
     - name: == OCP KVM provisioning == Downloading RHCOS deploy files
       get_url:
-        dest: /srv/web/infra/bigfiles/tftpboot2/rhcos/
+        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
diff --git a/roles/batcave/tasks/main.yml b/roles/batcave/tasks/main.yml
index 3660e31a57..a30bb32baf 100644
--- a/roles/batcave/tasks/main.yml
+++ b/roles/batcave/tasks/main.yml
@@ -601,7 +601,7 @@
   file: path=/srv/web/infra/bigfiles/{{item}} mode=2660 owner=root group=sysadmin-openshift state=directory
   with_items:
   - openshiftboot
-  - tftpboot2/rhcos
+  - tftpboot/rhcos
   tags:
   - batcave
   - openshiftboot
@@ -610,7 +610,7 @@
   command: setfacl -R -m d:g:sysadmin-openshift:rwx -m g:sysadmin-openshift:rwx /srv/web/infra/bigfiles/{{item}}
   with_items:
   - openshiftboot
-  - tftpboot2/rhcos
+  - tftpboot/rhcos
   tags:
   - batcave
   - openshiftboot
diff --git a/roles/tftp_server/tasks/main.yml b/roles/tftp_server/tasks/main.yml
index dc30cef04b..0f8ef3d947 100644
--- a/roles/tftp_server/tasks/main.yml
+++ b/roles/tftp_server/tasks/main.yml
@@ -35,13 +35,6 @@
   synchronize: src="{{ bigfiles }}/tftpboot/" dest=/var/lib/tftpboot/
   tags:
   - tftp_server
-  when: datacenter != 'iad2' 
-
-- name: fill up the tftpboot directory
-  synchronize: src="{{ bigfiles }}/tftpboot2/" dest=/var/lib/tftpboot/
-  tags:
-  - tftp_server
-  when: datacenter == 'iad2' 
 
 - name: Set permissions on the rhcos tftpboot folder
   file: