diff --git a/src/data/balance/signature-species.ts b/src/data/balance/signature-species.ts
index 0b350a4bc53..97f90ab693c 100644
--- a/src/data/balance/signature-species.ts
+++ b/src/data/balance/signature-species.ts
@@ -46,7 +46,7 @@ export const signatureSpecies: SignatureSpecies = {
   FANTINA: [Species.MISDREAVUS, Species.DRIFLOON, Species.DUSKULL],
   BYRON: [Species.SHIELDON, Species.BRONZOR, Species.ARON],
   CANDICE: [Species.SNEASEL, Species.SNOVER, Species.SNORUNT],
-  VOLKNER: [Species.SHINX, Species.ELEKID, Species.JOLTEON, Species.REMORAID],
+  VOLKNER: [Species.SHINX, Species.ELEKID, Species.JOLTEON, Species.REMORAID], // Tera Electric Octillery
   // Gym Leaders- Unova
   CILAN: [Species.PANSAGE, Species.FOONGUS, Species.PETILIL],
   CHILI: [Species.PANSEAR, Species.DARUMAKA, Species.NUMEL],
diff --git a/src/data/trainers/trainer-config.ts b/src/data/trainers/trainer-config.ts
index d9922ecc097..bd52fd2d16d 100644
--- a/src/data/trainers/trainer-config.ts
+++ b/src/data/trainers/trainer-config.ts
@@ -2607,7 +2607,7 @@ export const trainerConfigs: TrainerConfigs = {
     .setBattleBgm("battle_kanto_gym")
     .setMixedBattleBgm("battle_kanto_gym"),
   [TrainerType.GIOVANNI]: new TrainerConfig(++t)
-    .initForGymLeader(signatureSpecies["GIOVANNI"], true, PokemonType.DARK)
+    .initForGymLeader(signatureSpecies["GIOVANNI"], true, PokemonType.GROUND)
     .setBattleBgm("battle_kanto_gym")
     .setMixedBattleBgm("battle_kanto_gym"),
   [TrainerType.FALKNER]: new TrainerConfig(++t)
@@ -2713,7 +2713,7 @@ export const trainerConfigs: TrainerConfigs = {
     .setBattleBgm("battle_sinnoh_gym")
     .setMixedBattleBgm("battle_sinnoh_gym"),
   [TrainerType.VOLKNER]: new TrainerConfig(++t)
-    .initForGymLeader(signatureSpecies["VOLKNER"], true, PokemonType.ELECTRIC)
+    .initForGymLeader(signatureSpecies["VOLKNER"], true, PokemonType.ELECTRIC, false, -4)
     .setBattleBgm("battle_sinnoh_gym")
     .setMixedBattleBgm("battle_sinnoh_gym"),
   [TrainerType.CILAN]: new TrainerConfig(++t)