diff --git a/tests/gha-run-k8s-common.sh b/tests/gha-run-k8s-common.sh
index 12f3fda63c..3102fd03da 100644
--- a/tests/gha-run-k8s-common.sh
+++ b/tests/gha-run-k8s-common.sh
@@ -509,7 +509,8 @@ function helm_helper() {
 	yq -i ".node-feature-discovery.enabled = true" "${values_yaml}"
 
 	# Do not enable on cbl-mariner yet, as the deployment is failing on those
-	if [[ "${HELM_HOST_OS}" == "cbl-mariner" ]]; then
+	# Do not enable on s390x yet, as the uninstall is failing on those
+	if [[ "${HELM_HOST_OS}" == "cbl-mariner" ]] || [[ "$(uname -m)" == "s390x" ]]; then
 		yq -i ".node-feature-discovery.enabled = false" "${values_yaml}"
 	fi