diff --git a/overlays/keystone/board/cva6/configs/uboot-cva6.config b/overlays/keystone/board/cva6/configs/uboot-cva6.config
index dee90cc67..f6272b4c6 100644
--- a/overlays/keystone/board/cva6/configs/uboot-cva6.config
+++ b/overlays/keystone/board/cva6/configs/uboot-cva6.config
@@ -1,3 +1,4 @@
 CONFIG_MMC_WRITE=y
 CONFIG_BOOTCOMMAND="mmc info; mmc read 90000000 100000 10000; setenv fdt_high 0xffffffffffffffff; bootm 90000000 - $(fdtcontroladdr)"
+CONFIG_USE_BOOTARGS=y
 CONFIG_BOOTARGS="cma=128M"
diff --git a/scripts/ci/plat/cva6/test.sh b/scripts/ci/plat/cva6/test.sh
index 4aeda2aaf..f1f2914b2 100755
--- a/scripts/ci/plat/cva6/test.sh
+++ b/scripts/ci/plat/cva6/test.sh
@@ -22,7 +22,7 @@ get_platform_var BOARD_IP
 set -x
 
 # Fix permissions on the key
-chmod 600 build-mpfs64/buildroot.build/target/root/.ssh/id-rsa
+chmod 600 "build-cva6$KEYSTONE_BITS/buildroot.build/target/root/.ssh/id-rsa"
 
 # Start the board
 export KEYSTONE_PLATFORM=cva6
diff --git a/scripts/ci/utils/find_tty.sh b/scripts/ci/utils/find_tty.sh
index 275a5ef50..19d121883 100755
--- a/scripts/ci/utils/find_tty.sh
+++ b/scripts/ci/utils/find_tty.sh
@@ -11,7 +11,6 @@ TTY_IDPRODUCT="$1"; shift
 
 # See if we can find the correct TTYs
 TTYS=()
-SELECTED_TTYS=()
 
 for f in /sys/class/tty/ttyUSB* ; do
         if [[ $(cat $f/../../../../idVendor) == "$TTY_IDVENDOR" ]] && \