diff --git a/roles/batcave/tasks/main.yml b/roles/batcave/tasks/main.yml
index 4b1c65ab64..b4d39f6dd1 100644
--- a/roles/batcave/tasks/main.yml
+++ b/roles/batcave/tasks/main.yml
@@ -576,13 +576,19 @@
   - tmux
 
 - name: Create dir for openshift pxe boot files
-  file: path=/srv/web/infra/bigfiles/openshiftboot mode=2660 owner=root group=sysadmin-openshift state=directory
+  file: path=/srv/web/infra/bigfiles/"{{item}}" mode=2660 owner=root group=sysadmin-openshift state=directory
+  with_items:
+  - openshiftboot
+  - tftpboot/rhcos
   tags:
   - batcave
   - openshiftboot
 
 - name: Let the openshift dir be writeable by sysadmin-openshift
-  command: setfacl -R -m d:g:sysadmin-openshift:rwx -m g:sysadmin-openshift:rwx /srv/web/infra/bigfiles/openshiftboot
+  command: setfacl -R -m d:g:sysadmin-openshift:rwx -m g:sysadmin-openshift:rwx /srv/web/infra/bigfiles/"{{item}}"
+  with_items:
+  - openshiftboot
+  - tftpboot/rhcos
   tags:
   - batcave
   - openshiftboot