diff --git a/data/json/npcs/exodii/exodii_merchant_definitions.json b/data/json/npcs/exodii/exodii_merchant_definitions.json
index ac8df84270a77..3ac51951ea236 100644
--- a/data/json/npcs/exodii/exodii_merchant_definitions.json
+++ b/data/json/npcs/exodii/exodii_merchant_definitions.json
@@ -23,6 +23,7 @@
     "bonus_per": { "rng": [ 0, 4 ] },
     "shopkeeper_item_group": [
       { "group": "EXODII_basic_trade", "rigid": true },
+      { "group": "EXODII_CBM_Store_tier1_extra", "rigid": true, "trust": 1 },
       { "group": "EXODII_CBM_Store_Tier2", "rigid": true, "trust": 10 },
       { "group": "EXODII_CBM_Store_Tier3", "rigid": true, "trust": 20, "strict": true },
       { "group": "EXODII_CBM_Store_Tier4", "rigid": true, "trust": 40, "strict": true }
diff --git a/data/json/npcs/exodii/exodii_merchant_itemlist.json b/data/json/npcs/exodii/exodii_merchant_itemlist.json
index 3e259f8d53226..cdd39c30f7392 100644
--- a/data/json/npcs/exodii/exodii_merchant_itemlist.json
+++ b/data/json/npcs/exodii/exodii_merchant_itemlist.json
@@ -4,11 +4,21 @@
     "id": "EXODII_basic_trade",
     "subtype": "collection",
     "entries": [
-      { "group": "EXODII_Shop_Tier0", "count": 1, "prob": 100 },
+      { "group": "EXODII_Shop_Tier0", "count": [ 1, 2 ], "prob": 100 },
       { "group": "EXODII_Shop_NomadGear_Tier0", "count": [ 1, 2 ], "prob": 100 },
-      { "group": "EXODII_Shop_Guns_Tier0", "count": 1, "prob": 100 },
-      { "group": "EXODII_Shop_OldArmour", "count": 1, "prob": 100 },
-      { "group": "EXODII_CBM_Store_Tier1", "count": 1, "prob": 100 }
+      { "group": "EXODII_Shop_Guns_Tier0", "count": 2, "prob": 100 },
+      { "group": "EXODII_Shop_OldArmour", "count": [ 1, 2 ], "prob": 100 },
+      { "group": "EXODII_CBM_Store_Tier1", "count": [ 4, 6 ], "prob": 100 }
+    ]
+  },
+  {
+    "type": "item_group",
+    "//": "Spawn extra tier 1 CBMs and a bonus tier 2 if the Exodii don't dislike you.",
+    "id": "EXODII_CBM_Store_tier1_extra",
+    "subtype": "collection",
+    "entries": [
+      { "group": "EXODII_CBM_Store_Tier1", "count": [ 2, 4 ], "prob": 100 },
+      { "group": "EXODII_CBM_Store_Tier2", "count": 1, "prob": 25 }
     ]
   },
   {