diff --git a/.gitlab/cdrouter.yml b/.gitlab/cdrouter.yml
index 1a5844f6d9..cd3cb3359f 100644
--- a/.gitlab/cdrouter.yml
+++ b/.gitlab/cdrouter.yml
@@ -204,9 +204,9 @@
         ssh root@$TARGET_LAN_IP "cat /var/log/messages" > syslog-$LABGRID_TARGET.txt
         ssh root@$TARGET_LAN_IP opkg list > opkg_list-$LABGRID_TARGET.txt
         script --quiet --command "ssh -t root@$TARGET_LAN_IP /bin/getDebugInformation --all"
-        scp -r root@${TARGET_LAN_IP}:/tmp/debug-*_all.tar.gz . > /dev/null
-        scp -r root@${TARGET_LAN_IP}:/etc etc > /dev/null
-        scp -r root@${TARGET_LAN_IP}:/tmp/beerocks/logs prplmesh_beerocks_logs > /dev/null
+        scp -O -r root@${TARGET_LAN_IP}:/tmp/debug-*_all.tar.gz . > /dev/null
+        scp -O -r root@${TARGET_LAN_IP}:/etc etc > /dev/null
+        scp -O -r root@${TARGET_LAN_IP}:/tmp/beerocks/logs prplmesh_beerocks_logs > /dev/null
       } || true
 
     - .gitlab/scripts/testbed-device.py --target $LABGRID_TARGET power off
diff --git a/.gitlab/scripts/dut-init/cdrouter-dut-configure-usp-common.sh b/.gitlab/scripts/dut-init/cdrouter-dut-configure-usp-common.sh
index 33ee70eac6..664f71bf43 100644
--- a/.gitlab/scripts/dut-init/cdrouter-dut-configure-usp-common.sh
+++ b/.gitlab/scripts/dut-init/cdrouter-dut-configure-usp-common.sh
@@ -83,7 +83,7 @@ configure_usp_reset_file() {
 	ssh "root@$TARGET_LAN_IP" "service obuspa stop"
 
 	log_info "Installing ${protocol_name} OBUSPA reset file"
-	scp "$reset_file" "root@${TARGET_LAN_IP}:${remote_reset_file}"
+	scp -O "$reset_file" "root@${TARGET_LAN_IP}:${remote_reset_file}"
 
 	log_info "Removing stale OBUSPA database"
 	ssh "root@$TARGET_LAN_IP" "rm -f /etc/obuspa.db"
diff --git a/.gitlab/scripts/dut-init/cdrouter-tr181-mockups.sh b/.gitlab/scripts/dut-init/cdrouter-tr181-mockups.sh
index 4b919ab5e7..82274d67ae 100755
--- a/.gitlab/scripts/dut-init/cdrouter-tr181-mockups.sh
+++ b/.gitlab/scripts/dut-init/cdrouter-tr181-mockups.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
 
-scp .gitlab/mockups/tr181-mockups.tar.gz root@${TARGET_LAN_IP}:/tmp/
+scp -O .gitlab/mockups/tr181-mockups.tar.gz root@${TARGET_LAN_IP}:/tmp/
 ssh root@$TARGET_LAN_IP "tar xzf /tmp/tr181-mockups.tar.gz -C / && /etc/init.d/tr181-mockups start"
 ssh root@$TARGET_LAN_IP "ubus call ProxyManager register '{\"proxy\":\"Device.LANConfigSecurity.\", \"real\":\"LANConfigSecurity.\" } '"
diff --git a/.gitlab/testbed.yml b/.gitlab/testbed.yml
index 7633ee6139..d5f88eed1b 100644
--- a/.gitlab/testbed.yml
+++ b/.gitlab/testbed.yml
@@ -25,8 +25,8 @@
     DUT_OBUSPA_VERBOSE_LEVEL: ''
     DUT_OBUSPA_PROTOCOL_TRACE: ''
     TEST_SETUP_TEARDOWN_DURATION: 360
-    CRAM_REMOTE_COMMAND: ssh -n root@$TARGET_LAN_IP
-    CRAM_REMOTE_COPY: scp -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null
+    CRAM_REMOTE_COMMAND: ssh root@$TARGET_LAN_IP
+    CRAM_REMOTE_COPY: scp -O -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null
     CRAM_TEST_SUITE: |
       .gitlab/tests/cram/generic/acceleration-plan-components
       .gitlab/tests/cram/$DUT_BOARD/acceleration-plan-components
@@ -189,9 +189,9 @@
         ssh root@$TARGET_LAN_IP "cat /var/log/messages" > syslog-$LABGRID_TARGET.txt
         ssh root@$TARGET_LAN_IP opkg list > opkg_list-$LABGRID_TARGET.txt
         script --quiet --command "ssh -t root@$TARGET_LAN_IP /bin/getDebugInformation --all"
-        scp -r root@${TARGET_LAN_IP}:/tmp/debug-*_all.tar.gz . > /dev/null
-        scp -r root@${TARGET_LAN_IP}:/etc etc > /dev/null
-        scp -r root@${TARGET_LAN_IP}:/tmp/beerocks/logs prplmesh_beerocks_logs > /dev/null
+        scp -O -r root@${TARGET_LAN_IP}:/tmp/debug-*_all.tar.gz . > /dev/null
+        scp -O -r root@${TARGET_LAN_IP}:/etc etc > /dev/null
+        scp -O -r root@${TARGET_LAN_IP}:/tmp/beerocks/logs prplmesh_beerocks_logs > /dev/null
       } || true
 
     - .gitlab/scripts/testbed-device.py --target $LABGRID_TARGET power off
