diff --git a/shared-data/labware/definitions/3/armadillo_96_wellplate_200ul_pcr_full_skirt/3.json b/shared-data/labware/definitions/3/armadillo_96_wellplate_200ul_pcr_full_skirt/3.json
index 0d682186706..71c6f214707 100644
--- a/shared-data/labware/definitions/3/armadillo_96_wellplate_200ul_pcr_full_skirt/3.json
+++ b/shared-data/labware/definitions/3/armadillo_96_wellplate_200ul_pcr_full_skirt/3.json
@@ -1140,7 +1140,28 @@
   ],
   "innerLabwareGeometry": {
     "conicalWell": {
-      "sections": []
+      "sections": [
+        {
+          "shape": "spherical",
+          "radiusOfCurvature": 1.25,
+          "topHeight": 0.8,
+          "bottomHeight": 0.0
+        },
+        {
+          "shape": "conical",
+          "topDiameter": 5.5,
+          "bottomDiameter": 2.33,
+          "topHeight": 11.35,
+          "bottomHeight": 0.8
+        },
+        {
+          "shape": "conical",
+          "bottomDiameter": 5.5,
+          "topDiameter": 5.5,
+          "topHeight": 14.95,
+          "bottomHeight": 11.35
+        }
+      ]
     }
   }
 }
diff --git a/shared-data/labware/definitions/3/opentrons_10_tuberack_falcon_4x50ml_6x15ml_conical/2.json b/shared-data/labware/definitions/3/opentrons_10_tuberack_falcon_4x50ml_6x15ml_conical/2.json
index c8841946eab..7827cbb5916 100644
--- a/shared-data/labware/definitions/3/opentrons_10_tuberack_falcon_4x50ml_6x15ml_conical/2.json
+++ b/shared-data/labware/definitions/3/opentrons_10_tuberack_falcon_4x50ml_6x15ml_conical/2.json
@@ -34,7 +34,7 @@
       "x": 13.88,
       "y": 67.75,
       "z": 6.85,
