diff --git a/hack/ocp-e2e-tests.sh b/hack/ocp-e2e-tests.sh
index f6a623113..894a659f0 100755
--- a/hack/ocp-e2e-tests.sh
+++ b/hack/ocp-e2e-tests.sh
@@ -14,13 +14,19 @@ export KUBEVIRT_PROVIDER=external
 export IMAGE_BUILDER=podman
 export DEV_IMAGE_REGISTRY=quay.io
 export KUBEVIRTCI_RUNTIME=podman
-export SSH=./hack/ssh.sh
 export PRIMARY_NIC=enp2s0
 export FIRST_SECONDARY_NIC=enp3s0
 export SECOND_SECONDARY_NIC=enp4s0
 
 SKIPPED_TESTS="user-guide|bridged"
 
+if [ "${CI}" == "true" ]; then
+    source ${SHARED_DIR}/fix-uid.sh
+    export SSH=./hack/ssh-ci.sh
+else
+    export SSH=./hack/ssh.sh
+fi
+
 if oc get ns openshift-ovn-kubernetes &> /dev/null; then
     # We are using OVNKubernetes -> use enp1s0 as primary nic
     export PRIMARY_NIC=enp1s0
diff --git a/hack/ssh-ci.sh b/hack/ssh-ci.sh
new file mode 100755
index 000000000..c998d2e78
--- /dev/null
+++ b/hack/ssh-ci.sh
@@ -0,0 +1,7 @@
+#!/bin/bash
+node_name=${1}
+node_ip=$(oc get no ${node_name} -ojsonpath='{.status.addresses[?(.type=="InternalIP")].address}')
+IP="$(cat ${SHARED_DIR}/server-ip)"
+SSHOPTS="-o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null"
+       
+ssh ${SSHOPTS} -i ${CLUSTER_PROFILE_DIR}/packet-ssh-key root@${IP} "ssh ${SSHOPTS} core@${node_ip} -- ${@:3}"