diff --git a/.gitlab/tests/cram/generic/acceleration-plan-components/020-security.t b/.gitlab/tests/cram/generic/acceleration-plan-components/020-security.t
index 0e3dd341af..034f1e33fc 100644
--- a/.gitlab/tests/cram/generic/acceleration-plan-components/020-security.t
+++ b/.gitlab/tests/cram/generic/acceleration-plan-components/020-security.t
@@ -18,7 +18,7 @@ Copy over testing certificates:
 
   $ R "mkdir -p /etc/amx/tr181-security/defaults.d"
   $ R "mkdir -p /etc/config/autocert"
-  $ C ${CI_PROJECT_DIR}/.gitlab/certs/tr181-security/autocert/* "root@${TARGET_LAN_IP}:/etc/config/autocert/"
+  $ C -O ${CI_PROJECT_DIR}/.gitlab/certs/tr181-security/autocert/* "root@${TARGET_LAN_IP}:/etc/config/autocert/"
   Warning: Permanently added '*' (*) to the list of known hosts* (glob)
 
 Restart tr181-security service:
diff --git a/.gitlab/tests/cram/generic/acceleration-plan-components/035-multisettings.t b/.gitlab/tests/cram/generic/acceleration-plan-components/035-multisettings.t
index 84c9175db6..815b32e141 100644
--- a/.gitlab/tests/cram/generic/acceleration-plan-components/035-multisettings.t
+++ b/.gitlab/tests/cram/generic/acceleration-plan-components/035-multisettings.t
@@ -4,7 +4,7 @@ Create R alias:
 
 Add testing service:
 
-  $ scp -r $TESTDIR/035-multisettings/* root@${TARGET_LAN_IP}:/
+  $ scp -O -r $TESTDIR/035-multisettings/* root@${TARGET_LAN_IP}:/
 
 Restart multisettings service and start testing service:
 
diff --git a/.gitlab/tests/cram/generic/acceleration-plan-components/060-xpon-mock.t b/.gitlab/tests/cram/generic/acceleration-plan-components/060-xpon-mock.t
index ffb1b5623c..0e0e97034e 100644
--- a/.gitlab/tests/cram/generic/acceleration-plan-components/060-xpon-mock.t
+++ b/.gitlab/tests/cram/generic/acceleration-plan-components/060-xpon-mock.t
@@ -9,7 +9,7 @@ Skip test on urx851-b0-dk-pon as it has real PON and thus mocking is not needed:
 
 Install mod-xpon-prpl-mock package:
 
-  $ scp ${CI_PROJECT_DIR}/${DUT_ARCH_PACKAGES_PATH}/feed_prplos/mod-xpon-prpl-mock*.ipk "root@${TARGET_LAN_IP}:/tmp/"
+  $ scp -O ${CI_PROJECT_DIR}/${DUT_ARCH_PACKAGES_PATH}/feed_prplos/mod-xpon-prpl-mock*.ipk "root@${TARGET_LAN_IP}:/tmp/"
   $ R "opkg install --force-reinstall /tmp/mod-xpon-prpl-mock*.ipk"
   No packages removed.
   Installing mod-xpon-prpl-mock .* to root... (re)
diff --git a/.gitlab/tests/cram/generic/acceleration-plan-components/110-data-model-mapper.t b/.gitlab/tests/cram/generic/acceleration-plan-components/110-data-model-mapper.t
index 6bb3fc2297..be54a553e3 100644
--- a/.gitlab/tests/cram/generic/acceleration-plan-components/110-data-model-mapper.t
+++ b/.gitlab/tests/cram/generic/acceleration-plan-components/110-data-model-mapper.t
@@ -2,8 +2,8 @@ Setup the test configuration:
 
   $ alias R="${CRAM_REMOTE_COMMAND:-}"
   $ S=". /tmp/script_functions.sh"
-  $ scp ${TESTDIR}/../lcm/script_functions.sh root@${TARGET_LAN_IP}:/tmp/script_functions.sh
-  $ scp ${CI_PROJECT_DIR}/${DUT_ARCH_PACKAGES_PATH}/feed_prplos/data-model-mapper*.ipk "root@${TARGET_LAN_IP}:/tmp/"
+  $ scp -O ${TESTDIR}/../lcm/script_functions.sh root@${TARGET_LAN_IP}:/tmp/script_functions.sh
+  $ scp -O ${CI_PROJECT_DIR}/${DUT_ARCH_PACKAGES_PATH}/feed_prplos/data-model-mapper*.ipk "root@${TARGET_LAN_IP}:/tmp/"
   $ R "opkg install -V0 --force-reinstall /tmp/data-model-mapper*.ipk;echo $?"
   0