diff --git a/data/json/mapgen/basement/basement_game.json b/data/json/mapgen/basement/basement_game.json
index 6aa07dc267e19..06c324442879a 100644
--- a/data/json/mapgen/basement/basement_game.json
+++ b/data/json/mapgen/basement/basement_game.json
@@ -3,6 +3,7 @@
     "type": "mapgen",
     "method": "json",
     "om_terrain": [ "basement" ],
+    "//": "used by house_31 and house_32 and house_32",
     "weight": 250,
     "object": {
       "rotation": [ 0, 3 ],
@@ -54,6 +55,7 @@
     "type": "mapgen",
     "method": "json",
     "om_terrain": [ "basement" ],
+    "//": "used by house_31 and house_32",
     "weight": 250,
     "object": {
       "rotation": [ 0, 3 ],
@@ -105,6 +107,7 @@
     "type": "mapgen",
     "method": "json",
     "om_terrain": [ "basement" ],
+    "//": "used by house_31 and house_32",
     "weight": 250,
     "object": {
       "rotation": [ 0, 3 ],
@@ -154,6 +157,7 @@
     "type": "mapgen",
     "method": "json",
     "om_terrain": [ "basement" ],
+    "//": "used by house_31 and house_32",
     "weight": 250,
     "object": {
       "rotation": [ 0, 3 ],
@@ -203,6 +207,7 @@
     "type": "mapgen",
     "method": "json",
     "om_terrain": [ "basement" ],
+    "//": "used by house_31 and house_32",
     "weight": 250,
     "object": {
       "rotation": [ 0, 3 ],
diff --git a/data/json/mapgen/basement/basement_guns.json b/data/json/mapgen/basement/basement_guns.json
index 3ad48730d2635..81728a6c98aa6 100644
--- a/data/json/mapgen/basement/basement_guns.json
+++ b/data/json/mapgen/basement/basement_guns.json
@@ -3,6 +3,7 @@
     "type": "mapgen",
     "method": "json",
     "om_terrain": [ "basement" ],
+    "//": "used by house_31 and house_32",
     "weight": 250,
     "object": {
       "fill_ter": "t_rock",
diff --git a/data/json/mapgen/basement/basement_lab_stairs.json b/data/json/mapgen/basement/basement_lab_stairs.json
index 6928cd23ff0cd..737cd0c70ad70 100644
--- a/data/json/mapgen/basement/basement_lab_stairs.json
+++ b/data/json/mapgen/basement/basement_lab_stairs.json
@@ -3,6 +3,7 @@
     "type": "mapgen",
     "method": "json",
     "om_terrain": [ "basement_hidden_lab_stairs" ],
+    "//": "used by house_31 and house_32",
     "weight": 100,
     "object": {
       "fill_ter": "t_thconc_floor",
@@ -56,6 +57,7 @@
     "method": "json",
     "om_terrain": [ "basement_hidden_lab_stairs" ],
     "weight": 100,
+    "//": "used by house_31 and house_32",
     "object": {
       "rotation": [ 0, 3 ],
       "rows": [
diff --git a/data/json/mapgen/house/house31.json b/data/json/mapgen/house/house31.json
new file mode 100644
index 0000000000000..395e7c32b2068
--- /dev/null
+++ b/data/json/mapgen/house/house31.json
@@ -0,0 +1,99 @@
+[
+  {
+    "method": "json",
+    "om_terrain": "house_31",
+    "//": "used by legacy basements including lab basements, no dedicated stairs added.",
+    "type": "mapgen",
+    "weight": 100,
+    "object": {
+      "fill_ter": "t_floor",
+      "rows": [
+        "######....``.....`````..",
+        "#Tii #..[.``..X..`````..",
+        "#    *``````.....`````..",
+        "#y  L#..%%%%..^..`````..",
+        "#)]])####))))####=====##",
+        "#y   EsE  s   y#~~~~~~&#",
+        "#r        H   x#~~~~~~~#",
+        "#r        Hl  x#~~~~~~~#",
+        "#         H   x#~~~~~~~#",
+        ")  hhhh        #~~~~~~~#",
+        ")  ffff        +~~~~~~~#",
+        ")  hhhh        #U~NN~~q#",
+        "#        RRT   #########",
+        "#6  Y||||||||   | I@@I #",
+        "#6  J|RIII  +   +  @@  o",
+        "o7  J|  h   ||+||     b#",
+        "#O  J|y    d|--t|d yE  o",
+        "o3  4|@@   T|B--||+||  #",
+        "#F152|I  E d|B8S|S-t|DD#",
+        "###o###o##o###o#########",
+        "..%%%........%%%...^....",
+        "........[...............",
+        ".....[......[...........",
+        "...................%...."
+      ],
+      "palettes": [ "standard_domestic_palette" ],
+      "terrain": {
+        "%": [ "t_region_shrub", "t_region_shrub_fruit", "t_region_shrub_decorative" ],
+        "[": [ [ "t_region_tree_fruit", 2 ], [ "t_region_tree_nut", 2 ], "t_region_tree_shade" ],
+        "!": "t_region_groundcover_urban",
+        "`": "t_concrete",
+        "$": "t_privacy_fence",
+        ";": "t_privacy_fencegate_c",
+        ")": "t_wall_glass",
+        "]": "t_door_glass_c",
+        "-": "t_linoleum_white",
+        "Q": "t_linoleum_white",
+        "8": "t_linoleum_white",
+        "B": "t_linoleum_white",
+        "S": "t_linoleum_white",
+        "9": "t_linoleum_white",
+        "t": "t_linoleum_white",
+        "=": "t_door_metal_locked",
+        "&": "t_gates_control_brick",
+        "U": "t_thconc_floor",
+        "q": "t_thconc_floor",
+        "N": "t_thconc_floor",
+        "~": "t_thconc_floor"
+      },
+      "furniture": { "!": "f_region_flower" }
+    }
+  },
+  {
+    "type": "mapgen",
+    "method": "json",
+    "om_terrain": "house_31_roof",
+    "object": {
+      "fill_ter": "t_shingle_flat_roof",
+      "rows": [
+        "|22223                  ",
+        "|....3                  ",
+        "|....3                  ",
+        "|....3                  ",
+        "|....2222222225222222222",
+        "|......................3",
+        "|......................3",
+        "|......................3",
+        "|......................3",
+        "|......................3",
+        "|......................3",
+        "|....X......N..........3",
+        "|......................3",
+        "|......................3",
+        "|....................=.3",
+        "|............&.........3",
+        "|......................3",
+        "|......................3",
+        "|......................3",
+        "-------------------5----",
+        "                        ",
+        "                        ",
+        "                        ",
+        "                        "
+      ],
+      "palettes": [ "roof_palette" ],
+      "terrain": { ".": "t_shingle_flat_roof" }
+    }
+  }
+]
diff --git a/data/json/mapgen/house/house32.json b/data/json/mapgen/house/house32.json
new file mode 100644
index 0000000000000..92ad26bf11a7a
--- /dev/null
+++ b/data/json/mapgen/house/house32.json
@@ -0,0 +1,99 @@
+[
+  {
+    "method": "json",
+    "om_terrain": "house_32",
+    "//": "used by lab basements, no dedicated stairs added.",
+    "type": "mapgen",
+    "weight": 100,
+    "object": {
+      "fill_ter": "t_floor",
+      "rows": [
+        ".................``.....",
+        "##======#######..``.....",
+        "#&~~~~~~U#yiiyo..``.....",
+        "#~~~~~~~~+    *````.....",
+        "#~~~~~~~~#    o.......^.",
+        "#~~~~~~~U#L   ###]]]]###",
+        "#~~~~~~~U#       HHHH T#",
+        "#~~~~~~~q#R       ll  x#",
+        "#~~NN~~qq#R            o",
+        "##########c      HHHH  #",
+        "#Dbd   +               #",
+        "o     T| hhhh      AAAA#",
+        "#     E| ffff     JJJJJ#",
+        "o @@  y| hhhh         1#",
+        "#I@@I R|              5o",
+        "#|||||||              2#",
+        "# TII  +  |||+||Y  7O43#",
+        "#   h  ||||E  R|||+||||#",
+        "o @   R|R      R|t----B#",
+        "#s@y ER|R yHHHTy|QQ8S8B#",
+        "###o#o#####]]]##########",
+        "....................[.^.",
+        "......[.......[.........",
+        "........................"
+      ],
+      "palettes": [ "standard_domestic_palette" ],
+      "terrain": {
+        "%": [ "t_region_shrub", "t_region_shrub_fruit", "t_region_shrub_decorative" ],
+        "[": [ [ "t_region_tree_fruit", 2 ], [ "t_region_tree_nut", 2 ], "t_region_tree_shade" ],
+        "!": "t_region_groundcover_urban",
+        "`": "t_concrete",
+        "$": "t_privacy_fence",
+        ";": "t_privacy_fencegate_c",
+        ")": "t_wall_glass",
+        "]": "t_door_glass_c",
+        "-": "t_linoleum_white",
+        "Q": "t_linoleum_white",
+        "8": "t_linoleum_white",
+        "B": "t_linoleum_white",
+        "S": "t_linoleum_white",
+        "9": "t_linoleum_white",
+        "t": "t_linoleum_white",
+        "=": "t_door_metal_locked",
+        "&": "t_gates_control_brick",
+        "U": "t_thconc_floor",
+        "q": "t_thconc_floor",
+        "N": "t_thconc_floor",
+        "~": "t_thconc_floor"
+      },
+      "furniture": { "!": "f_region_flower" }
+    }
+  },
+  {
+    "type": "mapgen",
+    "method": "json",
+    "om_terrain": "house_32_roof",
+    "object": {
+      "fill_ter": "t_shingle_flat_roof",
+      "rows": [
+        "                        ",
+        "|22222222222223         ",
+        "|.............3         ",
+        "|.............3         ",
+        "|.............3         ",
+        "|.............3222222252",
+        "|......................3",
+        "|......................3",
+        "|......................3",
+        "|......................3",
+        "|......................3",
+        "|........N......&......3",
+        "|......................3",
+        "|...............=......3",
+        "|......................3",
+        "|......................3",
+        "|............X.........3",
+        "|......................3",
+        "|......................3",
+        "|......................3",
+        "|---------------------53",
+        "                        ",
+        "                        ",
+        "                        "
+      ],
+      "palettes": [ "roof_palette" ],
+      "terrain": { ".": "t_shingle_flat_roof" }
+    }
+  }
+]
diff --git a/data/json/overmap/multitile_city_buildings.json b/data/json/overmap/multitile_city_buildings.json
index 80ff7e345dc9f..28bec89bd6243 100644
--- a/data/json/overmap/multitile_city_buildings.json
+++ b/data/json/overmap/multitile_city_buildings.json
@@ -348,6 +348,26 @@
       { "point": [ 0, 0, -1 ], "overmap": "basement_chem2_north" }
     ]
   },
+  {
+    "type": "city_building",
+    "id": "house_31",
+    "locations": [ "land" ],
+    "overmaps": [
+      { "point": [ 0, 0, 0 ], "overmap": "house_31_north" },
+      { "point": [ 0, 0, 1 ], "overmap": "house_31_roof_north" },
+      { "point": [ 0, 0, -1 ], "overmap": "basement" }
+    ]
+  },
+  {
+    "type": "city_building",
+    "id": "house_32",
+    "locations": [ "land" ],
+    "overmaps": [
+      { "point": [ 0, 0, 0 ], "overmap": "house_32_north" },
+      { "point": [ 0, 0, 1 ], "overmap": "house_32_roof_north" },
+      { "point": [ 0, 0, -1 ], "overmap": "basement" }
+    ]
+  },
   {
     "type": "city_building",
     "id": "house_08",
diff --git a/data/json/overmap/overmap_terrain/overmap_terrain_residential.json b/data/json/overmap/overmap_terrain/overmap_terrain_residential.json
index 46e1947c7ed56..a06aa3a9ca48c 100644
--- a/data/json/overmap/overmap_terrain/overmap_terrain_residential.json
+++ b/data/json/overmap/overmap_terrain/overmap_terrain_residential.json
@@ -1322,6 +1322,40 @@
     "color": "light_green",
     "see_cost": 2
   },
+  {
+    "type": "overmap_terrain",
+    "id": "house_31",
+    "name": "house",
+    "copy-from": "generic_city_building",
+    "color": "light_green",
+    "see_cost": 2,
+    "flags": [ "SIDEWALK", "GENERIC_LOOT" ]
+  },
+  {
+    "type": "overmap_terrain",
+    "id": "house_31_roof",
+    "name": "house",
+    "copy-from": "generic_city_building",
+    "color": "light_green",
+    "see_cost": 2
+  },
+  {
+    "type": "overmap_terrain",
+    "id": "house_32",
+    "name": "house",
+    "copy-from": "generic_city_building",
+    "color": "light_green",
+    "see_cost": 2,
+    "flags": [ "SIDEWALK", "GENERIC_LOOT" ]
+  },
+  {
+    "type": "overmap_terrain",
+    "id": "house_32_roof",
+    "name": "house",
+    "copy-from": "generic_city_building",
+    "color": "light_green",
+    "see_cost": 2
+  },
   {
     "type": "overmap_terrain",
     "id": "basement_chem2",
diff --git a/data/json/regional_map_settings.json b/data/json/regional_map_settings.json
index 1674c45c42953..8f4cd725622e4 100644
--- a/data/json/regional_map_settings.json
+++ b/data/json/regional_map_settings.json
@@ -605,6 +605,8 @@
         "house_28": 50,
         "house_29": 50,
         "house_30": 50,
+        "house_31": 50,
+        "house_32": 50,
         "house_garage": 50,
         "house_garage2": 50,
         "house_garage3": 50,
@@ -647,7 +649,7 @@
         "trailerpark_city": 15,
         "railroad_city": 10
       },
-      "basements": { "basement": 1000, "basement_hidden_lab_stairs": 25 },
+      "basements": { "basement": 100, "basement_hidden_lab_stairs": 25 },
       "parks": {
         "park": 400,
         "pool": 20,