diff --git a/Resources/Prototypes/_NF/Body/Organs/goblin_organs.yml b/Resources/Prototypes/_NF/Body/Organs/goblin_organs.yml
index 81952cbf559..4f08d9481b3 100644
--- a/Resources/Prototypes/_NF/Body/Organs/goblin_organs.yml
+++ b/Resources/Prototypes/_NF/Body/Organs/goblin_organs.yml
@@ -82,7 +82,7 @@
     removeEmpty: true
     solutionOnBody: false
     solution: "Lung"
-    metabolizerTypes: [ Human ]
+    metabolizerTypes: [ Animal ]
     groups:
     - id: Gas
       rateModifier: 100.0
@@ -112,7 +112,7 @@
     state: heart-on
 
 - type: entity
-  parent: OrganHumanStomach
+  parent: OrganAnimalStomach
   id: OrganGoblinStomach
   name: stomach
   suffix: Goblin
@@ -133,7 +133,7 @@
   - type: Stomach
   - type: Metabolizer
     maxReagents: 3
-    metabolizerTypes: [Human]
+    metabolizerTypes: [ Animal ]
     groups:
     - id: Food
     - id: Drink
@@ -149,7 +149,7 @@
     state: liver
   - type: Metabolizer # The liver metabolizes certain chemicals only, like alcohol.
     maxReagents: 1
-    metabolizerTypes: [Human]
+    metabolizerTypes: [ Animal ]
     groups:
     - id: Alcohol
       rateModifier: 0.1 # removes alcohol very slowly along with the stomach removing it as a drink
@@ -168,5 +168,5 @@
   # The kidneys just remove anything that doesn't currently have any metabolisms, as a stopgap.
   - type: Metabolizer
     maxReagents: 5
-    metabolizerTypes: [Human]
+    metabolizerTypes: [ Animal ]
     removeEmpty: true
\ No newline at end of file
diff --git a/Resources/Prototypes/_NF/Entities/Mobs/Species/goblin.yml b/Resources/Prototypes/_NF/Entities/Mobs/Species/goblin.yml
index db4e740c4ed..e791981b0e8 100644
--- a/Resources/Prototypes/_NF/Entities/Mobs/Species/goblin.yml
+++ b/Resources/Prototypes/_NF/Entities/Mobs/Species/goblin.yml
@@ -1,4 +1,5 @@
 - type: entity
+  save: false
   parent: BaseMobSpeciesOrganic
   name: Urist McGoblin
   id: MobGoblinBase
@@ -47,15 +48,16 @@
         - MobLayer
   - type: Body
     prototype: Goblin
+    requiredLegs: 2
   - type: Damageable
     damageModifierSet: Goblin
   - type: MeleeWeapon
     soundHit:
       collection: Punch
-    animation: WeaponArcFist
+    animation: WeaponArcClaw
     damage:
       types:
-        Blunt: 5
+        Slash: 4
   - type: Thieving
     stealthy: true
     stripTimeReduction: 1
@@ -81,9 +83,10 @@
   - type: NpcFactionMember
     factions:
     - NanoTrasen
-#    - Goblin
+    - Goblin
   - type: Tag
     tags:
+    - CanPilot
     - GoblinMobTag
     - DoorBumpOpener
 
diff --git a/Resources/Prototypes/_NF/ai_factions.yml b/Resources/Prototypes/_NF/ai_factions.yml
index c7b169907ff..827d1f74ca9 100644
--- a/Resources/Prototypes/_NF/ai_factions.yml
+++ b/Resources/Prototypes/_NF/ai_factions.yml
@@ -11,6 +11,7 @@
   - Chicken
   - Monkey
   - Mailman
+  - Goblin
 
 - type: npcFaction
   id: Dwarf
@@ -29,3 +30,6 @@
 
 - type: npcFaction
   id: Monkey
+
+- type: npcFaction
+  id: Goblin