diff --git a/ci/base.yml b/ci/base.yml
index c4e68886..7f209de1 100644
--- a/ci/base.yml
+++ b/ci/base.yml
@@ -35,8 +35,9 @@ local_conf_header:
     PACKAGECONFIG:append:pn-perf = " coresight"
     INHERIT += "rm_work"
     DISTRO_FEATURES:remove = "ptest"
-  perf: |
-    CORE_IMAGE_EXTRA_INSTALL += "perf"
+  extrapackages: |
+    CORE_IMAGE_EXTRA_INSTALL += "perf opencsd"
+    CORE_IMAGE_EXTRA_INSTALL:append:aarch64 = " gator-daemon"
 
 machine: unset
 
diff --git a/ci/corstone1000-common.yml b/ci/corstone1000-common.yml
index 970a87c9..65ff9d38 100644
--- a/ci/corstone1000-common.yml
+++ b/ci/corstone1000-common.yml
@@ -5,7 +5,7 @@ header:
     - ci/meta-openembedded.yml
 
 local_conf_header:
-    perf: |
+    extrapackages: |
     # Intentionally blank to prevent perf from being added to the image in base.yml
 
 distro: poky-tiny
diff --git a/ci/corstone500.yml b/ci/corstone500.yml
index d51d45fb..54633e1c 100644
--- a/ci/corstone500.yml
+++ b/ci/corstone500.yml
@@ -7,7 +7,7 @@ local_conf_header:
   testimagefvp: |
     INHERIT += "fvpboot"
     IMAGE_FEATURES:remove = " ssh-server-dropbear"
-  perf: |
+  extrapackages: |
     # Intentionally blank to prevent perf from being added to the image in base.yml
 
 machine: corstone500