diff --git a/aosp_tokay.mk b/aosp_tokay.mk
index 4be83a02..7eb10a63 100644
--- a/aosp_tokay.mk
+++ b/aosp_tokay.mk
@@ -20,7 +20,7 @@ USE_SWIFTSHADER := false
 BOARD_USES_SWIFTSHADER := false
 
 $(call inherit-product, device/google/zumapro/aosp_common.mk)
-$(call inherit-product, device/google/caimito/device-tokay.mk)
+$(call inherit-product, device/google/caimito/tokay_generic.mk)
 
 PRODUCT_NAME := aosp_tokay
 PRODUCT_DEVICE := tokay
diff --git a/tokay_generic.mk b/tokay_generic.mk
new file mode 100644
index 00000000..0b1cd22f
--- /dev/null
+++ b/tokay_generic.mk
@@ -0,0 +1,17 @@
+#
+# Copyright 2024 The Android Open-Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+$(call inherit-product, device/google/caimito/device-tokay.mk)