diff --git a/.github/workflows/docker-images/yocto-builder/entrypoint-build.sh b/.github/workflows/docker-images/yocto-builder/entrypoint-build.sh
index 0d37d27..937f2e6 100755
--- a/.github/workflows/docker-images/yocto-builder/entrypoint-build.sh
+++ b/.github/workflows/docker-images/yocto-builder/entrypoint-build.sh
@@ -29,8 +29,10 @@ REPOS=" \
     git://git.yoctoproject.org/meta-yocto \
 "
 for repo in $REPOS; do
-    log "Cloning $repo on branch $BASE_REF..."
-    git clone --depth 1 --branch "$BASE_REF" "$repo"
+    BRANCH="$BASE_REF"
+    [ "$repo" =  "git://git.openembedded.org/bitbake" -a "$BASE_REF" = "whinlatter" ] && BRANCH=2.16
+    log "Cloning $repo on branch $BRANCH..."
+    git clone --depth 1 --branch "$BRANCH" "$repo"
 done
 
 # shellcheck disable=SC1091,SC2240
diff --git a/.github/workflows/docker-images/yocto-builder/entrypoint-yocto-check-layer.sh b/.github/workflows/docker-images/yocto-builder/entrypoint-yocto-check-layer.sh
index 71805d8..519e48a 100755
--- a/.github/workflows/docker-images/yocto-builder/entrypoint-yocto-check-layer.sh
+++ b/.github/workflows/docker-images/yocto-builder/entrypoint-yocto-check-layer.sh
@@ -24,8 +24,10 @@ REPOS=" \
     git://git.openembedded.org/bitbake \
 "
 for repo in $REPOS; do
-    log "Cloning $repo on branch $BASE_REF..."
-    git clone --depth 1 --branch "$BASE_REF" "$repo"
+    BRANCH="$BASE_REF"
+    [ "$repo" =  "git://git.openembedded.org/bitbake" -a "$BASE_REF" = "whinlatter" ] && BRANCH=2.16
+    log "Cloning $repo on branch $BRANCH..."
+    git clone --depth 1 --branch "$BRANCH" "$repo"
 done
 
 # shellcheck disable=SC1091,SC2240