diff --git a/mods/ts/rules/defaults.yaml b/mods/ts/rules/defaults.yaml
index a4f50b12be..3eb5879650 100644
--- a/mods/ts/rules/defaults.yaml
+++ b/mods/ts/rules/defaults.yaml
@@ -338,7 +338,7 @@
 		Probability: 10
 		OwnerType: InternalName
 		InternalOwner: Creeps
-		DeathType: EnergyDeath # TODO: FIX ME! (Tiberium currently uses the wrong damage type!)
+		DeathType: TriggerVisceroid
 		RequiresLobbyCreeps: true
 	SpawnActorOnDeath@FLAMEGUY:
 		Actor: FLAMEGUY
diff --git a/mods/ts/weapons/otherweapons.yaml b/mods/ts/weapons/otherweapons.yaml
index 1703431112..fe66744197 100644
--- a/mods/ts/weapons/otherweapons.yaml
+++ b/mods/ts/weapons/otherweapons.yaml
@@ -65,14 +65,14 @@ Tiberium:
 	Warhead@1Dam: SpreadDamage
 		Spread: 42
 		Damage: 2
-		DamageTypes: EnergyDeath # TODO: FIX ME!
+		DamageTypes: ExplosionDeath, TriggerVisceroid
 
 Veins:
 	ReloadDelay: 16
 	Warhead@Damage: SpreadDamage
 		Spread: 42
 		Damage: 5
-		DamageTypes: EnergyDeath # TODO: FIX ME!
+		DamageTypes: BulletDeath
 	Warhead@Effect: CreateEffect
 		Explosions: veins
 		ExplosionPalette: player