diff --git a/.changeset/config.json b/.changeset/config.json
index bc9a7d413..4f393048f 100644
--- a/.changeset/config.json
+++ b/.changeset/config.json
@@ -4,7 +4,7 @@
   "commit": false,
   "linked": [],
   "access": "public",
-  "baseBranch": "master",
+  "baseBranch": "main",
   "updateInternalDependencies": "patch",
   "ignore": []
 }
diff --git a/.changeset/fuzzy-steaks-admire.md b/.changeset/fuzzy-steaks-admire.md
new file mode 100644
index 000000000..df4384547
--- /dev/null
+++ b/.changeset/fuzzy-steaks-admire.md
@@ -0,0 +1,5 @@
+---
+'formik': patch
+---
+
+Forward `className` for custom components used with `Field` 41720c2
diff --git a/.changeset/mighty-colts-compare.md b/.changeset/mighty-colts-compare.md
new file mode 100644
index 000000000..81fb29e13
--- /dev/null
+++ b/.changeset/mighty-colts-compare.md
@@ -0,0 +1,5 @@
+---
+'formik': patch
+---
+
+Remove use of deprecated `StatelessComponent` type in favor of `FunctionComponent` (da58b29)