We got the armory/weapon type update after killing all mobs in the room here:
P 228.6823, -3067.6790, -140.7401, 0, 0, 0, 2, Armory/Weapons_Update
For the "Talk to Goblins" step, prisoner and concripted goblins won't work. The ones you're looking for are in small rooms off the pit in the center of the prison area (near the Ancient Dragon):
P 996.0730, -3495.9907, -142.6969, 0, 0, 0, 2, Goblin_Soldier