diff --git a/.mailmap b/.mailmap
new file mode 100644
index 000000000..d2551f55b
--- /dev/null
+++ b/.mailmap
@@ -0,0 +1,2 @@
+Arnav Singh <me@arnavion.dev>
+Arnav Singh <me@arnavion.dev> <arnavion@gmail.com>
diff --git a/Cargo.toml b/Cargo.toml
index 61be511a0..cd5a25cec 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -2,7 +2,7 @@
 name = "k8s-openapi"
 version = "0.19.0"
 license = "Apache-2.0"
-authors = ["Arnavion <me@arnavion.dev>"]
+authors = ["Arnav Singh <me@arnavion.dev>"]
 categories = ["api-bindings", "web-programming::http-client"]
 description = "Bindings for the Kubernetes client API"
 documentation = "https://arnavion.github.io/k8s-openapi/v0.19.x/k8s_openapi/"
diff --git a/k8s-openapi-codegen-common/Cargo.toml b/k8s-openapi-codegen-common/Cargo.toml
index a43d68dd0..55182f670 100644
--- a/k8s-openapi-codegen-common/Cargo.toml
+++ b/k8s-openapi-codegen-common/Cargo.toml
@@ -2,7 +2,7 @@
 name = "k8s-openapi-codegen-common"
 version = "0.19.0"
 license = "Apache-2.0"
-authors = ["Arnavion <me@arnavion.dev>"]
+authors = ["Arnav Singh <me@arnavion.dev>"]
 categories = ["api-bindings", "web-programming::http-client"]
 description = "Common code for the k8s-openapi code generator and k8s-openapi-derive"
 documentation = "https://arnavion.github.io/k8s-openapi/v0.19.x/k8s_openapi_codegen_common/"
diff --git a/k8s-openapi-codegen/Cargo.toml b/k8s-openapi-codegen/Cargo.toml
index 96e3df88d..9676a8bb1 100644
--- a/k8s-openapi-codegen/Cargo.toml
+++ b/k8s-openapi-codegen/Cargo.toml
@@ -1,9 +1,10 @@
 [package]
 name = "k8s-openapi-codegen"
 version = "0.1.0"
-authors = ["Arnavion <me@arnavion.dev>"]
-publish = false
+license = "Apache-2.0"
+authors = ["Arnav Singh <me@arnavion.dev>"]
 edition = "2021"
+publish = false
 
 [dependencies]
 clap = { version = "4", default-features = false, features = [
diff --git a/k8s-openapi-derive/Cargo.toml b/k8s-openapi-derive/Cargo.toml
index dcd44d836..38cb23b70 100644
--- a/k8s-openapi-derive/Cargo.toml
+++ b/k8s-openapi-derive/Cargo.toml
@@ -2,7 +2,7 @@
 name = "k8s-openapi-derive"
 version = "0.19.0"
 license = "Apache-2.0"
-authors = ["Arnavion <me@arnavion.dev>"]
+authors = ["Arnav Singh <me@arnavion.dev>"]
 categories = ["api-bindings", "web-programming::http-client"]
 description = "Custom derives for the Kubernetes client API"
 documentation = "https://arnavion.github.io/k8s-openapi/v0.19.x/k8s_openapi_derive/"
diff --git a/k8s-openapi-tests-macro-deps/Cargo.toml b/k8s-openapi-tests-macro-deps/Cargo.toml
index a30b2ea8f..a4efc351d 100644
--- a/k8s-openapi-tests-macro-deps/Cargo.toml
+++ b/k8s-openapi-tests-macro-deps/Cargo.toml
@@ -1,9 +1,10 @@
 [package]
 name = "k8s-openapi-tests-macro-deps"
 version = "0.1.0"
-authors = ["Arnavion <me@arnavion.dev>"]
-publish = false
+license = "Apache-2.0"
+authors = ["Arnav Singh <me@arnavion.dev>"]
 edition = "2021"
+publish = false
 include = [
     "build.rs",
     "Cargo.toml",
diff --git a/k8s-openapi-tests/Cargo.toml b/k8s-openapi-tests/Cargo.toml
index 9e46647f3..feddda769 100644
--- a/k8s-openapi-tests/Cargo.toml
+++ b/k8s-openapi-tests/Cargo.toml
@@ -1,9 +1,10 @@
 [package]
 name = "k8s-openapi-tests"
 version = "0.1.0"
-authors = ["Arnavion <me@arnavion.dev>"]
-publish = false
+license = "Apache-2.0"
+authors = ["Arnav Singh <me@arnavion.dev>"]
 edition = "2021"
+publish = false
 include = [
     "build.rs",
     "Cargo.toml",