diff --git a/gapps.mk b/gapps.mk
index 6df6094..618049d 100644
--- a/gapps.mk
+++ b/gapps.mk
@@ -3,8 +3,7 @@ LOCAL_PATH := $(call my-dir)
 STOCK_GAPPS_DEVICES += \
     %berkeley \
     %ether \
-    %nash \
-    %shamu
+    %nash
 
 NANO_GAPPS_DEVICES += \
     %bacon \
@@ -17,6 +16,9 @@ PICO_GAPPS_DEVICES += \
     %jfltexx \
     %yellowstone
 
+MOST_GAPPS_DEVICES += \
+    %shamu
+
 FLASH_GAPPS_DEVICES += \
     %flo