-      "geometryDefinitionId": "conicalWell"
+      "geometryDefinitionId": "15mlconicalWell"
     },
     "B1": {
       "totalLiquidVolume": 15000,
@@ -44,7 +44,7 @@
       "x": 13.88,
       "y": 42.75,
       "z": 6.85,
-      "geometryDefinitionId": "conicalWell"
+      "geometryDefinitionId": "15mlconicalWell"
     },
     "C1": {
       "totalLiquidVolume": 15000,
@@ -54,7 +54,7 @@
       "x": 13.88,
       "y": 17.75,
       "z": 6.85,
-      "geometryDefinitionId": "conicalWell"
+      "geometryDefinitionId": "15mlconicalWell"
     },
     "A2": {
       "totalLiquidVolume": 15000,
@@ -64,7 +64,7 @@
       "x": 38.88,
       "y": 67.75,
       "z": 6.85,
-      "geometryDefinitionId": "conicalWell"
+      "geometryDefinitionId": "15mlconicalWell"
     },
     "B2": {
       "totalLiquidVolume": 15000,
@@ -74,7 +74,7 @@
       "x": 38.88,
       "y": 42.75,
       "z": 6.85,
-      "geometryDefinitionId": "conicalWell"
+      "geometryDefinitionId": "15mlconicalWell"
     },
     "C2": {
       "totalLiquidVolume": 15000,
@@ -84,7 +84,7 @@
       "x": 38.88,
       "y": 17.75,
       "z": 6.85,
-      "geometryDefinitionId": "conicalWell"
+      "geometryDefinitionId": "15mlconicalWell"
     },
     "A3": {
       "totalLiquidVolume": 50000,
@@ -94,7 +94,7 @@
       "x": 71.38,
       "y": 60.25,
       "z": 7.3,
-      "geometryDefinitionId": "b"
+      "geometryDefinitionId": "50mlconicalWell"
     },
     "B3": {
       "totalLiquidVolume": 50000,
@@ -104,7 +104,7 @@
       "x": 71.38,
       "y": 25.25,
       "z": 7.3,
-      "geometryDefinitionId": "b"
+      "geometryDefinitionId": "50mlconicalWell"
     },
     "A4": {
       "totalLiquidVolume": 50000,
@@ -114,7 +114,7 @@
       "x": 106.38,
       "y": 60.25,
       "z": 7.3,
-      "geometryDefinitionId": "b"
+      "geometryDefinitionId": "50mlconicalWell"
     },
     "B4": {
       "totalLiquidVolume": 50000,
@@ -124,7 +124,7 @@
       "x": 106.38,
       "y": 25.25,
       "z": 7.3,
-      "geometryDefinitionId": "b"
+      "geometryDefinitionId": "50mlconicalWell"
     }
   },
   "brand": {
@@ -172,7 +172,7 @@
     "z": 0
   },
   "innerLabwareGeometry": {
-    "conicalWell": {
+    "15mlconicalWell": {
       "sections": [
         {
           "shape": "spherical",
@@ -203,7 +203,7 @@
         }
       ]
     },
-    "b": {
+    "50mlconicalWell": {
       "sections": [
         {
           "shape": "conical",
diff --git a/shared-data/labware/definitions/3/opentrons_10_tuberack_falcon_4x50ml_6x15ml_conical_acrylic/2.json b/shared-data/labware/definitions/3/opentrons_10_tuberack_falcon_4x50ml_6x15ml_conical_acrylic/2.json
index 4a57b660efe..4c7683521d7 100644
--- a/shared-data/labware/definitions/3/opentrons_10_tuberack_falcon_4x50ml_6x15ml_conical_acrylic/2.json
+++ b/shared-data/labware/definitions/3/opentrons_10_tuberack_falcon_4x50ml_6x15ml_conical_acrylic/2.json
@@ -8,7 +8,7 @@
       "x": 19,
       "y": 74,
       "z": 5.78,
-      "geometryDefinitionId": "conicalWell"
+      "geometryDefinitionId": "15mlconicalWell"
     },
     "B1": {
       "totalLiquidVolume": 15000,
@@ -18,7 +18,7 @@
       "x": 19,
       "y": 42.5,
       "z": 5.78,
-      "geometryDefinitionId": "conicalWell"
+      "geometryDefinitionId": "15mlconicalWell"
     },
     "C1": {
       "totalLiquidVolume": 15000,
@@ -28,7 +28,7 @@
       "x": 19,
       "y": 11,
       "z": 5.78,
-      "geometryDefinitionId": "conicalWell"
+      "geometryDefinitionId": "15mlconicalWell"
     },
     "A2": {
       "totalLiquidVolume": 15000,
@@ -38,7 +38,7 @@
       "x": 42,
       "y": 74,
       "z": 5.78,
-      "geometryDefinitionId": "conicalWell"
+      "geometryDefinitionId": "15mlconicalWell"
     },
     "B2": {
       "totalLiquidVolume": 15000,
@@ -48,7 +48,7 @@
       "x": 42,
       "y": 42.5,
       "z": 5.78,
-      "geometryDefinitionId": "conicalWell"
+      "geometryDefinitionId": "15mlconicalWell"
     },
     "C2": {
       "totalLiquidVolume": 15000,
@@ -58,7 +58,7 @@
       "x": 42,
       "y": 11,
       "z": 5.78,
-      "geometryDefinitionId": "conicalWell"
+      "geometryDefinitionId": "15mlconicalWell"
     },
     "A3": {
       "totalLiquidVolume": 50000,
@@ -68,7 +68,7 @@
       "x": 70.2,
       "y": 62.2,
       "z": 5.95,
-      "geometryDefinitionId": "conicalWell"
+      "geometryDefinitionId": "50mlconicalWell"
     },
     "B3": {
       "totalLiquidVolume": 50000,
@@ -78,7 +78,7 @@
       "x": 70.2,
       "y": 16.8,
       "z": 5.95,
-      "geometryDefinitionId": "conicalWell"
+      "geometryDefinitionId": "50mlconicalWell"
     },
     "A4": {
       "totalLiquidVolume": 50000,
@@ -88,7 +88,7 @@
       "x": 106.1,
       "y": 62.2,
       "z": 5.95,
-      "geometryDefinitionId": "conicalWell"
+      "geometryDefinitionId": "50mlconicalWell"
     },
     "B4": {
       "totalLiquidVolume": 50000,
@@ -98,7 +98,7 @@
       "x": 106.1,
       "y": 16.8,
       "z": 5.95,
-      "geometryDefinitionId": "conicalWell"
+      "geometryDefinitionId": "50mlconicalWell"
     }
   },
   "brand": {
@@ -170,8 +170,61 @@
     "z": 0
   },
   "innerLabwareGeometry": {
-    "conicalWell": {
-      "sections": []
+    "15mlconicalWell": {
+      "sections": [
+        {
+          "shape": "spherical",
+          "radiusOfCurvature": 2.9,
+          "topHeight": 0.8,
+          "bottomHeight": 0.0
+        },
+        {
+          "shape": "conical",
+          "bottomDiameter": 4,
+          "topDiameter": 13.5,
+          "topHeight": 20.7,
+          "bottomHeight": 0.8
+        },
+        {
+          "shape": "conical",
+          "bottomDiameter": 13.5,
+          "topDiameter": 14.5,
+          "topHeight": 108.6,
+          "bottomHeight": 20.7
+        },
+        {
+          "shape": "conical",
+          "bottomDiameter": 14.5,
+          "topDiameter": 14.7,
+          "topHeight": 118.2,
+          "bottomHeight": 108.6
+        }
+      ]
+    },
+    "50mlconicalWell": {
+      "sections": [
+        {
+          "shape": "conical",
+          "bottomDiameter": 6.15,
+          "topDiameter": 26.18,
+          "topHeight": 14.3,
+          "bottomHeight": 0.0
+        },
+        {
+          "shape": "conical",
+          "bottomDiameter": 26.18,
+          "topDiameter": 27.52,
+          "topHeight": 100.65,
+          "bottomHeight": 14.3
+        },
+        {
+          "shape": "conical",
+          "bottomDiameter": 27.52,
+          "topDiameter": 27.81,
+          "topHeight": 112.85,
+          "bottomHeight": 100.65
+        }
+      ]
     }
   }
 }
diff --git a/shared-data/labware/definitions/3/opentrons_96_pcr_adapter_armadillo_wellplate_200ul/2.json b/shared-data/labware/definitions/3/opentrons_96_pcr_adapter_armadillo_wellplate_200ul/2.json
index 86c28b5cbf9..3ac68ba32be 100644
--- a/shared-data/labware/definitions/3/opentrons_96_pcr_adapter_armadillo_wellplate_200ul/2.json
+++ b/shared-data/labware/definitions/3/opentrons_96_pcr_adapter_armadillo_wellplate_200ul/2.json
@@ -1122,7 +1122,28 @@
   ],
   "innerLabwareGeometry": {
     "conicalWell": {
-      "sections": []
+      "sections": [
+        {
+          "shape": "spherical",
+          "radiusOfCurvature": 1.25,
+          "topHeight": 0.8,
+          "bottomHeight": 0.0
+        },
+        {
+          "shape": "conical",
+          "topDiameter": 5.5,
+          "bottomDiameter": 2.33,
+          "topHeight": 11.35,
+          "bottomHeight": 0.8
+        },
+        {
+          "shape": "conical",
+          "bottomDiameter": 5.5,
+          "topDiameter": 5.5,
+          "topHeight": 14.95,
+          "bottomHeight": 11.35
+        }
+      ]
     }
   }
 }