diff --git a/.gitlab-ci-files/linux-yocto.yml b/.gitlab-ci-files/linux-yocto.yml
deleted file mode 100644
index a8fb861e8a71c9712fa7b1551acf08d892d899fc..0000000000000000000000000000000000000000
--- a/.gitlab-ci-files/linux-yocto.yml
+++ /dev/null
@@ -1,34 +0,0 @@
-debian9-yocto-sumo:
-  stage: build
-  tags: [ "docker-debian9-yocto" ]
-  image: gitlab.linphone.org:4567/bc/public/linphone-sdk/bc-dev-yocto:$DEBIAN_9_METABC_YOCTO_IMAGE_VERSION
-  rules:
-    - if: $NIGHTLY_MASTER
-    - if: $YOCTO
-  script:
-    - export WORKSPACE_PATH="$CI_PROJECT_DIR"
-   #update to latest version of meta-bc for current branch (see docker file from meta-bc)
-    - cd /home/build/poky/meta-bc
-    - git pull
-    - cd /home/build/poky
-    - export BB_ENV_EXTRAWHITE="LINPHONE_SDK_REV LINPHONE_SDK_BRANCH PREFERED_LINPHONE_SDK_RECIPE_VERSION LINPHONE_SDK_LIC_FILES_CHKSUM"
-    - export LINPHONE_SDK_REV="$CI_COMMIT_SHA"
-    - echo $LINPHONE_SDK_REV
-    - export LINPHONE_SDK_BRANCH="$CI_COMMIT_REF_NAME"
-    - echo $LINPHONE_SDK_BRANCH
-    - export PREFERED_LINPHONE_SDK_RECIPE_VERSION="latest"
-    - echo $PREFERED_LINPHONE_SDK_RECIPE_VERSION
-
-    #Added to support license changed to Linphone-SDK, especially the switch from GPLv2+ to AGPLv3+
-    #LIC_FILES_CHKSUM should allow to detect issues with future license changes for Yocto recipes
-    - export LINPHONE_SDK_LIC_FILES_CHKSUM="eb1e647870add0502f8f010b19de32af"
-
-    - source oe-init-build-env
-    - bitbake -c cleanall linphone-sdk
-    - bitbake -f linphone-sdk 2>&1 | tee ${CI_PROJECT_DIR}/bitbake_build_error.log
-    #to get build logs from linphone-sdk
-    - tar cvzf ${CI_PROJECT_DIR}/bitbake_build_logs.tgz `bitbake -e linphone-sdk | grep ^T= |cut -d'"' -f 2`
-  artifacts:
-    paths:
-      - bitbake_build_error.log
-      - bitbake_build_logs.tgz
diff --git a/.gitlab-ci-files/yocto-qemuarm64.yml b/.gitlab-ci-files/yocto-qemuarm64.yml
new file mode 100644
index 0000000000000000000000000000000000000000..c3ef48072ad235d760b9d516c769968e7186858c
--- /dev/null
+++ b/.gitlab-ci-files/yocto-qemuarm64.yml
@@ -0,0 +1,34 @@
+debian11-yocto-qemuarm64:
+  stage: build
+  tags: ["docker-debian11-yocto-qemuarm64"]
+  image: gitlab.linphone.org:4567/bc/public/linphone-sdk/bc-dev-yocto:kirkstone-qemuarm64
+  #rules:
+  #  - if: $NIGHTLY_MASTER
+  script:
+    - export WORKSPACE_PATH="$CI_PROJECT_DIR"
+    # Update to latest version of meta-bc for current branch (see docker file from meta-bc)
+    - cd /home/build/poky
+    - git clone https://gitlab.linphone.org/BC/public/meta-bc.git -b feature/yocto-kirkstone
+    - echo -e '\nBBLAYERS += "${BSPDIR}/meta-bc"' >> build/conf/bblayers.conf
+    - echo -e '\nLICENSE_FLAGS_ACCEPTED = "commercial"' >> build/conf/local.conf
+    - echo -e 'PACKAGECONFIG:append:pn-avahi = " libdns_sd"' >> build/conf/local.conf
+    - echo -e 'PACKAGECONFIG:append:pn-linphone-sdk = " mdns"' >> build/conf/local.conf
+    - echo -e 'PACKAGECONFIG:append:pn-linphone-sdk = " h264"' >> build/conf/local.conf
+    - echo -e 'IMAGE_INSTALL:append = " linphone-sdk"' >> build/conf/local.conf
+    - export BB_ENV_PASSTHROUGH_ADDITIONS="LINPHONE_SDK_REV LINPHONE_SDK_BRANCH PREFERED_LINPHONE_SDK_RECIPE_VERSION LATEST_REVISIONS"
+    - export LINPHONE_SDK_REV="$CI_COMMIT_SHA"
+    - echo $LINPHONE_SDK_REV
+    - export LINPHONE_SDK_BRANCH="$CI_COMMIT_REF_NAME"
+    - echo $LINPHONE_SDK_BRANCH
+    - export PREFERED_LINPHONE_SDK_RECIPE_VERSION="latest"
+    - echo $PREFERED_LINPHONE_SDK_RECIPE_VERSION
+    - export LATEST_REVISIONS="1"
+    - echo $LATEST_REVISIONS
+    - source oe-init-build-env
+    - bitbake core-image-base 2>&1 | tee ${CI_PROJECT_DIR}/bitbake_build_error.log
+    # Get build logs from linphone-sdk
+    - tar cvzf ${CI_PROJECT_DIR}/bitbake_build_logs.tgz `bitbake -e linphone-sdk | grep ^T= |cut -d'"' -f 2`
+  artifacts:
+    paths:
+      - bitbake_build_error.log
+      - bitbake_build_logs.tgz
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index e18560b33832fd5b4222506936a37c5e2d4bab2a..ea831b0ed2d80a3486fda36271e7b74138caaa40 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -64,8 +64,7 @@ include:
   - '.gitlab-ci-files/linux-desktop/linux-desktop-ubuntu-rolling.yml'
   - '.gitlab-ci-files/linux-desktop/linux-desktop-ubuntu1804.yml'
 
-  - '.gitlab-ci-files/linux-yocto.yml'
-
+  - '.gitlab-ci-files/yocto-qemuarm64.yml'
 
   - '.gitlab-ci-files/macosx/builds.yml'
   - '.gitlab-ci-files/macosx/tests.yml'