diff --git a/src/data/biome.ts b/src/data/biome.ts
index 9b1eeabb4..1b29f39bf 100644
--- a/src/data/biome.ts
+++ b/src/data/biome.ts
@@ -898,7 +898,7 @@ export const biomeTrainerPools: BiomeTrainerPools = {
     [BiomePoolTier.RARE]: [],
     [BiomePoolTier.SUPER_RARE]: [],
     [BiomePoolTier.ULTRA_RARE]: [],
-    [BiomePoolTier.BOSS]: [ TrainerType.GIOVANNI ],
+    [BiomePoolTier.BOSS]: [ TrainerType.CLAY ],
     [BiomePoolTier.BOSS_RARE]: [],
     [BiomePoolTier.BOSS_SUPER_RARE]: [],
     [BiomePoolTier.BOSS_ULTRA_RARE]: []
@@ -975,7 +975,7 @@ export const biomeTrainerPools: BiomeTrainerPools = {
     [BiomePoolTier.RARE]: [],
     [BiomePoolTier.SUPER_RARE]: [],
     [BiomePoolTier.ULTRA_RARE]: [],
-    [BiomePoolTier.BOSS]: [ TrainerType.FANTINA ],
+    [BiomePoolTier.BOSS]: [ TrainerType.MORTY, TrainerType.FANTINA ],
     [BiomePoolTier.BOSS_RARE]: [],
     [BiomePoolTier.BOSS_SUPER_RARE]: [],
     [BiomePoolTier.BOSS_ULTRA_RARE]: []
@@ -1030,7 +1030,7 @@ export const biomeTrainerPools: BiomeTrainerPools = {
     [BiomePoolTier.RARE]: [],
     [BiomePoolTier.SUPER_RARE]: [],
     [BiomePoolTier.ULTRA_RARE]: [],
-    [BiomePoolTier.BOSS]: [ TrainerType.MORTY ],
+    [BiomePoolTier.BOSS]: [ TrainerType.GIOVANNI ],
     [BiomePoolTier.BOSS_RARE]: [],
     [BiomePoolTier.BOSS_SUPER_RARE]: [],
     [BiomePoolTier.BOSS_ULTRA_RARE]: []
@@ -4392,7 +4392,7 @@ export const biomeTrainerPools: BiomeTrainerPools = {
       ]
     ],
     [ TrainerType.GIOVANNI, [
-        [ Biome.BADLANDS, BiomePoolTier.BOSS ]
+        [ Biome.ABYSS, BiomePoolTier.BOSS ]
       ]
     ],
     [ TrainerType.BLAINE, [
@@ -4413,7 +4413,7 @@ export const biomeTrainerPools: BiomeTrainerPools = {
       ]
     ],
     [ TrainerType.MORTY, [
-        [ Biome.ABYSS, BiomePoolTier.BOSS ]
+        [ Biome.GRAVEYARD, BiomePoolTier.BOSS ]
       ]
     ],
     [ TrainerType.CHUCK, [
@@ -4525,6 +4525,7 @@ export const biomeTrainerPools: BiomeTrainerPools = {
       ]
     ],
     [ TrainerType.CLAY, [
+        [ Biome.BADLANDS, BiomePoolTier.BOSS ],
         [ Biome.DESERT, BiomePoolTier.BOSS ]
       ]
     ],
diff --git a/src/data/trainer-type.ts b/src/data/trainer-type.ts
index a9b03a2d3..29df2ed18 100644
--- a/src/data/trainer-type.ts
+++ b/src/data/trainer-type.ts
@@ -630,7 +630,7 @@ export const trainerConfigs: TrainerConfigs = {
   [TrainerType.JANINE]: new TrainerConfig(++t).initForGymLeader(Species.VENONAT, Type.POISON),
   [TrainerType.SABRINA]: new TrainerConfig(++t).initForGymLeader(Species.ALAKAZAM, Type.PSYCHIC),
   [TrainerType.BLAINE]: new TrainerConfig(++t).initForGymLeader(Species.MAGMAR, Type.FIRE),
-  [TrainerType.GIOVANNI]: new TrainerConfig(++t).initForGymLeader(Species.RHYHORN, Type.GROUND),
+  [TrainerType.GIOVANNI]: new TrainerConfig(++t).initForGymLeader(Species.SANDILE, Type.DARK),
   [TrainerType.FALKNER]: new TrainerConfig(++t).initForGymLeader(Species.PIDGEY, Type.FLYING),
   [TrainerType.BUGSY]: new TrainerConfig(++t).initForGymLeader(Species.SCYTHER, Type.BUG),
   [TrainerType.WHITNEY]: new TrainerConfig(++t).initForGymLeader(Species.MILTANK, Type.NORMAL),