diff --git a/code/controllers/subsystem/non_firing/SSmaprotate.dm b/code/controllers/subsystem/non_firing/SSmaprotate.dm
index 1086890d75b..b6f2ed4ff01 100644
--- a/code/controllers/subsystem/non_firing/SSmaprotate.dm
+++ b/code/controllers/subsystem/non_firing/SSmaprotate.dm
@@ -43,7 +43,6 @@ SUBSYSTEM_DEF(maprotate)
 	var/day_index = 0
 
 	// Were gonna increase the DB value by 1 so we have 1-7, therefore we can use 0 as fail
-
 	if(dbq.NextRow())
 		day_index = text2num(dbq.item[1]) + 1
 
@@ -53,7 +52,6 @@ SUBSYSTEM_DEF(maprotate)
 		log_startup_progress("Somehow, we failed to extract a valid numerical day from the DB. ?????????????")
 		return
 
-
 	// String interpolation is faster than num2text() for some reason
 	var/dindex_str = "[day_index]"
 
@@ -65,11 +63,9 @@ SUBSYSTEM_DEF(maprotate)
 			log_startup_progress("It is [days[day_index]], which means [rotation_descs[vote_type]]")
 			rotation_mode = vote_type
 			setup_done = TRUE
-
 		// Its not valid
 		else
 			log_startup_progress("The defined rotation mode for this day is invalid. Please inform AA.")
-
 	// No special defined for this day
 	else
 		log_startup_progress("There is no special rotation defined for this day")
@@ -80,12 +76,14 @@ SUBSYSTEM_DEF(maprotate)
 		var/datum/map/M = x
 		if(!initial(M.voteable))
 			continue
-			// And of course, if the current map is the same
+		// Skip current map
 		if(istype(SSmapping.map_datum, M))
 			continue
-			// Or the map from last round
-		if(istype(SSmapping.last_map, M))
-			continue
+		// Commenting out this check for now, as we only have 3 maps to choose from.
+		// TODO: Uncomment when more maps are added back.
+		// Skip last round map
+//		if(istype(SSmapping.last_map, M))
+//			continue
 		potential_maps[M] = 0
 	// We now have 3 maps. We then pick your highest priority map in the list. Does this mean votes 4 and 5 don't matter? Yeah, with this current system only your top 3 votes will ever be used. 4 and 5 are good info to know however!
 	for(var/client/user_client in GLOB.clients)
diff --git a/code/datums/mapping/station_maps.dm b/code/datums/mapping/station_maps.dm
index 5b660f2a202..755a6ab3491 100644
--- a/code/datums/mapping/station_maps.dm
+++ b/code/datums/mapping/station_maps.dm
@@ -26,6 +26,7 @@
 	webmap_url = "https://webmap.affectedarc07.co.uk/maps/paradise/cerestation/"
 	min_players_random = 60
 	welcome_sound = 'sound/AI/welcome_farragus.ogg'
+	voteable = FALSE
 
 /datum/map/emeraldstation
 	fluff_name = "NSS Diagoras"
@@ -34,6 +35,7 @@
 	webmap_url = "https://webmap.affectedarc07.co.uk/maps/paradise/emeraldstation/"
 	min_players_random = 60
 	welcome_sound = 'sound/AI/welcome_diagoras.ogg'
+	voteable = FALSE
 
 /datum/map/test_tiny
 	fluff_name = "test_tiny"
diff --git a/config/example/config.toml b/config/example/config.toml
index 18e97f6dd6a..86230f38660 100644
--- a/config/example/config.toml
+++ b/config/example/config.toml
@@ -861,13 +861,13 @@ non_repeating_maps = true
 # - "FPTP" = A vote that excludes the map from the current round, and last round, then uses a weighted pick on the remaining maps, from preferences.
 # If you dont enter one correctly, it will whine on startup
 map_vote_day_types = [
-  {day_number = 1, rotation_type = "Vote"}, # Monday
+  {day_number = 1, rotation_type = "Random"}, # Monday
   {day_number = 2, rotation_type = "Random"}, # Tuesday
-  {day_number = 3, rotation_type = "FPTP"}, # Wednesday
+  {day_number = 3, rotation_type = "Random"}, # Wednesday
   {day_number = 4, rotation_type = "Random"}, # Thursday
-  {day_number = 5, rotation_type = "Vote"}, # Friday
-  {day_number = 6, rotation_type = "FPTP"}, # Saturday
-  {day_number = 7, rotation_type = "FPTP"}, # Sunday
+  {day_number = 5, rotation_type = "Random"}, # Friday
+  {day_number = 6, rotation_type = "Random"}, # Saturday
+  {day_number = 7, rotation_type = "Random"}, # Sunday
 ]
 
 ################################################################