diff --git a/kubernetes/kubectl_run_sa.sh b/kubernetes/kubectl_run_sa.sh
index f857132070a..b09bb5c19a3 100755
--- a/kubernetes/kubectl_run_sa.sh
+++ b/kubernetes/kubectl_run_sa.sh
@@ -45,6 +45,8 @@ image="${2:-busybox}"
 shift || :
 shift || :
 
-name="${image##*/}-${USER:-$(whoami)}"
+name="${image##*/}"
+name="${name%%:*}"
+name+="-${USER:-$(whoami)}"
 
 run_static_pod "$name" "$image" --overrides="{ \"spec\": { \"serviceAccount\": \"$service_account\" }  }" "$@"