diff --git a/aosp_trout_arm64.mk b/aosp_trout_arm64.mk
index ef1fa10..cb7a457 100644
--- a/aosp_trout_arm64.mk
+++ b/aosp_trout_arm64.mk
@@ -51,5 +51,5 @@
 PRODUCT_COPY_FILES += $(SENSOR_HAL_CONFIG_COPY_FILE)
 
 PRODUCT_NAME := aosp_trout_arm64
-PRODUCT_DEVICE := vsoc_arm64
+PRODUCT_DEVICE := trout_arm64
 PRODUCT_MODEL := arm64 trout
diff --git a/aosp_trout_x86.mk b/aosp_trout_x86.mk
index 28bf246..b302f1c 100644
--- a/aosp_trout_x86.mk
+++ b/aosp_trout_x86.mk
@@ -33,5 +33,5 @@
 #    packages/services/Car/cpp/computepipe/products/init.computepipe.rc:$(TARGET_COPY_OUT_SYSTEM)/etc/init/computepipe.rc
 
 PRODUCT_NAME := aosp_trout_x86
-PRODUCT_DEVICE := vsoc_x86
+PRODUCT_DEVICE := trout_x86
 PRODUCT_MODEL := x86 trout
diff --git a/trout_arm64/BoardConfig.mk b/trout_arm64/BoardConfig.mk
new file mode 100644
index 0000000..c9ee08a
--- /dev/null
+++ b/trout_arm64/BoardConfig.mk
@@ -0,0 +1,21 @@
+#
+# Copyright 2020 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.
+#
+
+#
+# arm64 target for Trout
+#
+
+-include device/google/cuttlefish/vsoc_arm64/BoardConfig.mk
diff --git a/trout_x86/BoardConfig.mk b/trout_x86/BoardConfig.mk
new file mode 100644
index 0000000..34df446
--- /dev/null
+++ b/trout_x86/BoardConfig.mk
@@ -0,0 +1,21 @@
+#
+# Copyright 2020 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.
+#
+
+#
+# x86 target for Trout
+#
+
+-include device/google/cuttlefish/vsoc_x86/BoardConfig.mk