diff --git a/prepare-build.sh b/prepare-build.sh
index edc8400..fe7ed70 100755
--- a/prepare-build.sh
+++ b/prepare-build.sh
@@ -17,14 +17,14 @@
 declare -a devices=("anthias" "bass" "beluga" "catfish" "dory" "emulator" "firefish" "harmony" "hoki" "inharmony" "koi" "lenok" "minnow" "mooneye" "narwhal" "nemo" "pike" "ray" "rinato" "rubyfish" "sawfish" "skipjack" "smelt" "sparrow" "sparrow-mainline" "sprat" "sturgeon" "swift" "tetra" "triggerfish" "wren")
 
 declare -a layers=(
-    "src/oe-core                   https://github.com/openembedded/openembedded-core.git walnascar"
-    "src/oe-core/bitbake           https://github.com/openembedded/bitbake.git           2.12"
-    "src/meta-openembedded         https://github.com/openembedded/meta-openembedded.git walnascar"
-    "src/meta-qt5                  https://github.com/meta-qt5/meta-qt5                  walnascar"
-    "src/meta-smartphone           https://github.com/shr-distribution/meta-smartphone   walnascar"
-    "src/meta-asteroid             https://github.com/AsteroidOS/meta-asteroid           master"
-    "src/meta-asteroid-community   https://github.com/AsteroidOS/meta-asteroid-community master"
-    "src/meta-smartwatch           https://github.com/AsteroidOS/meta-smartwatch.git     master"
+    "src/oe-core                   https://github.com/openembedded/openembedded-core.git whinlatter"
+    "src/oe-core/bitbake           https://github.com/openembedded/bitbake.git           2.16"
+    "src/meta-openembedded         https://github.com/openembedded/meta-openembedded.git whinlatter"
+    "src/meta-qt5                  https://github.com/meta-qt5/meta-qt5                  whinlatter"
+    "src/meta-smartphone           https://github.com/shr-distribution/meta-smartphone   whinlatter"
+    "src/meta-asteroid             https://github.com/AsteroidOS/meta-asteroid           whinlatter"
+    "src/meta-asteroid-community   https://github.com/AsteroidOS/meta-asteroid-community whinlatter"
+    "src/meta-smartwatch           https://github.com/AsteroidOS/meta-smartwatch.git     whinlatter"
 )
 
 declare -a layers_conf=(