diff --git a/codenames.mk b/codenames.mk
index 48f9173..54e9806 100644
--- a/codenames.mk
+++ b/codenames.mk
@@ -25,33 +25,15 @@ PIXEL2020_CODENAMES += \
     %bramble \
     %redfin
 
+PIXEL2021_CODENAMES += \
+    %oriole \
+    %raven
+
 PIXEL_CODENAMES += \
     $(PIXEL2016_CODENAMES) \
     $(PIXEL2017_CODENAMES) \
     $(PIXEL2018_CODENAMES) \
     $(PIXEL2019_MIDYEAR_CODENAMES) \
     $(PIXEL2019_CODENAMES) \
-    $(PIXEL2020_CODENAMES)
-
-PIXEL_AMBIENT_CODENAMES += \
-    $(PIXEL2017_CODENAMES) \
-    $(PIXEL2018_CODENAMES) \
-    $(PIXEL2019_MIDYEAR_CODENAMES) \
-    $(PIXEL2019_CODENAMES) \
-    $(PIXEL2020_CODENAMES)
-
-PIXEL_DREAMLINER_CODENAMES += \
-    $(PIXEL2018_CODENAMES) \
-    $(PIXEL2019_CODENAMES) \
-    $(PIXEL2020_CODENAMES)
-
-PIXEL_ELMYRA_CODENAMES += \
-    $(PIXEL2017_CODENAMES) \
-    $(PIXEL2018_CODENAMES) \
-    $(PIXEL2019_MIDYEAR_CODENAMES) \
-    $(PIXEL2019_CODENAMES) \
-    $(PIXEL2020_CODENAMES)
-
-# Not all devices work with Turbo, just Pixels and Android One devices
-TURBO_CODENAMES += \
-    $(PIXEL_CODENAMES)
+    $(PIXEL2020_CODENAMES) \
+    $(PIXEL2021_CODENAMES)