diff --git a/shared-data/pipette/definitions/2/liquid/eight_channel/p1000/default/3_5.json b/shared-data/pipette/definitions/2/liquid/eight_channel/p1000/default/3_5.json
index 95292a3f98b..aa71cb50dfa 100644
--- a/shared-data/pipette/definitions/2/liquid/eight_channel/p1000/default/3_5.json
+++ b/shared-data/pipette/definitions/2/liquid/eight_channel/p1000/default/3_5.json
@@ -1,6 +1,71 @@
 {
   "$otSharedSchema": "#/pipette/schemas/2/pipetteLiquidPropertiesSchema.json",
   "supportedTips": {
+    "t20": {
+      "uiMaxFlowRate": 57,
+      "defaultAspirateFlowRate": {
+        "default": 35,
+        "valuesByApiLevel": { "2.14": 35 }
+      },
+      "defaultDispenseFlowRate": {
+        "default": 57,
+        "valuesByApiLevel": { "2.14": 57 }
+      },
+      "defaultBlowOutFlowRate": {
+        "default": 57,
+        "valuesByApiLevel": { "2.14": 57 }
+      },
+      "defaultFlowAcceleration": 1200.0,
+      "defaultTipLength": 57.9,
+      "defaultReturnTipHeight": 0.71,
+      "aspirate": {
+        "default": {
+          "1": [
+            [0.462, 0.5646, 0.0415],
+            [0.648, 0.3716, 0.1307],
+            [1.032, 0.2742, 0.1938],
+            [1.37, 0.1499, 0.3221],
+            [2.014, 0.1044, 0.3845],
+            [2.772, 0.0432, 0.5076],
+            [3.05, -0.0809, 0.8517],
+            [3.4, 0.0256, 0.5268],
+            [3.962, 0.0612, 0.4057],
+            [4.438, 0.0572, 0.4217],
+            [5.164, 0.018, 0.5955],
+            [5.966, 0.0095, 0.6393],
+            [7.38, 0.0075, 0.6514],
+            [9.128, 0.0049, 0.6705],
+            [10.16, 0.0033, 0.6854],
+            [13.812, 0.0024, 0.6948],
+            [21, 0.0024, 0.6948]
+          ]
+        }
+      },
+      "dispense": {
+        "default": {
+          "1": [
+            [0.462, 0.5646, 0.0415],
+            [0.648, 0.3716, 0.1307],
+            [1.032, 0.2742, 0.1938],
+            [1.37, 0.1499, 0.3221],
+            [2.014, 0.1044, 0.3845],
+            [2.772, 0.0432, 0.5076],
+            [3.05, -0.0809, 0.8517],
+            [3.4, 0.0256, 0.5268],
+            [3.962, 0.0612, 0.4057],
+            [4.438, 0.0572, 0.4217],
+            [5.164, 0.018, 0.5955],
+            [5.966, 0.0095, 0.6393],
+            [7.38, 0.0075, 0.6514],
+            [9.128, 0.0049, 0.6705],
+            [10.16, 0.0033, 0.6854],
+            [13.812, 0.0024, 0.6948],
+            [21, 0.0024, 0.6948]
+          ]
+        }
+      },
+      "defaultPushOutVolume": 2
+    },
     "t50": {
       "uiMaxFlowRate": 802.9,
       "defaultAspirateFlowRate": {
@@ -229,8 +294,10 @@
     "opentrons/opentrons_flex_96_tiprack_1000ul/1",
     "opentrons/opentrons_flex_96_tiprack_200ul/1",
     "opentrons/opentrons_flex_96_tiprack_50ul/1",
+    "opentrons/opentrons_flex_96_tiprack_20ul/1",
     "opentrons/opentrons_flex_96_filtertiprack_1000ul/1",
     "opentrons/opentrons_flex_96_filtertiprack_200ul/1",
-    "opentrons/opentrons_flex_96_filtertiprack_50ul/1"
+    "opentrons/opentrons_flex_96_filtertiprack_50ul/1",
+    "opentrons/opentrons_flex_96_filtertiprack_20ul/1"
   ]
 }
diff --git a/shared-data/pipette/definitions/2/liquid/eight_channel/p50/default/3_5.json b/shared-data/pipette/definitions/2/liquid/eight_channel/p50/default/3_5.json
index caa2de5cb48..0df4e4592da 100644
--- a/shared-data/pipette/definitions/2/liquid/eight_channel/p50/default/3_5.json
+++ b/shared-data/pipette/definitions/2/liquid/eight_channel/p50/default/3_5.json
@@ -1,6 +1,71 @@
 {
   "$otSharedSchema": "#/pipette/schemas/2/pipetteLiquidPropertiesSchema.json",
   "supportedTips": {
+    "t20": {
+      "uiMaxFlowRate": 57,
+      "defaultAspirateFlowRate": {
+        "default": 35,
+        "valuesByApiLevel": { "2.14": 35 }
+      },
+      "defaultDispenseFlowRate": {
+        "default": 57,
+        "valuesByApiLevel": { "2.14": 57 }
+      },
+      "defaultBlowOutFlowRate": {
+        "default": 57,
+        "valuesByApiLevel": { "2.14": 57 }
+      },
+      "defaultFlowAcceleration": 1200.0,
+      "defaultTipLength": 57.9,
+      "defaultReturnTipHeight": 0.71,
+      "aspirate": {
+        "default": {
+          "1": [
+            [0.462, 0.5646, 0.0415],
+            [0.648, 0.3716, 0.1307],
+            [1.032, 0.2742, 0.1938],
+            [1.37, 0.1499, 0.3221],
+            [2.014, 0.1044, 0.3845],
+            [2.772, 0.0432, 0.5076],
+            [3.05, -0.0809, 0.8517],
+            [3.4, 0.0256, 0.5268],
+            [3.962, 0.0612, 0.4057],
+            [4.438, 0.0572, 0.4217],
+            [5.164, 0.018, 0.5955],
+            [5.966, 0.0095, 0.6393],
+            [7.38, 0.0075, 0.6514],
+            [9.128, 0.0049, 0.6705],
+            [10.16, 0.0033, 0.6854],
+            [13.812, 0.0024, 0.6948],
+            [21, 0.0024, 0.6948]
+          ]
+        }
+      },
+      "dispense": {
+        "default": {
+          "1": [
+            [0.462, 0.5646, 0.0415],
+            [0.648, 0.3716, 0.1307],
+            [1.032, 0.2742, 0.1938],
+            [1.37, 0.1499, 0.3221],
+            [2.014, 0.1044, 0.3845],
+            [2.772, 0.0432, 0.5076],
+            [3.05, -0.0809, 0.8517],
+            [3.4, 0.0256, 0.5268],
+            [3.962, 0.0612, 0.4057],
+            [4.438, 0.0572, 0.4217],
+            [5.164, 0.018, 0.5955],
+            [5.966, 0.0095, 0.6393],
+            [7.38, 0.0075, 0.6514],
+            [9.128, 0.0049, 0.6705],
+            [10.16, 0.0033, 0.6854],
+            [13.812, 0.0024, 0.6948],
+            [21, 0.0024, 0.6948]
+          ]
+        }
+      },
+      "defaultPushOutVolume": 2
+    },
     "t50": {
       "uiMaxFlowRate": 57,
       "defaultAspirateFlowRate": {
@@ -85,6 +150,8 @@
   "minVolume": 5,
   "defaultTipracks": [
     "opentrons/opentrons_flex_96_tiprack_50ul/1",
-    "opentrons/opentrons_flex_96_filtertiprack_50ul/1"
+    "opentrons/opentrons_flex_96_tiprack_20ul/1",
+    "opentrons/opentrons_flex_96_filtertiprack_50ul/1",
+    "opentrons/opentrons_flex_96_filtertiprack_20ul/1"
   ]
 }
diff --git a/shared-data/pipette/definitions/2/liquid/eight_channel/p50/lowVolumeDefault/3_5.json b/shared-data/pipette/definitions/2/liquid/eight_channel/p50/lowVolumeDefault/3_5.json
index acffd367df2..25ede5bfc4c 100644
--- a/shared-data/pipette/definitions/2/liquid/eight_channel/p50/lowVolumeDefault/3_5.json
+++ b/shared-data/pipette/definitions/2/liquid/eight_channel/p50/lowVolumeDefault/3_5.json
@@ -1,6 +1,69 @@
 {
   "$otSharedSchema": "#/pipette/schemas/2/pipetteLiquidPropertiesSchema.json",
   "supportedTips": {
+    "t20": {
+      "uiMaxFlowRate": 26.7,
+      "defaultAspirateFlowRate": {
+        "default": 26.7,
+        "valuesByApiLevel": { "2.14": 26.7 }
+      },
+      "defaultDispenseFlowRate": {
+        "default": 26.7,
+        "valuesByApiLevel": { "2.14": 26.7 }
+      },
+      "defaultBlowOutFlowRate": {
+        "default": 26.7,
+        "valuesByApiLevel": { "2.14": 26.7 }
+      },
+      "defaultFlowAcceleration": 1200.0,
+      "defaultTipLength": 57.9,
+      "defaultReturnTipHeight": 0.71,
+      "aspirate": {
+        "default": {
+          "1": [
+            [0.11, 0.207815, 0.040201],
+            [0.65, 0.43933, 0.014735],
+            [1.04, 0.256666, 0.133466],
+            [1.67, 0.147126, 0.247388],
+            [2.45, 0.078774, 0.361536],
+            [2.89, 0.042387, 0.450684],
+            [3.2, 0.014781, 0.530464],
+            [3.79, 0.071819, 0.347944],
+            [4.22, 0.051592, 0.424605],
+            [4.93, 0.021219, 0.552775],
+            [5.81, 0.023461, 0.541725],
+            [7.21, 0.008959, 0.625982],
+            [8.93, 0.005456, 0.651235],
+            [10.0, 0.007108, 0.636489],
+            [13.61, 0.002591, 0.681656],
+            [21.61, 0.002591, 0.681656]
+          ]
+        }
+      },
+      "dispense": {
+        "default": {
+          "1": [
+            [0.11, 0.207815, 0.040201],
+            [0.65, 0.43933, 0.014735],
+            [1.04, 0.256666, 0.133466],
+            [1.67, 0.147126, 0.247388],
+            [2.45, 0.078774, 0.361536],
+            [2.89, 0.042387, 0.450684],
+            [3.2, 0.014781, 0.530464],
+            [3.79, 0.071819, 0.347944],
+            [4.22, 0.051592, 0.424605],
+            [4.93, 0.021219, 0.552775],
+            [5.81, 0.023461, 0.541725],
+            [7.21, 0.008959, 0.625982],
+            [8.93, 0.005456, 0.651235],
+            [10.0, 0.007108, 0.636489],
+            [13.61, 0.002591, 0.681656],
+            [21.61, 0.002591, 0.681656]
+          ]
+        }
+      },
+      "defaultPushOutVolume": 7
+    },
     "t50": {
       "uiMaxFlowRate": 32.6,
       "defaultAspirateFlowRate": {
@@ -83,6 +146,8 @@
   "minVolume": 1,
   "defaultTipracks": [
     "opentrons/opentrons_flex_96_tiprack_50ul/1",
-    "opentrons/opentrons_flex_96_filtertiprack_50ul/1"
+    "opentrons/opentrons_flex_96_tiprack_20ul/1",
+    "opentrons/opentrons_flex_96_filtertiprack_50ul/1",
+    "opentrons/opentrons_flex_96_filtertiprack_20ul/1"
   ]
 }
diff --git a/shared-data/pipette/definitions/2/liquid/ninety_six_channel/p1000/default/3_5.json b/shared-data/pipette/definitions/2/liquid/ninety_six_channel/p1000/default/3_5.json
index 6c490c82962..cafed388a6e 100644
--- a/shared-data/pipette/definitions/2/liquid/ninety_six_channel/p1000/default/3_5.json
+++ b/shared-data/pipette/definitions/2/liquid/ninety_six_channel/p1000/default/3_5.json
@@ -1,6 +1,57 @@
 {
   "$otSharedSchema": "#/pipette/schemas/2/pipetteLiquidPropertiesSchema.json",
   "supportedTips": {
+    "t20": {
+      "uiMaxFlowRate": 189.1,
+      "defaultAspirateFlowRate": {
+        "default": 6,
+        "valuesByApiLevel": { "2.14": 6 }
+      },
+      "defaultDispenseFlowRate": {
+        "default": 6,
+        "valuesByApiLevel": { "2.14": 6 }
+      },
+      "defaultBlowOutFlowRate": {
+        "default": 80,
+        "valuesByApiLevel": { "2.14": 80 }
+      },
+      "defaultFlowAcceleration": 16000.0,
+      "defaultTipLength": 57.9,
+      "defaultReturnTipHeight": 0.6,
+      "aspirate": {
+        "default": {
+          "1": [
+            [1.933333, 2.844459, 4.750159],
+            [2.833333, 1.12901, 8.066694],
+            [3.603333, 0.254744, 10.543779],
+            [4.836667, 1.101839, 7.491414],
+            [5.755, 0.277649, 11.47775],
+            [6.643333, 0.14813, 12.223126],
+            [7.548333, 0.145635, 12.239705],
+            [8.475, 0.15097, 12.199433],
+            [13.02, 0.071736, 12.870946],
+            [22.318333, 0.042305, 13.254131]
+          ]
+        }
+      },
+      "dispense": {
+        "default": {
+          "1": [
+            [1.933333, 2.844459, 4.750159],
+            [2.833333, 1.12901, 8.066694],
+            [3.603333, 0.254744, 10.543779],
+            [4.836667, 1.101839, 7.491414],
+            [5.755, 0.277649, 11.47775],
+            [6.643333, 0.14813, 12.223126],
+            [7.548333, 0.145635, 12.239705],
+            [8.475, 0.15097, 12.199433],
+            [13.02, 0.071736, 12.870946],
+            [22.318333, 0.042305, 13.254131]
+          ]
+        }
+      },
+      "defaultPushOutVolume": 2
+    },
     "t50": {
       "uiMaxFlowRate": 189.1,
       "defaultAspirateFlowRate": {
@@ -178,6 +229,7 @@
   "maxVolume": 1000,
   "minVolume": 5,
   "defaultTipracks": [
+    "opentrons/opentrons_flex_96_tiprack_20ul/1",
     "opentrons/opentrons_flex_96_tiprack_1000ul/1",
     "opentrons/opentrons_flex_96_tiprack_200ul/1",
     "opentrons/opentrons_flex_96_tiprack_50ul/1",
diff --git a/shared-data/pipette/definitions/2/liquid/ninety_six_channel/p1000/default/3_6.json b/shared-data/pipette/definitions/2/liquid/ninety_six_channel/p1000/default/3_6.json
index 43e7cb88798..49d0f5cd34e 100644
--- a/shared-data/pipette/definitions/2/liquid/ninety_six_channel/p1000/default/3_6.json
+++ b/shared-data/pipette/definitions/2/liquid/ninety_six_channel/p1000/default/3_6.json
@@ -1,6 +1,57 @@
 {
   "$otSharedSchema": "#/pipette/schemas/2/pipetteLiquidPropertiesSchema.json",
   "supportedTips": {
+    "t20": {
+      "uiMaxFlowRate": 189.1,
+      "defaultAspirateFlowRate": {
+        "default": 6,
+        "valuesByApiLevel": { "2.14": 6 }
+      },
+      "defaultDispenseFlowRate": {
+        "default": 6,
+        "valuesByApiLevel": { "2.14": 6 }
+      },
+      "defaultBlowOutFlowRate": {
+        "default": 80,
+        "valuesByApiLevel": { "2.14": 80 }
+      },
+      "defaultFlowAcceleration": 16000.0,
+      "defaultTipLength": 57.9,
+      "defaultReturnTipHeight": 0.6,
+      "aspirate": {
+        "default": {
+          "1": [
+            [1.933333, 2.844459, 4.750159],
+            [2.833333, 1.12901, 8.066694],
+            [3.603333, 0.254744, 10.543779],
+            [4.836667, 1.101839, 7.491414],
+            [5.755, 0.277649, 11.47775],
+            [6.643333, 0.14813, 12.223126],
+            [7.548333, 0.145635, 12.239705],
+            [8.475, 0.15097, 12.199433],
+            [13.02, 0.071736, 12.870946],
+            [22.318333, 0.042305, 13.254131]
+          ]
+        }
+      },
+      "dispense": {
+        "default": {
+          "1": [
+            [1.933333, 2.844459, 4.750159],
+            [2.833333, 1.12901, 8.066694],
+            [3.603333, 0.254744, 10.543779],
+            [4.836667, 1.101839, 7.491414],
+            [5.755, 0.277649, 11.47775],
+            [6.643333, 0.14813, 12.223126],
+            [7.548333, 0.145635, 12.239705],
+            [8.475, 0.15097, 12.199433],
+            [13.02, 0.071736, 12.870946],
+            [22.318333, 0.042305, 13.254131]
+          ]
+        }
+      },
+      "defaultPushOutVolume": 2
+    },
     "t50": {
       "uiMaxFlowRate": 194,
       "defaultAspirateFlowRate": {
@@ -181,6 +232,7 @@
     "opentrons/opentrons_flex_96_tiprack_1000ul/1",
     "opentrons/opentrons_flex_96_tiprack_200ul/1",
     "opentrons/opentrons_flex_96_tiprack_50ul/1",
+    "opentrons/opentrons_flex_96_tiprack_20ul/1",
     "opentrons/opentrons_flex_96_filtertiprack_1000ul/1",
     "opentrons/opentrons_flex_96_filtertiprack_200ul/1",
     "opentrons/opentrons_flex_96_filtertiprack_50ul/1"
diff --git a/shared-data/pipette/definitions/2/liquid/ninety_six_channel/p200/default/3_0.json b/shared-data/pipette/definitions/2/liquid/ninety_six_channel/p200/default/3_0.json
index ef067186a90..863201499d9 100644
--- a/shared-data/pipette/definitions/2/liquid/ninety_six_channel/p200/default/3_0.json
+++ b/shared-data/pipette/definitions/2/liquid/ninety_six_channel/p200/default/3_0.json
@@ -1,6 +1,57 @@
 {
   "$otSharedSchema": "#/pipette/schemas/2/pipetteLiquidPropertiesSchema.json",
   "supportedTips": {
+    "t20": {
+      "uiMaxFlowRate": 189.1,
+      "defaultAspirateFlowRate": {
+        "default": 6,
+        "valuesByApiLevel": { "2.14": 6 }
+      },
+      "defaultDispenseFlowRate": {
+        "default": 6,
+        "valuesByApiLevel": { "2.14": 6 }
+      },
+      "defaultBlowOutFlowRate": {
+        "default": 80,
+        "valuesByApiLevel": { "2.14": 80 }
+      },
+      "defaultFlowAcceleration": 16000.0,
+      "defaultTipLength": 57.9,
+      "defaultReturnTipHeight": 0.6,
+      "aspirate": {
+        "default": {
+          "1": [
+            [1.933333, 2.844459, 4.750159],
+            [2.833333, 1.12901, 8.066694],
+            [3.603333, 0.254744, 10.543779],
+            [4.836667, 1.101839, 7.491414],
+            [5.755, 0.277649, 11.47775],
+            [6.643333, 0.14813, 12.223126],
+            [7.548333, 0.145635, 12.239705],
+            [8.475, 0.15097, 12.199433],
+            [13.02, 0.071736, 12.870946],
+            [22.318333, 0.042305, 13.254131]
+          ]
+        }
+      },
+      "dispense": {
+        "default": {
+          "1": [
+            [1.933333, 2.844459, 4.750159],
+            [2.833333, 1.12901, 8.066694],
+            [3.603333, 0.254744, 10.543779],
+            [4.836667, 1.101839, 7.491414],
+            [5.755, 0.277649, 11.47775],
+            [6.643333, 0.14813, 12.223126],
+            [7.548333, 0.145635, 12.239705],
+            [8.475, 0.15097, 12.199433],
+            [13.02, 0.071736, 12.870946],
+            [22.318333, 0.042305, 13.254131]
+          ]
+        }
+      },
+      "defaultPushOutVolume": 2
+    },
     "t50": {
       "uiMaxFlowRate": 194,
       "defaultAspirateFlowRate": {
@@ -115,7 +166,9 @@
   "defaultTipracks": [
     "opentrons/opentrons_flex_96_tiprack_200ul/1",
     "opentrons/opentrons_flex_96_tiprack_50ul/1",
+    "opentrons/opentrons_flex_96_tiprack_20ul/1",
     "opentrons/opentrons_flex_96_filtertiprack_200ul/1",
-    "opentrons/opentrons_flex_96_filtertiprack_50ul/1"
+    "opentrons/opentrons_flex_96_filtertiprack_50ul/1",
+    "opentrons/opentrons_flex_96_filtertiprack_20ul/1"
   ]
 }
diff --git a/shared-data/pipette/definitions/2/liquid/single_channel/p1000/default/3_5.json b/shared-data/pipette/definitions/2/liquid/single_channel/p1000/default/3_5.json
index 8a322ace79b..03ae2fbb163 100644
--- a/shared-data/pipette/definitions/2/liquid/single_channel/p1000/default/3_5.json
+++ b/shared-data/pipette/definitions/2/liquid/single_channel/p1000/default/3_5.json
@@ -1,6 +1,71 @@
 {
   "$otSharedSchema": "#/pipette/schemas/2/pipetteLiquidPropertiesSchema.json",
   "supportedTips": {
+    "t20": {
+      "uiMaxFlowRate": 57,
+      "defaultAspirateFlowRate": {
+        "default": 35,
+        "valuesByApiLevel": { "2.14": 35 }
+      },
+      "defaultDispenseFlowRate": {
+        "default": 57,
+        "valuesByApiLevel": { "2.14": 57 }
+      },
+      "defaultBlowOutFlowRate": {
+        "default": 57,
+        "valuesByApiLevel": { "2.14": 57 }
+      },
+      "defaultFlowAcceleration": 1200.0,
+      "defaultTipLength": 57.9,
+      "defaultReturnTipHeight": 0.71,
+      "aspirate": {
+        "default": {
+          "1": [
+            [0.462, 0.5646, 0.0415],
+            [0.648, 0.3716, 0.1307],
+            [1.032, 0.2742, 0.1938],
+            [1.37, 0.1499, 0.3221],
+            [2.014, 0.1044, 0.3845],
+            [2.772, 0.0432, 0.5076],
+            [3.05, -0.0809, 0.8517],
+            [3.4, 0.0256, 0.5268],
+            [3.962, 0.0612, 0.4057],
+            [4.438, 0.0572, 0.4217],
+            [5.164, 0.018, 0.5955],
+            [5.966, 0.0095, 0.6393],
+            [7.38, 0.0075, 0.6514],
+            [9.128, 0.0049, 0.6705],
+            [10.16, 0.0033, 0.6854],
+            [13.812, 0.0024, 0.6948],
+            [21, 0.0024, 0.6948]
+          ]
+        }
+      },
+      "dispense": {
+        "default": {
+          "1": [
+            [0.462, 0.5646, 0.0415],
+            [0.648, 0.3716, 0.1307],
+            [1.032, 0.2742, 0.1938],
+            [1.37, 0.1499, 0.3221],
+            [2.014, 0.1044, 0.3845],
+            [2.772, 0.0432, 0.5076],
+            [3.05, -0.0809, 0.8517],
+            [3.4, 0.0256, 0.5268],
+            [3.962, 0.0612, 0.4057],
+            [4.438, 0.0572, 0.4217],
+            [5.164, 0.018, 0.5955],
+            [5.966, 0.0095, 0.6393],
+            [7.38, 0.0075, 0.6514],
+            [9.128, 0.0049, 0.6705],
+            [10.16, 0.0033, 0.6854],
+            [13.812, 0.0024, 0.6948],
+            [21, 0.0024, 0.6948]
+          ]
+        }
+      },
+      "defaultPushOutVolume": 2
+    },
     "t50": {
       "uiMaxFlowRate": 785.2,
       "defaultAspirateFlowRate": {
@@ -197,8 +262,10 @@
     "opentrons/opentrons_flex_96_tiprack_1000ul/1",
     "opentrons/opentrons_flex_96_tiprack_200ul/1",
     "opentrons/opentrons_flex_96_tiprack_50ul/1",
+    "opentrons/opentrons_flex_96_tiprack_20ul/1",
     "opentrons/opentrons_flex_96_filtertiprack_1000ul/1",
     "opentrons/opentrons_flex_96_filtertiprack_200ul/1",
-    "opentrons/opentrons_flex_96_filtertiprack_50ul/1"
+    "opentrons/opentrons_flex_96_filtertiprack_50ul/1",
+    "opentrons/opentrons_flex_96_filtertiprack_20ul/1"
   ]
 }
diff --git a/shared-data/pipette/definitions/2/liquid/single_channel/p1000/default/3_6.json b/shared-data/pipette/definitions/2/liquid/single_channel/p1000/default/3_6.json
index 5f49411d926..dd1d1b3dc9e 100644
--- a/shared-data/pipette/definitions/2/liquid/single_channel/p1000/default/3_6.json
+++ b/shared-data/pipette/definitions/2/liquid/single_channel/p1000/default/3_6.json
@@ -1,6 +1,71 @@
 {
   "$otSharedSchema": "#/pipette/schemas/2/pipetteLiquidPropertiesSchema.json",
   "supportedTips": {
+    "t20": {
+      "uiMaxFlowRate": 57,
+      "defaultAspirateFlowRate": {
+        "default": 35,
+        "valuesByApiLevel": { "2.14": 35 }
+      },
+      "defaultDispenseFlowRate": {
+        "default": 57,
+        "valuesByApiLevel": { "2.14": 57 }
+      },
+      "defaultBlowOutFlowRate": {
+        "default": 57,
+        "valuesByApiLevel": { "2.14": 57 }
+      },
+      "defaultFlowAcceleration": 1200.0,
+      "defaultTipLength": 57.9,
+      "defaultReturnTipHeight": 0.71,
+      "aspirate": {
+        "default": {
+          "1": [
+            [0.462, 0.5646, 0.0415],
+            [0.648, 0.3716, 0.1307],
+            [1.032, 0.2742, 0.1938],
+            [1.37, 0.1499, 0.3221],
+            [2.014, 0.1044, 0.3845],
+            [2.772, 0.0432, 0.5076],
+            [3.05, -0.0809, 0.8517],
+            [3.4, 0.0256, 0.5268],
+            [3.962, 0.0612, 0.4057],
+            [4.438, 0.0572, 0.4217],
+            [5.164, 0.018, 0.5955],
+            [5.966, 0.0095, 0.6393],
+            [7.38, 0.0075, 0.6514],
+            [9.128, 0.0049, 0.6705],
+            [10.16, 0.0033, 0.6854],
+            [13.812, 0.0024, 0.6948],
+            [21, 0.0024, 0.6948]
+          ]
+        }
+      },
+      "dispense": {
+        "default": {
+          "1": [
+            [0.462, 0.5646, 0.0415],
+            [0.648, 0.3716, 0.1307],
+            [1.032, 0.2742, 0.1938],
+            [1.37, 0.1499, 0.3221],
+            [2.014, 0.1044, 0.3845],
+            [2.772, 0.0432, 0.5076],
+            [3.05, -0.0809, 0.8517],
+            [3.4, 0.0256, 0.5268],
+            [3.962, 0.0612, 0.4057],
+            [4.438, 0.0572, 0.4217],
+            [5.164, 0.018, 0.5955],
+            [5.966, 0.0095, 0.6393],
+            [7.38, 0.0075, 0.6514],
+            [9.128, 0.0049, 0.6705],
+            [10.16, 0.0033, 0.6854],
+            [13.812, 0.0024, 0.6948],
+            [21, 0.0024, 0.6948]
+          ]
+        }
+      },
+      "defaultPushOutVolume": 2
+    },
     "t50": {
       "uiMaxFlowRate": 785.2,
       "defaultAspirateFlowRate": {
@@ -197,8 +262,10 @@
     "opentrons/opentrons_flex_96_tiprack_1000ul/1",
     "opentrons/opentrons_flex_96_tiprack_200ul/1",
     "opentrons/opentrons_flex_96_tiprack_50ul/1",
+    "opentrons/opentrons_flex_96_tiprack_20ul/1",
     "opentrons/opentrons_flex_96_filtertiprack_1000ul/1",
     "opentrons/opentrons_flex_96_filtertiprack_200ul/1",
-    "opentrons/opentrons_flex_96_filtertiprack_50ul/1"
+    "opentrons/opentrons_flex_96_filtertiprack_50ul/1",
+    "opentrons/opentrons_flex_96_filtertiprack_20ul/1"
   ]
 }
diff --git a/shared-data/pipette/definitions/2/liquid/single_channel/p1000/default/3_7.json b/shared-data/pipette/definitions/2/liquid/single_channel/p1000/default/3_7.json
index 5f49411d926..dd1d1b3dc9e 100644
--- a/shared-data/pipette/definitions/2/liquid/single_channel/p1000/default/3_7.json
+++ b/shared-data/pipette/definitions/2/liquid/single_channel/p1000/default/3_7.json
@@ -1,6 +1,71 @@
 {
   "$otSharedSchema": "#/pipette/schemas/2/pipetteLiquidPropertiesSchema.json",
   "supportedTips": {
+    "t20": {
+      "uiMaxFlowRate": 57,
+      "defaultAspirateFlowRate": {
+        "default": 35,
+        "valuesByApiLevel": { "2.14": 35 }
+      },
+      "defaultDispenseFlowRate": {
+        "default": 57,
+        "valuesByApiLevel": { "2.14": 57 }
+      },
+      "defaultBlowOutFlowRate": {
+        "default": 57,
+        "valuesByApiLevel": { "2.14": 57 }
+      },
+      "defaultFlowAcceleration": 1200.0,
+      "defaultTipLength": 57.9,
+      "defaultReturnTipHeight": 0.71,
+      "aspirate": {
+        "default": {
+          "1": [
+            [0.462, 0.5646, 0.0415],
+            [0.648, 0.3716, 0.1307],
+            [1.032, 0.2742, 0.1938],
+            [1.37, 0.1499, 0.3221],
+            [2.014, 0.1044, 0.3845],
+            [2.772, 0.0432, 0.5076],
+            [3.05, -0.0809, 0.8517],
+            [3.4, 0.0256, 0.5268],
+            [3.962, 0.0612, 0.4057],
+            [4.438, 0.0572, 0.4217],
+            [5.164, 0.018, 0.5955],
+            [5.966, 0.0095, 0.6393],
+            [7.38, 0.0075, 0.6514],
+            [9.128, 0.0049, 0.6705],
+            [10.16, 0.0033, 0.6854],
+            [13.812, 0.0024, 0.6948],
+            [21, 0.0024, 0.6948]
+          ]
+        }
+      },
+      "dispense": {
+        "default": {
+          "1": [
+            [0.462, 0.5646, 0.0415],
+            [0.648, 0.3716, 0.1307],
+            [1.032, 0.2742, 0.1938],
+            [1.37, 0.1499, 0.3221],
+            [2.014, 0.1044, 0.3845],
+            [2.772, 0.0432, 0.5076],
+            [3.05, -0.0809, 0.8517],
+            [3.4, 0.0256, 0.5268],
+            [3.962, 0.0612, 0.4057],
+            [4.438, 0.0572, 0.4217],
+            [5.164, 0.018, 0.5955],
+            [5.966, 0.0095, 0.6393],
+            [7.38, 0.0075, 0.6514],
+            [9.128, 0.0049, 0.6705],
+            [10.16, 0.0033, 0.6854],
+            [13.812, 0.0024, 0.6948],
+            [21, 0.0024, 0.6948]
+          ]
+        }
+      },
+      "defaultPushOutVolume": 2
+    },
     "t50": {
       "uiMaxFlowRate": 785.2,
       "defaultAspirateFlowRate": {
@@ -197,8 +262,10 @@
     "opentrons/opentrons_flex_96_tiprack_1000ul/1",
     "opentrons/opentrons_flex_96_tiprack_200ul/1",
     "opentrons/opentrons_flex_96_tiprack_50ul/1",
+    "opentrons/opentrons_flex_96_tiprack_20ul/1",
     "opentrons/opentrons_flex_96_filtertiprack_1000ul/1",
     "opentrons/opentrons_flex_96_filtertiprack_200ul/1",
-    "opentrons/opentrons_flex_96_filtertiprack_50ul/1"
+    "opentrons/opentrons_flex_96_filtertiprack_50ul/1",
+    "opentrons/opentrons_flex_96_filtertiprack_20ul/1"
   ]
 }
diff --git a/shared-data/pipette/definitions/2/liquid/single_channel/p50/default/3_5.json b/shared-data/pipette/definitions/2/liquid/single_channel/p50/default/3_5.json
index 7fe702bc97d..7c18c721aa9 100644
--- a/shared-data/pipette/definitions/2/liquid/single_channel/p50/default/3_5.json
+++ b/shared-data/pipette/definitions/2/liquid/single_channel/p50/default/3_5.json
@@ -1,7 +1,7 @@
 {
   "$otSharedSchema": "#/pipette/schemas/2/pipetteLiquidPropertiesSchema.json",
   "supportedTips": {
-    "t50": {
+    "t20": {
       "uiMaxFlowRate": 57,
       "defaultAspirateFlowRate": {
         "default": 35,
@@ -17,7 +17,7 @@
       },
       "defaultFlowAcceleration": 1200.0,
       "defaultTipLength": 57.9,
-      "defaultReturnTipHeight": 0.71,
+      "defaultReturnTipHeight": 0.2,
       "aspirate": {
         "default": {
           "1": [
@@ -37,9 +37,7 @@
             [9.128, 0.0049, 0.6705],
             [10.16, 0.0033, 0.6854],
             [13.812, 0.0024, 0.6948],
-            [27.204, 0.0008, 0.7165],
-            [50.614, 0.0002, 0.7328],
-            [53.046, -0.0005, 0.7676]
+            [21, 0.0024, 0.6948]
           ]
         }
       },
@@ -62,9 +60,76 @@
             [9.128, 0.0049, 0.6705],
             [10.16, 0.0033, 0.6854],
             [13.812, 0.0024, 0.6948],
-            [27.204, 0.0008, 0.7165],
-            [50.614, 0.0002, 0.7328],
-            [53.046, -0.0005, 0.7676]
+            [21, 0.0024, 0.6948]
+          ]
+        }
+      },
+      "defaultPushOutVolume": 2
+    },
+    "t50": {
+      "uiMaxFlowRate": 57,
+      "defaultAspirateFlowRate": {
+        "default": 35,
+        "valuesByApiLevel": { "2.14": 35 }
+      },
+      "defaultDispenseFlowRate": {
+        "default": 57,
+        "valuesByApiLevel": { "2.14": 57 }
+      },
+      "defaultBlowOutFlowRate": {
+        "default": 57,
+        "valuesByApiLevel": { "2.14": 57 }
+      },
+      "defaultFlowAcceleration": 1200.0,
+      "defaultTipLength": 57.9,
+      "defaultReturnTipHeight": 0.71,
+      "aspirate": {
+        "default": {
+          "1": [
+            [0.410909, 0.493556, 0.066133],
+            [0.596364, 0.393336, 0.107314],
+            [0.977273, 0.287768, 0.170271],
+            [1.332727, 0.173299, 0.282139],
+            [1.943636, 0.099498, 0.380495],
+            [2.704545, 0.050285, 0.476146],
+            [3.024545, -0.038371, 0.715922],
+            [3.313636, -0.005484, 0.616454],
+            [3.926364, 0.072085, 0.359418],
+            [4.257273, 0.016758, 0.576653],
+            [4.992727, 0.024144, 0.545207],
+            [5.83, 0.017456, 0.5786],
+            [7.226364, 0.008433, 0.631202],
+            [9.033636, 0.00882, 0.628403],
+            [10.071818, 0.004396, 0.668375],
+            [13.759091, 0.003288, 0.679527],
+            [27.283636, 0.001159, 0.708828],
+            [50.902727, 0.000289, 0.732565],
+            [53.340909, -0.000532, 0.77433]
+          ]
+        }
+      },
+      "dispense": {
+        "default": {
+          "1": [
+            [0.410909, 0.493556, 0.066133],
+            [0.596364, 0.393336, 0.107314],
+            [0.977273, 0.287768, 0.170271],
+            [1.332727, 0.173299, 0.282139],
+            [1.943636, 0.099498, 0.380495],
+            [2.704545, 0.050285, 0.476146],
+            [3.024545, -0.038371, 0.715922],
+            [3.313636, -0.005484, 0.616454],
+            [3.926364, 0.072085, 0.359418],
+            [4.257273, 0.016758, 0.576653],
+            [4.992727, 0.024144, 0.545207],
+            [5.83, 0.017456, 0.5786],
+            [7.226364, 0.008433, 0.631202],
+            [9.033636, 0.00882, 0.628403],
+            [10.071818, 0.004396, 0.668375],
+            [13.759091, 0.003288, 0.679527],
+            [27.283636, 0.001159, 0.708828],
+            [50.902727, 0.000289, 0.732565],
+            [53.340909, -0.000532, 0.77433]
           ]
         }
       },
@@ -75,6 +140,8 @@
   "minVolume": 5,
   "defaultTipracks": [
     "opentrons/opentrons_flex_96_tiprack_50ul/1",
-    "opentrons/opentrons_flex_96_filtertiprack_50ul/1"
+    "opentrons/opentrons_flex_96_filtertiprack_50ul/1",
+    "opentrons/opentrons_flex_96_tiprack_20ul/1",
+    "opentrons/opentrons_flex_96_filtertiprack_20ul/1"
   ]
 }
diff --git a/shared-data/pipette/definitions/2/liquid/single_channel/p50/default/3_6.json b/shared-data/pipette/definitions/2/liquid/single_channel/p50/default/3_6.json
index 474bfca8df5..1514f24d191 100644
--- a/shared-data/pipette/definitions/2/liquid/single_channel/p50/default/3_6.json
+++ b/shared-data/pipette/definitions/2/liquid/single_channel/p50/default/3_6.json
@@ -1,6 +1,71 @@
 {
   "$otSharedSchema": "#/pipette/schemas/2/pipetteLiquidPropertiesSchema.json",
   "supportedTips": {
+    "t20": {
+      "uiMaxFlowRate": 57,
+      "defaultAspirateFlowRate": {
+        "default": 35,
+        "valuesByApiLevel": { "2.14": 35 }
+      },
+      "defaultDispenseFlowRate": {
+        "default": 57,
+        "valuesByApiLevel": { "2.14": 57 }
+      },
+      "defaultBlowOutFlowRate": {
+        "default": 57,
+        "valuesByApiLevel": { "2.14": 57 }
+      },
+      "defaultFlowAcceleration": 1200.0,
+      "defaultTipLength": 57.9,
+      "defaultReturnTipHeight": 0.71,
+      "aspirate": {
+        "default": {
+          "1": [
+            [0.462, 0.5646, 0.0415],
+            [0.648, 0.3716, 0.1307],
+            [1.032, 0.2742, 0.1938],
+            [1.37, 0.1499, 0.3221],
+            [2.014, 0.1044, 0.3845],
+            [2.772, 0.0432, 0.5076],
+            [3.05, -0.0809, 0.8517],
+            [3.4, 0.0256, 0.5268],
+            [3.962, 0.0612, 0.4057],
+            [4.438, 0.0572, 0.4217],
+            [5.164, 0.018, 0.5955],
+            [5.966, 0.0095, 0.6393],
+            [7.38, 0.0075, 0.6514],
+            [9.128, 0.0049, 0.6705],
+            [10.16, 0.0033, 0.6854],
+            [13.812, 0.0024, 0.6948],
+            [21, 0.0024, 0.6948]
+          ]
+        }
+      },
+      "dispense": {
+        "default": {
+          "1": [
+            [0.462, 0.5646, 0.0415],
+            [0.648, 0.3716, 0.1307],
+            [1.032, 0.2742, 0.1938],
+            [1.37, 0.1499, 0.3221],
+            [2.014, 0.1044, 0.3845],
+            [2.772, 0.0432, 0.5076],
+            [3.05, -0.0809, 0.8517],
+            [3.4, 0.0256, 0.5268],
+            [3.962, 0.0612, 0.4057],
+            [4.438, 0.0572, 0.4217],
+            [5.164, 0.018, 0.5955],
+            [5.966, 0.0095, 0.6393],
+            [7.38, 0.0075, 0.6514],
+            [9.128, 0.0049, 0.6705],
+            [10.16, 0.0033, 0.6854],
+            [13.812, 0.0024, 0.6948],
+            [21, 0.0024, 0.6948]
+          ]
+        }
+      },
+      "defaultPushOutVolume": 2
+    },
     "t50": {
       "uiMaxFlowRate": 57,
       "defaultAspirateFlowRate": {
@@ -75,6 +140,8 @@
   "minVolume": 5,
   "defaultTipracks": [
     "opentrons/opentrons_flex_96_tiprack_50ul/1",
-    "opentrons/opentrons_flex_96_filtertiprack_50ul/1"
+    "opentrons/opentrons_flex_96_filtertiprack_50ul/1",
+    "opentrons/opentrons_flex_96_tiprack_20ul/1",
+    "opentrons/opentrons_flex_96_filtertiprack_20ul/1"
   ]
 }
diff --git a/shared-data/pipette/definitions/2/liquid/single_channel/p50/lowVolumeDefault/3_5.json b/shared-data/pipette/definitions/2/liquid/single_channel/p50/lowVolumeDefault/3_5.json
index 33e1410ce99..d541fd3aecf 100644
--- a/shared-data/pipette/definitions/2/liquid/single_channel/p50/lowVolumeDefault/3_5.json
+++ b/shared-data/pipette/definitions/2/liquid/single_channel/p50/lowVolumeDefault/3_5.json
@@ -1,7 +1,7 @@
 {
   "$otSharedSchema": "#/pipette/schemas/2/pipetteLiquidPropertiesSchema.json",
   "supportedTips": {
-    "t50": {
+    "t20": {
       "uiMaxFlowRate": 26.7,
       "defaultAspirateFlowRate": {
         "default": 26.7,
@@ -36,8 +36,7 @@
             [8.93, 0.005456, 0.651235],
             [10.0, 0.007108, 0.636489],
             [13.61, 0.002591, 0.681656],
-            [26.99, 0.001163, 0.701094],
-            [45.25, 0.000207, 0.726887]
+            [21.61, 0.002591, 0.681656]
           ]
         }
       },
@@ -59,8 +58,74 @@
             [8.93, 0.005456, 0.651235],
             [10.0, 0.007108, 0.636489],
             [13.61, 0.002591, 0.681656],
-            [26.99, 0.001163, 0.701094],
-            [45.25, 0.000207, 0.726887]
+            [21.61, 0.002591, 0.681656]
+          ]
+        }
+      },
+      "defaultPushOutVolume": 7
+    },
+    "t50": {
+      "uiMaxFlowRate": 26.7,
+      "defaultAspirateFlowRate": {
+        "default": 26.7,
+        "valuesByApiLevel": { "2.14": 26.7 }
+      },
+      "defaultDispenseFlowRate": {
+        "default": 26.7,
+        "valuesByApiLevel": { "2.14": 26.7 }
+      },
+      "defaultBlowOutFlowRate": {
+        "default": 26.7,
+        "valuesByApiLevel": { "2.14": 26.7 }
+      },
+      "defaultFlowAcceleration": 1200.0,
+      "defaultTipLength": 57.9,
+      "defaultReturnTipHeight": 0.71,
+      "aspirate": {
+        "default": {
+          "1": [
+            [0.4, 0.507042, 0.058982],
+            [0.593, 0.404962, 0.099815],
+            [0.966, 0.285078, 0.170906],
+            [1.326, 0.178383, 0.273973],
+            [1.947, 0.103651, 0.373068],
+            [2.72, 0.052739, 0.472193],
+            [3.045, -0.036061, 0.71373],
+            [3.369, 0.013437, 0.563006],
+            [3.972, 0.069054, 0.375634],
+            [4.386, 0.042685, 0.480373],
+            [5.089, 0.015649, 0.598954],
+            [5.944, 0.01764, 0.588822],
+            [7.342, 0.006829, 0.653077],
+            [9.094, 0.005478, 0.663002],
+            [10.145, 0.004767, 0.669464],
+            [13.84, 0.003034, 0.687049],
+            [27.343, 0.000964, 0.715687],
+            [45.875, 0.000236, 0.735607]
+          ]
+        }
+      },
+      "dispense": {
+        "default": {
+          "1": [
+            [0.4, 0.507042, 0.058982],
+            [0.593, 0.404962, 0.099815],
+            [0.966, 0.285078, 0.170906],
+            [1.326, 0.178383, 0.273973],
+            [1.947, 0.103651, 0.373068],
+            [2.72, 0.052739, 0.472193],
+            [3.045, -0.036061, 0.71373],
+            [3.369, 0.013437, 0.563006],
+            [3.972, 0.069054, 0.375634],
+            [4.386, 0.042685, 0.480373],
+            [5.089, 0.015649, 0.598954],
+            [5.944, 0.01764, 0.588822],
+            [7.342, 0.006829, 0.653077],
+            [9.094, 0.005478, 0.663002],
+            [10.145, 0.004767, 0.669464],
+            [13.84, 0.003034, 0.687049],
+            [27.343, 0.000964, 0.715687],
+            [45.875, 0.000236, 0.735607]
           ]
         }
       },
@@ -71,6 +136,8 @@
   "minVolume": 1,
   "defaultTipracks": [
     "opentrons/opentrons_flex_96_tiprack_50ul/1",
-    "opentrons/opentrons_flex_96_filtertiprack_50ul/1"
+    "opentrons/opentrons_flex_96_filtertiprack_50ul/1",
+    "opentrons/opentrons_flex_96_tiprack_20ul/1",
+    "opentrons/opentrons_flex_96_filtertiprack_20ul/1"
   ]
 }
diff --git a/shared-data/pipette/definitions/2/liquid/single_channel/p50/lowVolumeDefault/3_6.json b/shared-data/pipette/definitions/2/liquid/single_channel/p50/lowVolumeDefault/3_6.json
index e27cb962b70..d508e1cce8d 100644
--- a/shared-data/pipette/definitions/2/liquid/single_channel/p50/lowVolumeDefault/3_6.json
+++ b/shared-data/pipette/definitions/2/liquid/single_channel/p50/lowVolumeDefault/3_6.json
@@ -1,6 +1,69 @@
 {
   "$otSharedSchema": "#/pipette/schemas/2/pipetteLiquidPropertiesSchema.json",
   "supportedTips": {
+    "t20": {
+      "uiMaxFlowRate": 26.7,
+      "defaultAspirateFlowRate": {
+        "default": 26.7,
+        "valuesByApiLevel": { "2.14": 26.7 }
+      },
+      "defaultDispenseFlowRate": {
+        "default": 26.7,
+        "valuesByApiLevel": { "2.14": 26.7 }
+      },
+      "defaultBlowOutFlowRate": {
+        "default": 26.7,
+        "valuesByApiLevel": { "2.14": 26.7 }
+      },
+      "defaultFlowAcceleration": 1200.0,
+      "defaultTipLength": 57.9,
+      "defaultReturnTipHeight": 0.71,
+      "aspirate": {
+        "default": {
+          "1": [
+            [0.11, 0.207815, 0.040201],
+            [0.65, 0.43933, 0.014735],
+            [1.04, 0.256666, 0.133466],
+            [1.67, 0.147126, 0.247388],
+            [2.45, 0.078774, 0.361536],
+            [2.89, 0.042387, 0.450684],
+            [3.2, 0.014781, 0.530464],
+            [3.79, 0.071819, 0.347944],
+            [4.22, 0.051592, 0.424605],
+            [4.93, 0.021219, 0.552775],
+            [5.81, 0.023461, 0.541725],
+            [7.21, 0.008959, 0.625982],
+            [8.93, 0.005456, 0.651235],
+            [10.0, 0.007108, 0.636489],
+            [13.61, 0.002591, 0.681656],
+            [21.61, 0.002591, 0.681656]
+          ]
+        }
+      },
+      "dispense": {
+        "default": {
+          "1": [
+            [0.11, 0.207815, 0.040201],
+            [0.65, 0.43933, 0.014735],
+            [1.04, 0.256666, 0.133466],
+            [1.67, 0.147126, 0.247388],
+            [2.45, 0.078774, 0.361536],
+            [2.89, 0.042387, 0.450684],
+            [3.2, 0.014781, 0.530464],
+            [3.79, 0.071819, 0.347944],
+            [4.22, 0.051592, 0.424605],
+            [4.93, 0.021219, 0.552775],
+            [5.81, 0.023461, 0.541725],
+            [7.21, 0.008959, 0.625982],
+            [8.93, 0.005456, 0.651235],
+            [10.0, 0.007108, 0.636489],
+            [13.61, 0.002591, 0.681656],
+            [21.61, 0.002591, 0.681656]
+          ]
+        }
+      },
+      "defaultPushOutVolume": 7
+    },
     "t50": {
       "uiMaxFlowRate": 26.7,
       "defaultAspirateFlowRate": {
@@ -73,6 +136,8 @@
   "minVolume": 1,
   "defaultTipracks": [
     "opentrons/opentrons_flex_96_tiprack_50ul/1",
-    "opentrons/opentrons_flex_96_filtertiprack_50ul/1"
+    "opentrons/opentrons_flex_96_filtertiprack_50ul/1",
+    "opentrons/opentrons_flex_96_tiprack_20ul/1",
+    "opentrons/opentrons_flex_96_filtertiprack_20ul/1"
   ]
 }