diff --git a/ci/base.yml b/ci/base.yml
index a77567b7..1301f6a7 100644
--- a/ci/base.yml
+++ b/ci/base.yml
@@ -36,3 +36,6 @@ local_conf_header:
     EXTRA_IMAGE_FEATURES = "allow-empty-password empty-root-password allow-root-login"
 
 machine: unset
+
+target:
+  - core-image-base
diff --git a/ci/qcm6490.yml b/ci/qcm6490.yml
index c033c6ad..27b6f31d 100644
--- a/ci/qcm6490.yml
+++ b/ci/qcm6490.yml
@@ -4,7 +4,3 @@ header:
   version: 14
   includes:
   - ci/base.yml
-
-target:
-  - esp-qcom-image
-  - core-image-minimal