diff --git a/defaults/main.yml b/defaults/main.yml
index ae0d97e4acaa7419445d2b5bff84adf9b517d966..630ded0285b75234d5d3be61274455d542f31937 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -35,6 +35,7 @@ autoinstall_grub_menus:
   - thinclient
   - cct
   - storage_t3
+  - storage_t4
 
 # kickstart selection
 autoinstall_default_bootmode: localboot
@@ -64,6 +65,7 @@ autoinstall_kickstart_files:
   - default_packages.template
   - centos7-default.ks
   - centos7-storage-t3.ks
+  - centos7-storage-t4.ks
   - add_repo.template
   - ansible_callback.template
   - firstboot.sh
diff --git a/tasks/kickstart.yml b/tasks/kickstart.yml
index c624604d1f5a82e416008854ea9a3e76892934c9..8d5507b930b9c5b5cdf583b4909d4f19932ed96d 100644
--- a/tasks/kickstart.yml
+++ b/tasks/kickstart.yml
@@ -7,12 +7,3 @@
     group: nginx
     mode: 0644
   with_items: "{{ autoinstall_kickstart_files }}"
-##    - clean_install.template
-#    - create_csi_user.template
-#    - default_packages.template
-#    - centos7-default.ks
-#    - add_repo.template
-#    - ansible_callback.template
-#    - firstboot.sh
-#    - centos7-thinclient.ks.j2
-#    - thinclient_packages.template.j2
diff --git a/templates/grub-menu/BIOS-storage-t4.j2 b/templates/grub-menu/BIOS-storage_t4.j2
similarity index 100%
rename from templates/grub-menu/BIOS-storage-t4.j2
rename to templates/grub-menu/BIOS-storage_t4.j2
diff --git a/templates/grub-menu/EFI-storage-t4.j2 b/templates/grub-menu/EFI-storage_t4.j2
similarity index 100%
rename from templates/grub-menu/EFI-storage-t4.j2
rename to templates/grub-menu/EFI-storage_t4.j2