diff --git a/teams/codegen-cranelift.toml b/teams/codegen-cranelift.toml
new file mode 100644
index 000000000..2232064f0
--- /dev/null
+++ b/teams/codegen-cranelift.toml
@@ -0,0 +1,8 @@
+name = "codegen-cranelift"
+kind = "marker-team"
+
+[people]
+leads = []
+members = [
+    "bjorn3",
+]
diff --git a/teams/codegen-gcc.toml b/teams/codegen-gcc.toml
new file mode 100644
index 000000000..f85ebbfce
--- /dev/null
+++ b/teams/codegen-gcc.toml
@@ -0,0 +1,9 @@
+name = "codegen-gcc"
+kind = "marker-team"
+
+[people]
+leads = []
+members = [
+    "antoyo",
+    "GuillaumeGomez",
+]