diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 0e9ad68876e8..9dad9662b8a2 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -115,16 +115,16 @@ update-repos:
 #
 # Build stage, the actual build jobs
 #
-# Available options for building are
+# Available options for building are (VIRT _must_ be last for ssh override)
 #  DISTRO: [poky, poky-altcfg, poky-tiny]
 #  KERNEL: [linux-yocto, linux-yocto-dev, linux-yocto-rt]
 #  TOOLCHAINS: [gcc, clang, external-gccarm]
 #  TCLIBC: [glibc, musl]
 #  FIRMWARE: [u-boot, edk2]
 #  TS: [none, trusted-services]
-#  VIRT: [none, xen]
 #  TESTING: testimage
 #  SECUREDEBUG: [none, secure-debug]
+#  VIRT: [none, xen]
 
 arm-systemready-ir-acs:
   extends: .build
diff --git a/ci/xen.yml b/ci/xen.yml
index d855369a6565..9b08d01d6205 100644
--- a/ci/xen.yml
+++ b/ci/xen.yml
@@ -4,10 +4,13 @@ header:
   version: 14
   includes:
     - ci/meta-virtualization.yml
+    - ci/poky-altcfg.yml
 
 local_conf_header:
   meta-virt: |
     DISTRO_FEATURES:append = " virtualization xen"
+  sshd: |
+    IMAGE_FEATURES:append = " ssh-server-openssh"
 
 target:
   - xen-image-minimal