diff --git a/vasl_templates/webapp/data/ordnance/american.json b/vasl_templates/webapp/data/ordnance/american.json
index 7a881fb..0950459 100644
--- a/vasl_templates/webapp/data/ordnance/american.json
+++ b/vasl_templates/webapp/data/ordnance/american.json
@@ -78,7 +78,7 @@
"note_number": "9\u2020",
"notes": [ "C\u20201", "D\u20202", "F" ],
"id": "am/o:008",
- "gpid": null
+ "gpid": 856
},
{ "name": "M18 57mm Recoilless Rifle",
"type": "RCL",
@@ -87,7 +87,7 @@
"note_number": "10",
"notes": [ "D\u20201", "E\u2020" ],
"id": "am/o:009",
- "gpid": null
+ "gpid": 857
},
{ "name": "M20 75mm Recoilless Rifle",
"type": "RCL",
@@ -96,7 +96,7 @@
"note_number": "11",
"notes": [ "D\u20201", "E\u2020" ],
"id": "am/o:010",
- "gpid": null
+ "gpid": 858
},
{ "name": "M1A1 75mm Pack Howitzer",
"type": "ART",
diff --git a/vasl_templates/webapp/data/ordnance/axis-minor/bulgarian.json b/vasl_templates/webapp/data/ordnance/axis-minor/bulgarian.json
index d0a54fe..251059a 100644
--- a/vasl_templates/webapp/data/ordnance/axis-minor/bulgarian.json
+++ b/vasl_templates/webapp/data/ordnance/axis-minor/bulgarian.json
@@ -6,7 +6,7 @@
"note_number": "37",
"notes": [ "A" ],
"id": "bu/o:000",
- "gpid": 3679
+ "gpid": null
},
{ "name": "Madsen M-35",
"type": "AT",
diff --git a/vasl_templates/webapp/data/ordnance/axis-minor/common.json b/vasl_templates/webapp/data/ordnance/axis-minor/common.json
index 19b36d4..11f82ad 100644
--- a/vasl_templates/webapp/data/ordnance/axis-minor/common.json
+++ b/vasl_templates/webapp/data/ordnance/axis-minor/common.json
@@ -49,7 +49,7 @@
"note_number": "49",
"notes": [ "B", "C", "H", "R", "S" ],
"id": "axc/o:005",
- "gpid": null
+ "gpid": 3691
},
{ "name": "s18-1100",
"type": "ATR",
@@ -57,7 +57,7 @@
"note_number": "50",
"notes": [ "A", "H", "R" ],
"id": "axc/o:006",
- "gpid": null
+ "gpid": 3692
},
{ "name": "Kanon PUV vz. 37(t)",
"type": "AT",
diff --git a/vasl_templates/webapp/data/ordnance/axis-minor/hungarian.json b/vasl_templates/webapp/data/ordnance/axis-minor/hungarian.json
index 214ead5..04351c4 100644
--- a/vasl_templates/webapp/data/ordnance/axis-minor/hungarian.json
+++ b/vasl_templates/webapp/data/ordnance/axis-minor/hungarian.json
@@ -6,7 +6,7 @@
"note_number": "23",
"notes": [ "A" ],
"id": "hu/o:000",
- "gpid": 3679
+ "gpid": null
},
{ "name": "40mm MAVAG 40 M",
"type": "AT",
diff --git a/vasl_templates/webapp/data/ordnance/french.json b/vasl_templates/webapp/data/ordnance/french.json
index 879185d..3f247bb 100644
--- a/vasl_templates/webapp/data/ordnance/french.json
+++ b/vasl_templates/webapp/data/ordnance/french.json
@@ -33,7 +33,7 @@
"note_number": "4\u2020",
"notes": [ "B" ],
"id": "fr/o:003",
- "gpid": null
+ "gpid": 1648
},
{ "name": "Canon AC de 25 SA-L mle 34",
"type": "AT",
diff --git a/vasl_templates/webapp/tests/fixtures/vasl-pieces-6.5.0.txt b/vasl_templates/webapp/tests/fixtures/vasl-pieces-6.5.0.txt
index 92fd1b0..3b63e85 100644
--- a/vasl_templates/webapp/tests/fixtures/vasl-pieces-6.5.0.txt
+++ b/vasl_templates/webapp/tests/fixtures/vasl-pieces-6.5.0.txt
@@ -127,6 +127,9 @@ GPID Name Front images
759 Jeep(a) MMG br/vehicles/jeep2.gif
849 60* MTR M2 am/amMTR.gif am/amMTRb.gif
850 60* MTR M19 am/amMTRa.gif am/amMTRab.gif
+856 37* INF am/amINF.gif am/amINFb.gif
+857 57 RCL am/amRCLa.gif am/amRCLab.gif
+858 75 RCL am/amRCL.gif am/amRCLb.gif
881 107* MTR M2 am/gun/amMTR107.gif am/gun/amMTR107b.gif
882 155* MTR T25 am/gun/amMT155s.gif am/gun/amMT155sb.gif
884 37L AT M3A1 am/gun/amAT37LL.gif am/gun/amAT37LLb.gif
@@ -410,6 +413,7 @@ GPID Name Front images
1632 37* INF fr/frINF.gif fr/frINFb.gif
1636 50 MTR(f) fr/frMTR.gif fr/frMTRb.gif
1641 60* MTR(a) br/brMTRa.gif br/brMTRab.gif
+1648 ATR fr/frATR.gif fr/frATRb.gif
1667 81* MTR(f) mle 27/31 fr/gun/frMTR81sf.gif fr/gun/frMTR81sfb.gif
1669 25LL AT SA-L mle 34 fr/gun/frAT25LL.gif fr/gun/frAT25LLb.gif
1670 47L AT SA mle 37 APX <41 fr/gun/frAT47L-40.gif fr/gun/frAT47Lb.gif
@@ -946,10 +950,11 @@ GPID Name Front images
3567 Autocarro Pesante it/veh/autpes.gif
3605 50* MTR (g) fi/fiMTR.gif fi/fiMTRb.gif
3608 20L ATR fi/fiATR.gif fi/fiATRb.gif
-3679 50 MTR(f) ax/axMTRf.gif ax/axMTRfb.gif
3680 50* MTR ax/axMTR.gif ax/axMTRb.gif
3681 50* MTR(r) ax/axMTRr.gif ax/axMTRrb.gif
3682 60* MTR(f) ax/axMTR60f.gif ax/axMTR60fb.gif
+3691 ATR ax/axATR.gif ax/axATRb.gif
+3692 20L ATR ax/axATR20.gif ax/axATR20b.gif
3709 81* MTR GrW 34 ax/gun/axMT81sg.gif ax/gun/axMT81sgb.gif
3711 81* MTR Brandt M27/31 ax/gun/axMT81s.gif ax/gun/axMT81sb.gif
3713 120* MTR PM obr. 38 ax/gun/axMT120s.gif ax/gun/axMT120sb.gif
diff --git a/vasl_templates/webapp/tests/fixtures/vasl-pieces-legacy.txt b/vasl_templates/webapp/tests/fixtures/vasl-pieces-legacy.txt
index 886e128..4e86dad 100644
--- a/vasl_templates/webapp/tests/fixtures/vasl-pieces-legacy.txt
+++ b/vasl_templates/webapp/tests/fixtures/vasl-pieces-legacy.txt
@@ -127,6 +127,9 @@ GPID Name Front images
759 Jeep(a) MMG br/vehicles/jeep2.gif
849 60* MTR M2 am/amMTR.gif am/amMTRb.gif
850 60* MTR M19 am/amMTRa.gif am/amMTRab.gif
+856 37* INF am/amINF.gif am/amINFb.gif
+857 57 RCL am/amRCLa.gif am/amRCLab.gif
+858 75 RCL am/amRCL.gif am/amRCLb.gif
879 81* MTR M1 am/gun/amMTR81s.gif am/gun/amMTR81sb.gif
881 107* MTR M2 am/gun/amMTR107.gif am/gun/amMTR107b.gif
882 155* MTR T25 am/gun/amMT155s.gif am/gun/amMT155sb.gif
@@ -414,6 +417,7 @@ GPID Name Front images
1632 37* INF fr/frINF.gif fr/frINFb.gif
1636 50 MTR(f) fr/frMTR.gif fr/frMTRb.gif
1641 60* MTR(a) br/brMTRa.gif br/brMTRab.gif
+1648 ATR fr/frATR.gif fr/frATRb.gif
1667 81* MTR(f) mle 27/31 fr/gun/frMTR81sf.gif fr/gun/frMTR81sfb.gif
1669 25LL AT SA-L mle 34 fr/gun/frAT25LL.gif fr/gun/frAT25LLb.gif
1670 47L AT SA mle 37 APX <41 fr/gun/frAT47L-40.gif fr/gun/frAT47Lb.gif
@@ -950,10 +954,11 @@ GPID Name Front images
3567 Autocarro Pesante it/veh/autpes.gif
3605 50* MTR (g) fi/fiMTR.gif fi/fiMTRb.gif
3608 20L ATR fi/fiATR.gif fi/fiATRb.gif
-3679 50 MTR(f) ax/axMTRf.gif ax/axMTRfb.gif
3680 50* MTR ax/axMTR.gif ax/axMTRb.gif
3681 50* MTR(r) ax/axMTRr.gif ax/axMTRrb.gif
3682 60* MTR(f) ax/axMTR60f.gif ax/axMTR60fb.gif
+3691 ATR ax/axATR.gif ax/axATRb.gif
+3692 20L ATR ax/axATR20.gif ax/axATR20b.gif
3709 81* MTR GrW 34 ax/gun/axMT81sg.gif ax/gun/axMT81sgb.gif
3711 81* MTR Brandt M27/31 ax/gun/axMT81s.gif ax/gun/axMT81sb.gif
3713 120* MTR PM obr. 38 ax/gun/axMT120s.gif ax/gun/axMT120sb.gif