diff --git a/mods/ts/rules/civilian-infantry.yaml b/mods/ts/rules/civilian-infantry.yaml
index dbdc72e683..ca325c961c 100644
--- a/mods/ts/rules/civilian-infantry.yaml
+++ b/mods/ts/rules/civilian-infantry.yaml
@@ -298,9 +298,16 @@ VISLRG:
 
 CIV1:
 	Inherits: ^CivilianInfantry
+	Armament:
+		Weapon: Pistola
+	AttackFrontal:
 
 CIV2:
 	Inherits: ^CivilianInfantry
+	-AutoTarget:
 
 CIV3:
 	Inherits: ^CivilianInfantry
+	Armament:
+		Weapon: Pistola
+	AttackFrontal:
diff --git a/mods/ts/rules/defaults.yaml b/mods/ts/rules/defaults.yaml
index cc47de8b8e..1fc7935404 100644
--- a/mods/ts/rules/defaults.yaml
+++ b/mods/ts/rules/defaults.yaml
@@ -247,9 +247,6 @@
 		Speed: 71
 	RevealsShroud:
 		Range: 2c0
-	Armament:
-		Weapon: Pistola
-	AttackFrontal:
 	ProximityCaptor:
 		Types: CivilianInfantry
 	WithInfantryBody: