diff --git a/ci/genericarm64-ly.yml b/ci/genericarm64-ly.yml
new file mode 100644
index 0000000..4910d70
--- /dev/null
+++ b/ci/genericarm64-ly.yml
@@ -0,0 +1,25 @@
+# genericarm64 w/ linux yocto 
+# no autorev by default
+# no meta-openamp-bsp
+# build openamp-image-minimal
+
+header:
+  version: 9
+  includes:
+    - openamp.yml
+
+machine: genericarm64
+
+local_conf_header:
+  machine: |
+    # nothing needed
+  kernel-selection: |
+    PREFERRED_PROVIDER_virtual/kernel = "linux-yocto"
+  extra-packages: |
+    EXTRA_IMAGE_FEATURES:append = " debug-tweaks ssh-server-dropbear"
+  bugs: |
+    # Only ping until errors can be resolved
+    TEST_SUITES = "ping"
+
+target:
+  - openamp-image-minimal
diff --git a/ci/openamp.yml b/ci/openamp.yml
index 8af1c8f..936c899 100644
--- a/ci/openamp.yml
+++ b/ci/openamp.yml
@@ -36,12 +36,14 @@ local_conf_header:
     BB_GIT_SHALLOW_DEPTH = "1"
     PACKAGE_CLASSES = "package_ipk"
     PACKAGECONFIG:remove:pn-qemu-system-native = "gtk+ sdl"
-    EXTRA_IMAGE_FEATURES:append = " debug-tweaks ssh-server-dropbear"
     USER_CLASSES ?= "buildstats"
     IMAGE_FSTYPES:append = " cpio.gz"
     IMAGE_FSTYPES:remove = "jffs2"
+  extra-packages: |
     PACKAGE_INSTALL_EXTRAS = "rsync iproute2 dropbear kernel-modules"
     IMAGE_INSTALL:append = " ${PACKAGE_INSTALL_EXTRAS} "
+    EXTRA_IMAGE_FEATURES:append = " debug-tweaks ssh-server-dropbear"
+  kernel-selection:
     PREFERRED_PROVIDER_virtual/kernel = "linux-openamp"
 
   openamp: |
diff --git a/ci/qemuarm64.yml b/ci/qemuarm64.yml
index 56d6d4c..2440790 100644
--- a/ci/qemuarm64.yml
+++ b/ci/qemuarm64.yml
@@ -13,7 +13,11 @@ machine: qemuarm64
 
 local_conf_header:
   machine: |
-      PREFERRED_PROVIDER_virtual/kernel = "linux-yocto"
+    # nothing needed
+  kernel-selection: |
+    PREFERRED_PROVIDER_virtual/kernel = "linux-yocto"
+  extra-packages: |
+    EXTRA_IMAGE_FEATURES:append = " debug-tweaks ssh-server-dropbear"
   bugs: |
     # Only ping until errors can be resolved
     TEST_SUITES = "ping"