diff --git a/.github/workflows/kernel-build-and-test-x86_64.yml b/.github/workflows/kernel-build-and-test-x86_64.yml
index c16138cd4553b..ac75be88a95f7 100644
--- a/.github/workflows/kernel-build-and-test-x86_64.yml
+++ b/.github/workflows/kernel-build-and-test-x86_64.yml
@@ -7,5 +7,5 @@ on:
 
 jobs:
   build:
-    uses: ctrliq/kernel-src-tree/.github/workflows/kernel-build-and-test-x86_64.yml@main
+    uses: ctrliq/kernel-src-tree/.github/workflows/kernel-build-and-test-x86_64.yml@rnicolescu_test
     secrets: inherit
diff --git a/tools/testing/selftests/bpf/test_xsk.sh b/tools/testing/selftests/bpf/test_xsk.sh
index 46633a3bfb0b6..654026b010aad 100755
--- a/tools/testing/selftests/bpf/test_xsk.sh
+++ b/tools/testing/selftests/bpf/test_xsk.sh
@@ -80,6 +80,14 @@
 
 . xsk_prereqs.sh
 
+function generate_random_digits
+{
+	s=$(dd if=/dev/urandom count=1 2> /dev/null | cksum | cut -d' ' -f1)
+	s=${s:0:4}
+
+	echo $s
+}
+
 while getopts "cvD" flag
 do
 	case "${flag}" in
@@ -94,9 +102,9 @@ TEST_NAME="PREREQUISITES"
 URANDOM=/dev/urandom
 [ ! -e "${URANDOM}" ] && { echo "${URANDOM} not found. Skipping tests."; test_exit 1 1; }
 
-VETH0_POSTFIX=$(cat ${URANDOM} | tr -dc '0-9' | fold -w 256 | head -n 1 | head --bytes 4)
+VETH0_POSTFIX=$(generate_random_digits)
 VETH0=ve${VETH0_POSTFIX}
-VETH1_POSTFIX=$(cat ${URANDOM} | tr -dc '0-9' | fold -w 256 | head -n 1 | head --bytes 4)
+VETH1_POSTFIX=$(generate_random_digits)
 VETH1=ve${VETH1_POSTFIX}
 NS0=root
 NS1=af_xdp${VETH1_POSTFIX}