diff --git a/meta-arm-gcs/gcs-test.yml b/meta-arm-gcs/gcs-test.yml
index 47f62630..271881a2 100644
--- a/meta-arm-gcs/gcs-test.yml
+++ b/meta-arm-gcs/gcs-test.yml
@@ -4,9 +4,5 @@ header:
     - meta-arm-gcs/gcs.yml
 
 local_conf_header:
-  testimage: |
-    IMAGE_CLASSES += "testimage"
+  autotestimage: |
     TESTIMAGE_AUTO = "1"
-    TEST_SUITES = "ping ssh gcs"
-    IMAGE_FEATURES += "ssh-server-dropbear debug-tweaks"
-    CORE_IMAGE_EXTRA_INSTALL += "ssh-pregen-hostkeys binutils"
diff --git a/meta-arm-gcs/gcs.yml b/meta-arm-gcs/gcs.yml
index ace9a649..e7e2d985 100644
--- a/meta-arm-gcs/gcs.yml
+++ b/meta-arm-gcs/gcs.yml
@@ -29,7 +29,7 @@ local_conf_header:
     # Use the 6.8 kernel
     PREFERRED_PROVIDER_virtual/kernel = "linux-yocto-dev"
     # No root password for ease
-    EXTRA_IMAGE_FEATURES += "empty-root-password"
+    EXTRA_IMAGE_FEATURES += "empty-root-password allow-empty-password allow-root-login"
     # Install a toolchain
     EXTRA_IMAGE_FEATURES += "tools-sdk"
     # Install a pre-generated SSH key because key generation in a FVP is tiresome
@@ -51,7 +51,7 @@ local_conf_header:
   testimage: |
     IMAGE_CLASSES += "testimage"
     TEST_SUITES = "ping ssh gcs"
-    IMAGE_FEATURES += "ssh-server-dropbear debug-tweaks"
+    IMAGE_FEATURES += "ssh-server-dropbear"
     CORE_IMAGE_EXTRA_INSTALL += "ssh-pregen-hostkeys binutils"
 
 target: