diff --git a/code/modules/events/holiday/easter.dm b/code/modules/events/holiday/easter.dm
index ddade60e287..40c7fda57c3 100644
--- a/code/modules/events/holiday/easter.dm
+++ b/code/modules/events/holiday/easter.dm
@@ -26,13 +26,22 @@
 
 
 /datum/round_event/rabbitrelease/start()
-	for(var/obj/effect/landmark/R in GLOB.landmarks_list)
-		if(R.name != "blobspawn")
-			if(prob(35))
-				if(isspaceturf(R.loc))
-					new /mob/living/basic/rabbit/easter/space(R.loc)
-				else
-					new /mob/living/basic/rabbit/easter(R.loc)
+
+	for(var/obj/effect/landmark/event_spawn/spawn_point as anything in GLOB.generic_event_spawns) //Common public bunnies
+		if(prob(35))
+			new /mob/living/basic/rabbit/easter(spawn_point.loc)
+		CHECK_TICK
+
+	for(var/obj/effect/landmark/event_spawn/spawn_point as anything in GLOB.generic_maintenance_landmarks) // The rare maint bunnies
+		if(prob(15))
+			new /mob/living/basic/rabbit/easter(spawn_point.loc)
+		CHECK_TICK
+
+	for(var/obj/effect/landmark/carpspawn/spawn_point in GLOB.landmarks_list) // The rare space bunnies
+		if(prob(15))
+			new /mob/living/basic/rabbit/easter/space(spawn_point.loc)
+		CHECK_TICK
+
 
 //Easter Baskets
 /obj/item/storage/basket/easter