diff --git a/apps/GoogleApps.mk b/apps/GoogleApps.mk
index 09b59af..e8014a5 100644
--- a/apps/GoogleApps.mk
+++ b/apps/GoogleApps.mk
@@ -25,6 +25,31 @@ PRODUCT_PACKAGES += \
     GoogleCamera \
     Photos
 endif
+ifneq ($(filter $(PIXEL2021_CODENAMES),$(TARGET_PRODUCT)),)
+PRODUCT_PACKAGES += \
+    GoogleCamera \
+    Photos
+endif
+ifneq ($(filter $(PIXEL2021_MIDYEAR_CODENAMES),$(TARGET_PRODUCT)),)
+PRODUCT_PACKAGES += \
+    GoogleCamera \
+    Photos
+endif
+ifneq ($(filter $(PIXEL2022_CODENAMES),$(TARGET_PRODUCT)),)
+PRODUCT_PACKAGES += \
+    GoogleCamera \
+    Photos
+endif
+ifneq ($(filter $(PIXEL2022_MIDYEAR_CODENAMES),$(TARGET_PRODUCT)),)
+PRODUCT_PACKAGES += \
+    GoogleCamera \
+    Photos
+endif
+ifneq ($(filter $(PIXELTABLET_CODENAMES),$(TARGET_PRODUCT)),)
+PRODUCT_PACKAGES += \
+    GoogleCamera \
+    Photos
+endif
 
 # AiAi Allowlist
 PRODUCT_COPY_FILES += \
diff --git a/codenames.mk b/codenames.mk
index 54e9806..c5bfb25 100644
--- a/codenames.mk
+++ b/codenames.mk
@@ -29,6 +29,19 @@ PIXEL2021_CODENAMES += \
     %oriole \
     %raven
 
+PIXEL2021_MIDYEAR_CODENAMES += \
+    %bluejay
+
+PIXEL2022_CODENAMES += \
+    %panther \
+    %cheetah
+
+PIXEL2022_MIDYEAR_CODENAMES += \
+    %lynx
+
+PIXELTABLET_CODENAMES += \
+    %tangorpro \
+
 PIXEL_CODENAMES += \
     $(PIXEL2016_CODENAMES) \
     $(PIXEL2017_CODENAMES) \
@@ -36,4 +49,8 @@ PIXEL_CODENAMES += \
     $(PIXEL2019_MIDYEAR_CODENAMES) \
     $(PIXEL2019_CODENAMES) \
     $(PIXEL2020_CODENAMES) \
-    $(PIXEL2021_CODENAMES)
+    $(PIXEL2021_CODENAMES) \
+    $(PIXEL2021_MIDYEAR_CODENAMES) \
+    $(PIXEL2022_CODENAMES) \
+    $(PIXEL2022_MIDYEAR_CODENAMES) \
+    $(PIXELTABLET_CODENAMES)