diff --git a/conf/maps_athena.conf b/conf/maps_athena.conf
index e7972fa2d3..e5422c6b73 100644
--- a/conf/maps_athena.conf
+++ b/conf/maps_athena.conf
@@ -1345,6 +1345,111 @@ map: 2012rwc_06
 map: 2012rwc_07
 map: 2012rwc_08
 
+// ep17.1
+map: 1@cor
+map: 1@os_a
+map: 1@os_b
+map: 1@rgsr
+map: gl_cas01_
+map: mag_dun03
+map: pub_cat
+map: rgsr_in
+map: sp_cor
+map: sp_os
+map: sp_rudus
+map: sp_rudus2
+map: sp_rudus3
+map: sp_rudus4
+
+// ep17.2
+map: 1@bamn
+map: 1@bamq
+map: 1@ghg
+map: 1@herbs
+map: 1@lost
+map: ba_2whs01
+map: ba_2whs02
+map: ba_bath
+map: ba_in01
+map: ba_lib
+map: ba_maison
+map: ba_pw01
+map: ba_pw02
+map: ba_pw03
+map: 1@odin
+map: odin_past
+
+// Illusion of Labyrinth
+map: prt_mz03_i
+
+// Illusion of Underwater
+map: iz_d04_i
+map: iz_d05_i
+
+// 4th jobs change
+map: 1@4win
+map: 1@4mag
+map: 1@4mst
+map: 1@4sac
+map: 1@4tro
+map: 1@4inq
+map: 1@4cdn
+map: 1@4igd
+map: 1@4drk
+map: job4_bio
+map: job4_mag
+map: job4_tro
+
+// Gefen Night Arena
+map: 1@ge_sn
+
+// Traces of heroes
+map: 1@mjo1
+map: 1@mjo2
+map: 1@spa2
+
+// Instance Thanatos Tower
+map: 1@thts
+map: 2@thts
+map: 3@thts
+map: 4@thts
+map: 5@thts
+map: 6@thts
+map: 7@thts
+map: 8@thts
+
+// Glastheim Challenge Mode
+map: 1@gl_he
+map: 1@gl_he2
+
+// EDDA
+map: 1@gl_prq
+map: 1@gol1
+map: 1@gol2
+
+// 2018 Halloween
+map: 1@halo
+
+// Constellation Tower
+map: 1@ch_t
+map: 2@ch_t
+map: 3@ch_t
+
+// ?? after 17.1
+map: abyss_04
+map: amicitia1
+map: amicitia2
+map: ba_chess
+map: ba_go
+map: ba_lost
+map: ein_dun03
+map: e_hugel
+map: grademk
+map: nif_dun01
+map: nif_dun02
+map: tra_fild
+map: verus02_a
+map: verus02_b
 
 //------------------------- Clone Maps ---------------------------
 //------------------------- Extra Maps ---------------------------
diff --git a/db/map_index.txt b/db/map_index.txt
index 469c63e9e9..4bf5d7e16b 100644
--- a/db/map_index.txt
+++ b/db/map_index.txt
@@ -1047,6 +1047,86 @@ star_in
 2012rwc_06
 2012rwc_07
 2012rwc_08
+1@4cdn
+1@4drk
+1@4igd
+1@4inq
+1@4mag
+1@4mst
+1@4sac
+1@4tro
+1@4win
+1@bamn
+1@bamq
+1@ch_t
+1@cor
+1@ge_sn
+1@ghg
+1@gl_he
+1@gl_he2
+1@gl_prq
+1@gol1
+1@gol2
+1@halo
+1@herbs
+1@lost
+1@mjo1
+1@mjo2
+1@odin
+1@os_a
+1@os_b
+1@rgsr
+1@spa2
+1@thts
+2@ch_t
+2@thts
+3@ch_t
+3@thts
+4@thts
+5@thts
+6@thts
+7@thts
+8@thts
+abyss_04
+amicitia1
+amicitia2
+ba_2whs01
+ba_2whs02
+ba_bath
+ba_chess
+ba_go
+ba_in01
+ba_lib
+ba_lost
+ba_maison
+ba_pw01
+ba_pw02
+ba_pw03
+ein_dun03
+e_hugel
+gl_cas01_
+grademk
+iz_d04_i
+iz_d05_i
+job4_bio
+job4_mag
+job4_tro
+mag_dun03
+nif_dun01
+nif_dun02
+odin_past
+prt_mz03_i
+pub_cat
+rgsr_in
+sp_cor
+sp_os
+sp_rudus
+sp_rudus2
+sp_rudus3
+sp_rudus4
+tra_fild
+verus02_a
+verus02_b
 
 //======================================================================================
 // - Other/Extra maps -
diff --git a/db/re/map_cache.dat b/db/re/map_cache.dat
index f131b00ee8..f5b335293a 100644
Binary files a/db/re/map_cache.dat and b/db/re/map_cache.dat differ